fix dirs, midje working
cleanup