Move scaldi specific code in to package