Changes to make installable via composer