changed class names to be a bit clearer, deleted some files that aren't being used