Commit before reorganizing source files