Moving to subfolder, including files this time