Refactoring/shipservice

Refactoring of ship service.