Revert "A general master branch."

This reverts commit d4d48591 but not
completly, just the parts needed for the services moved to ns4.