More minor changes to the project structure