[DEV] Full refactoring of the Ship class