Changed the new structure. Add some new classes en delete some new
classes.