minor changes of package structure