renaming files and a little bit of moving code into files