prep-packages: Fix handling of package directory, etc.