Ship.cpp reorganisation