Re-structured the project files