Package refactoring
Fixed re test
Fixed skipped replacements