Refactoring Institution module (wip, unstable)