Moving the units to a new package changes a ton of files, so you should probably just review the individual commits before that.