Refactoring and add support for CPU metrics on RequestWorkItem.  Adding
new files this time
Clean up old files and make names consistent