Changed path to templates.
Changes path to specific Bundle templates.
Refactoring
Merge remote-tracking branch 'hub/master'