Refactor monitor classes into separate package