reorganize dir structure and update bar_chart