Test Spaceship Models complete

Restructured shiet