Fix-up the Clean-up

Forgot to move source files to new packages.