Lots of cleaning up reorginizing and modifying of files