modified the package structure slightly