Ninjafix: relocated some classes