Reorganise configuration in configuration class (fixes #10)