some internal refactoring and ns changes
adding 'regex-group-into-map'
adding 'regex-group-into-map'