Reorganized settings files.
Combined test config with main configuration.