Refactored cell & cell spec
refactor fleet and fleet_spec