Big refactoring of the Configus