harmonize and finalize modules, internalization: refs  #507 #523