Fixup lib dir for /lib
Rework dependancies