moved some stuff around

This has made it easer to remove all the dep code