Move to correct folder structure