restructure dir + first chart