Update build so that module paths stay consistant

#2100