more reorganization, and restructuring for easier sampling form large corpus