Reorganized Field class hierarchy

Fix