Directory restructure. Monitoring Abstraction

Lee, Penn Hanrequested to merge
upgrade/monitoring into master

Reorganised Directory Structure for modules directory for easy importing of metrics monitoring. Refactored metrics monitoring to clean code Change paging style

Merge request reports