modify structure of lib & class
first playing with push