diff --git a/.DS_Store b/.DS_Store
index 4055af8..71d98e9 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/apps/.DS_Store b/apps/.DS_Store
index 4f14505..6e76a12 100644
Binary files a/apps/.DS_Store and b/apps/.DS_Store differ
diff --git a/apps/horst/priv/config/things.config b/apps/horst/priv/config/things.config
index 72ff036..1bedf1b 100644
--- a/apps/horst/priv/config/things.config
+++ b/apps/horst/priv/config/things.config
@@ -13,7 +13,7 @@
            {filter,
                [{<<"erlyThing/erlything@macbook-pro/sample_driver/default">>,
                  0}]}]},
-      {activ,false},
+      {activ,true},
       {timer,0},
       {description,"MQTT Client"}]},
  {thing,"Config_Manager",
@@ -29,7 +29,7 @@
       {ets,false},
       {icon,"database.png"},
       {driver,{mnesia_driver,handle_msg},[{init,true},{data,[]}]},
-      {activ,true},
+      {activ,false},
       {timer,0},
       {description,"Mnesia database actor"}]},
  {thing,"Sample_Sensor",
@@ -37,7 +37,7 @@
       {ets,true},
       {icon,"temp.png"},
       {driver,{sample_driver,call_sensor},[{init,true},{data,[]}]},
-      {activ,false},
+      {activ,true},
       {timer,5000},
       {description,"Sample sensor for playing with"}]},
  {thing,"Growler_Interface",
@@ -57,7 +57,7 @@
                 {file_format,"*.nzb"},
                 {destination,"/tmp/dest"},
                 {source,"/tmp/upload"}]}]},
