Move config to config files (!)