refactor some stuff, rename lib to utils and add some utils class and function.. to be continued