Re-order file structure