Made some changes to the project structure