Refactor Collocation class to separate module