Change package name, do some reorganization