New File Hierarchy.
TODO: Fix the scripts