Doing some commit reorganization