Introduced More files, made changes to the rewriter itself.