move bean to library and make index more clear entry point