change structure. move all files to lib folder. remove utils file