move everything into the same dir