refactoring

Waqar Ahmedrequested to merge
work/cleanups into master

Mostly just moving code around a bit.

Merge request reports