Move classes to correct namespace.
misc