Re-commit files

For some reason, files are supposedly different.
Add static construction methods