School

Some renaming, added and removed some code in the classes.