Revert "Move ast off of object to fix weird mapping issue"

This reverts commit 4b42d2d9c93fabec1e7e4cf3a973cd820b0c1bc9.
Organize rewriters into a folder