rearranging source files