Submod update and some refactoring of jenkins script