Refactor: redesign the package structure. 20140823