rework prepends to match flow of includes
Merge pull request #1780 from tduehr/module_prepend

Module prepend