reorg of the labs
more compilation resolutions