re-order files to be more organized