Move config related types to proper namespace