Updated lib folder structure