Move and folder structure seems good