Refactor file organization and namespaces.