Squash commits, rename files