reorganize to link witrh lib/