Simplified some classes. Made adding better
Deleted old files