Fixed exception logic on DisplayKeys()
Removed unused functions
Created new src subdir for template files