Revert "Merge Opacity"

Reverts OpalCoin/OpalCoin#6