Refactor/organise obfuscation related utilities