rm. module moved to query sub-path and renamed.
mod. Reference additional metrics class modules.