finished reorg of abstracted module interfaces