Attemp to get composer build to work in Makefile
More attempts to get composer to work in build
Cleanup files so we don't include in both packages