There were several modules that defined traits, including one called `traits`. This consolidates all of them under `traits`, retaining the previous module structure as internal submodules: - `keytraits` => `traits::keys` - `padding` => `traits::padding` - `traits` => `traits::encryption` Additionally this removes the traits that were re-exported at the toplevel, instead re-exporting them all under `traits`.