Removed obsolete classes
Changed a lot of things...