added submodules
added manifest template
resolving damn conflicts