clean up build
move entity to elib::flat_map