Move and rename files for clarity