Moved some files and corrected namespaces