Reorganized file structure of project