Restructuring the repo for more charts