Finish namespace conversion

Directories should reflect namespace structure. Moved all classes that the consumer shouldn't care about into a different namespace.
What on earth is "infrastructure"?