Re-commit almost everything b/c I moved my files