rework on a clean directory / code structure for new charts