Refactored Shipmap into one class