Major code refactor. Support for drXor/EnchantingBench plugin