Started refactor of ship entities