MKLAB: Fix creating labs with subdirectoires and generally cleanup the code