File shuffling + inclusion of old Limestone spawn code