first commit for the reorganization branch