make it all work with new library organization
DONE\!