Initial commit of changes to update module references with their newer eqivalents