begin to move some stuff out to a comman lib dir.