Update package structure and fix some bugs.