reorganise package declaration
fix the name in LICENSE