re-estructuring spacecaker commits a bit