Removed duplicates from templates, use DropPoint/templates for DropPoint specific files for now on