put everything in the right dir, too