Started improving the project structure of the project