Name changes and fixes to get stuff to run
Removed unneccesarry files