Revert "Revert "Revert "Revert "Revert "Revert "[Refactored] LairObserver""""""

This reverts commit 370723ced782b1b1c2adebfc6e63b056294c9b2c.