submodule and main files updated