Move common component code into better named namespace.