Refactor from a plugin + singleton to a utility class we can use as a submodule