Initial reorganization of files
Updating composer.json