Reorganize project structure and use namespaces