Refactor and clean up the code.
Refactoring: Grouped all rewriters under the same package.