Bunch of cleanup.
Moving/removing old files and some file renaming