Restructured the project into separate namespaces.