Rename a couple of scripts.
Remove the 'packages/*' subdirectories.

Since packages can be in multiple groups, the old directory structure
made little sense.