clean up code

rename some files, clean up some code, fix some spelling mistakes