update git ignore on DS_Store
change template file locations
restructure of template files