Move classes to respective namespaces