Re-ordered file structure