Upgrading to composer installation

Fixes #2