restructured BIDMach