Refactoring oe.lib into Util Classes