fix: bestiary mitigation and move libs to core folder (#2175)

fix: bestiary mitigation and move libs to core folder (#2175) #138