archpwn/wyd: Fix upstream. Clean up for merge.
wyd: Move to 'packages'.