More file structure changes. Class changes. composer.json changes