Updated to use submodule roles and updated template files