update fieldTypes to handle to the new fields dirs and nested templates dir structure