Lib folder added and minor changes