Removed ship from default package, changed Ship class - Kevin