revert deletion of mock modules

I reverted the merge and cherry picked the commits, this hopefully won't ninja delete important files again when merging...