Yeoman reorganization