Major refactoring of review simulation structure
Merging poms