Restructured the project
Updated namespaces
Rearranging project structure