Move Module related bits to a new module