Updating references to match reorganization
Reorganizing regular expression code
Updating references to match code reorganization