Ignore wp-config
Remove Uploads
Adding Fresh Uploads with Identicle Directories
Install Wordpress Importer

Installed and ran, stated all media already existed. Going to remove
uploads and re-import.
Removed Files

Importer still said files already existed, probably actually refering
to the media library.
Files are back