fix html file filter and reorganise templates