-      {activ,false},
+      {activ,true},
       {timer,10000},
       {description,"Moves an uploaded file to its destination path"}]},
  {thing,"Temperatur_Sensor",
diff --git a/apps/horst/src/actor_group.erl b/apps/horst/src/core/actor_group.erl
similarity index 100%
rename from apps/horst/src/actor_group.erl
rename to apps/horst/src/core/actor_group.erl
diff --git a/apps/horst/src/config.erl b/apps/horst/src/core/config.erl
similarity index 100%
rename from apps/horst/src/config.erl
rename to apps/horst/src/core/config.erl
diff --git a/apps/horst/src/config_factory.erl b/apps/horst/src/core/config_factory.erl
similarity index 100%
rename from apps/horst/src/config_factory.erl
rename to apps/horst/src/core/config_factory.erl
diff --git a/apps/horst/src/config_handler.erl b/apps/horst/src/core/config_handler.erl
similarity index 100%
rename from apps/horst/src/config_handler.erl
rename to apps/horst/src/core/config_handler.erl
diff --git a/apps/horst/src/dsl.erl b/apps/horst/src/core/dsl.erl
similarity index 100%
rename from apps/horst/src/dsl.erl
rename to apps/horst/src/core/dsl.erl
diff --git a/apps/horst/src/ets_mgr.erl b/apps/horst/src/core/ets_mgr.erl
similarity index 100%
rename from apps/horst/src/ets_mgr.erl
rename to apps/horst/src/core/ets_mgr.erl
diff --git a/apps/horst/src/file_provider.erl b/apps/horst/src/core/file_provider.erl
similarity index 100%
rename from apps/horst/src/file_provider.erl
rename to apps/horst/src/core/file_provider.erl
diff --git a/apps/horst/src/file_provider_sup.erl b/apps/horst/src/core/file_provider_sup.erl
similarity index 100%
rename from apps/horst/src/file_provider_sup.erl
rename to apps/horst/src/core/file_provider_sup.erl
diff --git a/apps/horst/src/funrunner_sup.erl b/apps/horst/src/core/funrunner_sup.erl
similarity index 100%
rename from apps/horst/src/funrunner_sup.erl
rename to apps/horst/src/core/funrunner_sup.erl
diff --git a/apps/horst/src/horst.erl b/apps/horst/src/core/horst.erl
similarity index 100%
rename from apps/horst/src/horst.erl
rename to apps/horst/src/core/horst.erl
diff --git a/apps/horst/src/horst_app.erl b/apps/horst/src/core/horst_app.erl
similarity index 100%
rename from apps/horst/src/horst_app.erl
rename to apps/horst/src/core/horst_app.erl
diff --git a/apps/horst/src/horst_sup.erl b/apps/horst/src/core/horst_sup.erl
similarity index 100%
rename from apps/horst/src/horst_sup.erl
rename to apps/horst/src/core/horst_sup.erl
diff --git a/apps/horst/src/node_config.erl b/apps/horst/src/core/node_config.erl
similarity index 100%
rename from apps/horst/src/node_config.erl
rename to apps/horst/src/core/node_config.erl
diff --git a/apps/horst/src/os_driver.erl b/apps/horst/src/core/os_driver.erl
similarity index 100%
rename from apps/horst/src/os_driver.erl
rename to apps/horst/src/core/os_driver.erl
diff --git a/apps/horst/src/picture_provider.erl b/apps/horst/src/core/picture_provider.erl
similarity index 100%
rename from apps/horst/src/picture_provider.erl
rename to apps/horst/src/core/picture_provider.erl
diff --git a/apps/horst/src/sensor.erl b/apps/horst/src/core/sensor.erl
similarity index 100%
rename from apps/horst/src/sensor.erl
rename to apps/horst/src/core/sensor.erl
diff --git a/apps/horst/src/thing.erl b/apps/horst/src/core/thing.erl
similarity index 100%
rename from apps/horst/src/thing.erl
rename to apps/horst/src/core/thing.erl
diff --git a/apps/horst/src/things_sup.erl b/apps/horst/src/core/things_sup.erl
similarity index 100%
rename from apps/horst/src/things_sup.erl
rename to apps/horst/src/core/things_sup.erl
diff --git a/apps/horst/src/boxcar_driver.erl b/apps/horst/src/things/boxcar_driver.erl
similarity index 100%
rename from apps/horst/src/boxcar_driver.erl
rename to apps/horst/src/things/boxcar_driver.erl
diff --git a/apps/horst/src/config_driver.erl b/apps/horst/src/things/config_driver.erl
similarity index 100%
rename from apps/horst/src/config_driver.erl
rename to apps/horst/src/things/config_driver.erl
diff --git a/apps/horst/src/cron_driver.erl b/apps/horst/src/things/cron_driver.erl
similarity index 100%
rename from apps/horst/src/cron_driver.erl
rename to apps/horst/src/things/cron_driver.erl
diff --git a/apps/horst/src/cube_control_driver.erl b/apps/horst/src/things/cube_control_driver.erl
similarity index 100%
rename from apps/horst/src/cube_control_driver.erl
rename to apps/horst/src/things/cube_control_driver.erl
diff --git a/apps/horst/src/cube_driver.erl b/apps/horst/src/things/cube_driver.erl
similarity index 100%
rename from apps/horst/src/cube_driver.erl
rename to apps/horst/src/things/cube_driver.erl
diff --git a/apps/horst/src/dht22_display_driver.erl b/apps/horst/src/things/dht22_display_driver.erl
similarity index 100%
rename from apps/horst/src/dht22_display_driver.erl
rename to apps/horst/src/things/dht22_display_driver.erl
diff --git a/apps/horst/src/dht22_driver.erl b/apps/horst/src/things/dht22_driver.erl
similarity index 100%
rename from apps/horst/src/dht22_driver.erl
rename to apps/horst/src/things/dht22_driver.erl
diff --git a/apps/horst/src/ds18b20_display_driver.erl b/apps/horst/src/things/ds18b20_display_driver.erl
similarity index 100%
rename from apps/horst/src/ds18b20_display_driver.erl
rename to apps/horst/src/things/ds18b20_display_driver.erl
diff --git a/apps/horst/src/ds18b20_driver.erl b/apps/horst/src/things/ds18b20_driver.erl
similarity index 100%
rename from apps/horst/src/ds18b20_driver.erl
rename to apps/horst/src/things/ds18b20_driver.erl
diff --git a/apps/horst/src/file_mover_driver.erl b/apps/horst/src/things/file_mover_driver.erl
similarity index 100%
rename from apps/horst/src/file_mover_driver.erl
rename to apps/horst/src/things/file_mover_driver.erl
diff --git a/apps/horst/src/fungi_driver.erl b/apps/horst/src/things/fungi_driver.erl
similarity index 100%
rename from apps/horst/src/fungi_driver.erl
rename to apps/horst/src/things/fungi_driver.erl
diff --git a/apps/horst/src/funrunner_driver.erl b/apps/horst/src/things/funrunner_driver.erl
similarity index 100%
rename from apps/horst/src/funrunner_driver.erl
rename to apps/horst/src/things/funrunner_driver.erl
diff --git a/apps/horst/src/growler_driver.erl b/apps/horst/src/things/growler_driver.erl
similarity index 100%
rename from apps/horst/src/growler_driver.erl
rename to apps/horst/src/things/growler_driver.erl
diff --git a/apps/horst/src/hc_sr501_driver.erl b/apps/horst/src/things/hc_sr501_driver.erl
similarity index 100%
rename from apps/horst/src/hc_sr501_driver.erl
rename to apps/horst/src/things/hc_sr501_driver.erl
diff --git a/apps/horst/src/mail_client_driver.erl b/apps/horst/src/things/mail_client_driver.erl
similarity index 100%
rename from apps/horst/src/mail_client_driver.erl
rename to apps/horst/src/things/mail_client_driver.erl
diff --git a/apps/horst/src/message_counter_driver.erl b/apps/horst/src/things/message_counter_driver.erl
similarity index 100%
rename from apps/horst/src/message_counter_driver.erl
rename to apps/horst/src/things/message_counter_driver.erl
diff --git a/apps/horst/src/mnesia_driver.erl b/apps/horst/src/things/mnesia_driver.erl
similarity index 100%
rename from apps/horst/src/mnesia_driver.erl
rename to apps/horst/src/things/mnesia_driver.erl
diff --git a/apps/horst/src/mqttc_driver.erl b/apps/horst/src/things/mqttc_driver.erl
similarity index 100%
rename from apps/horst/src/mqttc_driver.erl
rename to apps/horst/src/things/mqttc_driver.erl
diff --git a/apps/horst/src/mqttc_event.erl b/apps/horst/src/things/mqttc_event.erl
similarity index 100%
rename from apps/horst/src/mqttc_event.erl
rename to apps/horst/src/things/mqttc_event.erl
diff --git a/apps/horst/src/node_driver.erl b/apps/horst/src/things/node_driver.erl
similarity index 100%
rename from apps/horst/src/node_driver.erl
rename to apps/horst/src/things/node_driver.erl
diff --git a/apps/horst/src/os_display_driver.erl b/apps/horst/src/things/os_display_driver.erl
similarity index 100%
rename from apps/horst/src/os_display_driver.erl
rename to apps/horst/src/things/os_display_driver.erl
diff --git a/apps/horst/src/reloader_driver.erl b/apps/horst/src/things/reloader_driver.erl
similarity index 100%
rename from apps/horst/src/reloader_driver.erl
rename to apps/horst/src/things/reloader_driver.erl
diff --git a/apps/horst/src/sample_driver.erl b/apps/horst/src/things/sample_driver.erl
similarity index 100%
rename from apps/horst/src/sample_driver.erl
rename to apps/horst/src/things/sample_driver.erl
diff --git a/apps/horst/src/seven_eleven_driver.erl b/apps/horst/src/things/seven_eleven_driver.erl
similarity index 100%
rename from apps/horst/src/seven_eleven_driver.erl
rename to apps/horst/src/things/seven_eleven_driver.erl
diff --git a/apps/horst/src/switch_measurement_driver.erl b/apps/horst/src/things/switch_measurement_driver.erl
similarity index 100%
rename from apps/horst/src/switch_measurement_driver.erl
rename to apps/horst/src/things/switch_measurement_driver.erl
diff --git a/apps/horst/src/transmitter_433_driver.erl b/apps/horst/src/things/transmitter_433_driver.erl
similarity index 100%
rename from apps/horst/src/transmitter_433_driver.erl
rename to apps/horst/src/things/transmitter_433_driver.erl
diff --git a/apps/horst/src/usb_cam_driver.erl b/apps/horst/src/things/usb_cam_driver.erl
similarity index 100%
rename from apps/horst/src/usb_cam_driver.erl
rename to apps/horst/src/things/usb_cam_driver.erl
diff --git a/rebar.config b/rebar.config
index bad6c22..a5c858d 100644
--- a/rebar.config
+++ b/rebar.config
@@ -6,7 +6,10 @@
             "apps/sue"
            ]}.
 {lib_dirs, ["apps", "deps"]}.
-{erl_opts,[{parse_transform, lager_transform}, debug_info]}.
+{erl_opts,[debug_info,
+           {parse_transform, lager_transform},
+           {src_dirs, ["src"]}
+          ]}.
 
 {eunit_opts, [verbose, {report,{eunit_surefire,[{dir,"."}]}}]}.
 {cover_enabled, true}.