Shorter classes

The refactorings again. This time without the ConfigLoader bugfix that was just merged to master.