Moved the ROI class
Update references broken by previus commit.
Merge pull request #947 from arthurbenemann/refactorROIclass

Refactor ROI class