Overhauled `ut/ci': new layout; closes XXX