Reorganization of configuration file

Thanks @joprice