Renamed field module to fields
Refactoring features