Reorganized files and refactored charts