Ch 1362: Reorganize files for maintainability

This is part of the work for CH-1362... just broken up into two different pull requests for reviewing purposes.