Maintenance Update

Code reorganization
Adding events for real-time charts