reorg source to allow easier aliasing from cassaforte