* change lib structure

Fixing lib structure