updated composer.json slightly, moved some things