Correct namespace to match bundle name
Add missing target-dir into composer.json
Merge branch 'dev'