reorganize ships functionality