move most of the stuff into one file
move most of the stuff into one file