Fixed namespaces and reorganized folders.