Tweak composer.json and clean up entry point

Change-Id: Ic7301fb99440ba8aaf96d3a9643a6db72bdeac15