Created seperate lib folders
Fixed some problems