Mark some more packages as deprecated, add new package for collecting words