Changed paths. Added expander module template