Commit stuff more frequently, so that GC sweeps are smaller (hopefully).

See https://github.com/openc/openc/issues/352
Remove redundant files (already present in subdir)