Moved load/save functions into extra classes to ease later implementation of import/export feature
Minor refactoring