Ben/refactor manual ship generator