Create field type-named directories in fields dir and move field .js files into like-named dir; create templates dir in each fields dir; move template files from templates/fields into new fields/[fieldtype]/templates dir