Add public modules

Further public modules for inclusion.