Refactored folders and added composer.json