Reorganized the project directory