Refactored project structure
Refactored namespaces