Moved around regexes (since they will get big once I get to evaluation, they will need to be in seperate files)