Deleted some classes. added others...