Removes composer.lock and fixes namespaces
Merge branch 'master' into migration-1.0