Moved listener init later
Config reorganization