1. bug fix: rake clean; 2. re-org