Updated templates with better readablility, removed unused packages.
Merge branch 'hotfix/minor-housekeeping'