File Hierarchy Revamp