Moved widgets and fields into their own files