Modified tools to conform to new submodule infrastructure