re-estructuring spacecaker commits