WIP: Rename module

Make it not dependent on  OG.