Some reorganization