Be sure to ignore any local.json files
Removing old files left over from the old structure
Fixing up the loading order of the modules
Cleanup
Had to comment some files out because they have errors in them, module specific