Updated Lib Structure