Re-organize the files