Project file structure reorganized