Revert "migrating to OO model, Rook made, still untested"

This reverts commit 88eae905aadd4f843f826ac46864d7748b8de59b.