Consolidate project files and reorganize folder structure