use mlib classes, cleanup paths