move some stuff to better places
mistakes in move
make recursive dependencies in dou stuff work