new lib version and reorganized folders