files structure changed

tweaked debug and duel assignment