Renaming folders to match 3.0 conventions and removing the submodule, now using composer