- Reorganized file locations
- Completed problem [gc]