Lib cleanup - moving to corresponding items to lib directory