Put non-specific features into their own module.