Rearranging files to improve compatibility