Cleaner design

Got rid of a bunch of files