Lots of file renaming and will need to add to remove old files. Also update Class names.