Move some more files around, create Ship class, add constants