Reorganized first commit