more changes to the package/module structure