Refactored libraries paths