restructed lib directory to be allow easier requiring