moving templates to correct location
refactoring Image Field