Some re-arrangement of the project files