Added the last few missing files, and put everything in the right packages.
Tested, too:-)
1 file changed