Code reorganization

More charts added