diff --git a/README.md b/modules/farm/farm_sensor/README.md
similarity index 100%
rename from README.md
rename to modules/farm/farm_sensor/README.md
diff --git a/farm_sensor.api.php b/modules/farm/farm_sensor/farm_sensor.api.php
similarity index 100%
rename from farm_sensor.api.php
rename to modules/farm/farm_sensor/farm_sensor.api.php
diff --git a/farm_sensor.features.field_instance.inc b/modules/farm/farm_sensor/farm_sensor.features.field_instance.inc
similarity index 100%
rename from farm_sensor.features.field_instance.inc
rename to modules/farm/farm_sensor/farm_sensor.features.field_instance.inc
diff --git a/farm_sensor.features.inc b/modules/farm/farm_sensor/farm_sensor.features.inc
similarity index 100%
rename from farm_sensor.features.inc
rename to modules/farm/farm_sensor/farm_sensor.features.inc
diff --git a/farm_sensor.field_group.inc b/modules/farm/farm_sensor/farm_sensor.field_group.inc
similarity index 100%
rename from farm_sensor.field_group.inc
rename to modules/farm/farm_sensor/farm_sensor.field_group.inc
diff --git a/farm_sensor.info b/modules/farm/farm_sensor/farm_sensor.info
similarity index 100%
rename from farm_sensor.info
rename to modules/farm/farm_sensor/farm_sensor.info
diff --git a/farm_sensor.install b/modules/farm/farm_sensor/farm_sensor.install
similarity index 100%
rename from farm_sensor.install
rename to modules/farm/farm_sensor/farm_sensor.install
diff --git a/farm_sensor.module b/modules/farm/farm_sensor/farm_sensor.module
similarity index 100%
rename from farm_sensor.module
rename to modules/farm/farm_sensor/farm_sensor.module
diff --git a/farm_sensor.strongarm.inc b/modules/farm/farm_sensor/farm_sensor.strongarm.inc
similarity index 100%
rename from farm_sensor.strongarm.inc
rename to modules/farm/farm_sensor/farm_sensor.strongarm.inc
diff --git a/farm_sensor.views_default.inc b/modules/farm/farm_sensor/farm_sensor.views_default.inc
similarity index 100%
rename from farm_sensor.views_default.inc
rename to modules/farm/farm_sensor/farm_sensor.views_default.inc
diff --git a/farm_sensor_listener/farm_sensor_listener.info b/modules/farm/farm_sensor/farm_sensor_listener/farm_sensor_listener.info
similarity index 100%
rename from farm_sensor_listener/farm_sensor_listener.info
rename to modules/farm/farm_sensor/farm_sensor_listener/farm_sensor_listener.info
diff --git a/farm_sensor_listener/farm_sensor_listener.install b/modules/farm/farm_sensor/farm_sensor_listener/farm_sensor_listener.install
similarity index 100%
rename from farm_sensor_listener/farm_sensor_listener.install
rename to modules/farm/farm_sensor/farm_sensor_listener/farm_sensor_listener.install
diff --git a/farm_sensor_listener/farm_sensor_listener.module b/modules/farm/farm_sensor/farm_sensor_listener/farm_sensor_listener.module
similarity index 100%
rename from farm_sensor_listener/farm_sensor_listener.module
rename to modules/farm/farm_sensor/farm_sensor_listener/farm_sensor_listener.module
diff --git a/farm_sensor_listener/farm_sensor_listener.views.inc b/modules/farm/farm_sensor/farm_sensor_listener/farm_sensor_listener.views.inc
similarity index 100%
rename from farm_sensor_listener/farm_sensor_listener.views.inc
rename to modules/farm/farm_sensor/farm_sensor_listener/farm_sensor_listener.views.inc
diff --git a/farm_sensor_listener/farm_sensor_listener.views_default.inc b/modules/farm/farm_sensor/farm_sensor_listener/farm_sensor_listener.views_default.inc
similarity index 100%
rename from farm_sensor_listener/farm_sensor_listener.views_default.inc
rename to modules/farm/farm_sensor/farm_sensor_listener/farm_sensor_listener.views_default.inc