Components MessageSource's moved, unused files deleted