Fix around direct folder move