Added lib folder and updated paths