Some fixes for namespace and composer.json