Moved and fixed composer.json