move stuff into the right directory