Reorganization of the initial commit