Convert require to require_relative to allow location-agnostic calling
Fixing regexes to not be overzealous