Update Building Lib Structure

Building lib structure