restructure librs