Completed Phase 1
Reorganized file names