redo folder structure and update composer.json