Moved libraries to lib folder
Added required modules