Code refactoring

Moved all configuration under one and the same section, simplified the
loading modules in site-packages.