Reorganized Field class hierarchy