Moved all config into one file; added separate config class