Changed structure
PEP-0263
Several changes around configuration settings