Major refactor of obfuscation repo