Reorder files to have a consistent repos