Re-factor for composer.  Using composer.