added files
Removed dead stuff
Removed some classes