changed variables from old way to new way (combined file extension and wildcard * in one variable)

This can be used because glob.glob accepting wildcards