I went ahead and tried to cut your mod into his, as your mod is all in one file, while his is separated into different files, and I wasn't sure I'd be able to recreate all the references properly.
I expected to end up with a bunch of errors relating to duplicates, as I didn't delete any of the...