Big reorganisation; support config.ini presets