Groupting dashboard related files and templating them - Incomplete