Update submodule references.
Change submodule name.
Remove old reference.
Re-add project.properties reflecting new submodule layout.