Made some more changes to the project structure