Rearranged the project files