a bit of reorganization to the configuration package