Moved masterkey-specific settings to separate dir. Tuned config of