Added composer autoloading
fixed conflicts in composer.json