reorgonize lib with concerns