Removed submodules
Added composer to project
Fixed merge conflicts