Consolidate all generic modules
Rename package