Rename ship classes to make more sense, refactor traits up a level,
remove exit error