Restructure folders and add composer.json