moved modules into lib folder
merge conflicts