Clean up and add composer.json