restructed libs