Updated file locations
Simplified Hierarchy