Add public modules

Public modules for inclusion