Renaming classes
Restricted start and end of line in regex, expanded test coverage
Fixed packaging for consistency