DON'T MERGE: Ccl refactoring

let's see travis results first, and make sure it does not break ilastik/master