Reordered file structure