Refactored nephele/pact outside with minimal changes to ozone (see ozone branch)