submodules cleaning and update
submodule cleaning, updating and 2 new
merging