Fix submodule initialization and updating
Rename files
Update submodule