Merge "Refactor Rally to adopt OO"