renaming some files and functions
pushing out extra modules used in migrating.