moved rewriter to own package.
renamed package.