Added correct package declarations and expanded Ship classes.
Fixed merge issue.