Changed some filenames, cleaned up some things