Modularized package to module substitution
Added header comment