Use namespace aliases and tidy up composer libs