#211 - Move around the CMS component scans to make extension easier