Restructure to fix midje integration