Finish reorg

Podhorszki, Norbertrequested to merge
github/fork/chuckatkins/finish-reorg into master

Created by: chuckatkins

Merge request reports