Re-structured and added composer.json