Move feature into main module.