refactor submodules
update gitignore
rebase multiple modules
merged branches