Added Chart Wrapper
Removed unused files.
Added Chart Wrapper
Merge origin/master