Implemented some more bits of the spawning mechanism and removed unnecessary code/files/modules