Refactor! Separates the FMP plugin and RiM completely.