diff --git a/src/main/java/com/loafle/overflow/model/sensorconfig/SensorConfig.java b/src/main/java/com/loafle/overflow/model/sensorconfig/SensorConfig.java
index 0f2ec80..19f0e6b 100644
--- a/src/main/java/com/loafle/overflow/model/sensorconfig/SensorConfig.java
+++ b/src/main/java/com/loafle/overflow/model/sensorconfig/SensorConfig.java
@@ -1,63 +1,11 @@
 package com.loafle.overflow.model.sensorconfig;
 
-import java.util.List;
-
-/**
- * SensorConfig
- */
 public class SensorConfig {
-  private Long id;
-  private String configID;
-  private Target target;
-  private Schedule schedule;
-  private Crawler crawler;
-  private List<Item> items;
 
-  public Long getId() {
-    return id;
-  }
+  private Long sensorID;
 
-  public void setId(Long id) {
-    this.id = id;
-  }
-
-  public String getConfigID() {
-    return configID;
-  }
-
-  public void setConfigID(String configID) {
-    this.configID = configID;
-  }
-
-  public Target getTarget() {
-    return target;
-  }
-
-  public void setTarget(Target target) {
-    this.target = target;
-  }
-
-  public Schedule getSchedule() {
-    return schedule;
-  }
-
-  public void setSchedule(Schedule schedule) {
-    this.schedule = schedule;
-  }
-
-  public Crawler getCrawler() {
-    return crawler;
-  }
-
-  public void setCrawler(Crawler crawler) {
-    this.crawler = crawler;
-  }
-
-  public List<Item> getItems() {
-    return items;
-  }
-
-  public void setItems(List<Item> items) {
-    this.items = items;
-  }
+  private SensorConfigSchedule schedule;
+  private SensorConfigCrawler crawler;
+  private SensorConfigConnection connection;
+  private SensorConfigItems items;
 }
\ No newline at end of file
diff --git a/src/main/java/com/loafle/overflow/model/sensorconfig/SensorConfigConnection.java b/src/main/java/com/loafle/overflow/model/sensorconfig/SensorConfigConnection.java
new file mode 100644
index 0000000..96bd79a
--- /dev/null
+++ b/src/main/java/com/loafle/overflow/model/sensorconfig/SensorConfigConnection.java
@@ -0,0 +1,12 @@
+package com.loafle.overflow.model.sensorconfig;
+
+import java.util.Map;
+
+public class SensorConfigConnection {
+  private String metaIPTypeKey;
+  private String ip;
+  private String metaPortTypeKey;
+  private Integer port;
+  private String metaCryptoTypeKey;
+  private Map<String, String> credentials;
+}
\ No newline at end of file
diff --git a/src/main/java/com/loafle/overflow/model/sensorconfig/SensorConfigCrawler.java b/src/main/java/com/loafle/overflow/model/sensorconfig/SensorConfigCrawler.java
new file mode 100644
index 0000000..c1df7b7
--- /dev/null
+++ b/src/main/java/com/loafle/overflow/model/sensorconfig/SensorConfigCrawler.java
@@ -0,0 +1,6 @@
+package com.loafle.overflow.model.sensorconfig;
+
+public class SensorConfigCrawler {
+  private String metaCrawlerContainerKey;
+  private String metaCrawlerKey;
+}
\ No newline at end of file
diff --git a/src/main/java/com/loafle/overflow/model/sensorconfig/SensorConfigItems.java b/src/main/java/com/loafle/overflow/model/sensorconfig/SensorConfigItems.java
new file mode 100644
index 0000000..34194b7
--- /dev/null
+++ b/src/main/java/com/loafle/overflow/model/sensorconfig/SensorConfigItems.java
@@ -0,0 +1,9 @@
+package com.loafle.overflow.model.sensorconfig;
+
+import java.util.List;
+
+import com.loafle.overflow.model.meta.MetaCollectionItem;
+
+public class SensorConfigItems {
+  private List<MetaCollectionItem> metaCollectionItems;
+}
\ No newline at end of file
diff --git a/src/main/java/com/loafle/overflow/model/sensorconfig/SensorConfigSchedule.java b/src/main/java/com/loafle/overflow/model/sensorconfig/SensorConfigSchedule.java
new file mode 100644
index 0000000..8845a2a
--- /dev/null
+++ b/src/main/java/com/loafle/overflow/model/sensorconfig/SensorConfigSchedule.java
@@ -0,0 +1,5 @@
+package com.loafle.overflow.model.sensorconfig;
+
+public class SensorConfigSchedule {
+  private Integer interval;
+}
\ No newline at end of file
diff --git a/src/main/java/com/loafle/overflow/model/sensorconfig/Target.java b/src/main/java/com/loafle/overflow/model/sensorconfig/Target.java
deleted file mode 100644
index 658fd40..0000000
--- a/src/main/java/com/loafle/overflow/model/sensorconfig/Target.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.loafle.overflow.model.sensorconfig;
-
-import java.util.Map;
-
-/**
- * Target
- */
-public class Target {
-  private Map<String, Object> auth;
-  private Connection connection;
-  private Map<String, Object> meta;
-
-  public Map<String, Object> getAuth() {
-    return auth;
-  }
-
-  public void setAuth(Map<String, Object> auth) {
-    this.auth = auth;
-  }
-
-  public Connection getConnection() {
-    return connection;
-  }
-
-  public void setConnection(Connection connection) {
-    this.connection = connection;
-  }
-
-  /**
-   * @return the meta
-   */
-  public Map<String, Object> getMeta() {
-    return meta;
-  }
-
-  /**
-   * @param meta the meta to set
-   */
-  public void setMeta(Map<String, Object> meta) {
-    this.meta = meta;
-  }
-}
\ No newline at end of file
diff --git a/src/main/java/com/loafle/overflow/model/sensorconfig/Connection.java b/src/main/java/com/loafle/overflow/model/sensorconfig/old/Connection.java
similarity index 76%
rename from src/main/java/com/loafle/overflow/model/sensorconfig/Connection.java
rename to src/main/java/com/loafle/overflow/model/sensorconfig/old/Connection.java
index 60990eb..8b30581 100644
--- a/src/main/java/com/loafle/overflow/model/sensorconfig/Connection.java
+++ b/src/main/java/com/loafle/overflow/model/sensorconfig/old/Connection.java
@@ -1,4 +1,4 @@
-package com.loafle.overflow.model.sensorconfig;
+package com.loafle.overflow.model.sensorconfig.old;
 
 import com.loafle.overflow.model.meta.MetaCryptoType;
 import com.loafle.overflow.model.meta.MetaIPType;
@@ -58,17 +58,17 @@ public class Connection {
     this.metaIPType = metaIPType;
   }
 
-/**
- * @return the metaCryptoType
- */
-public MetaCryptoType getMetaCryptoType() {
-	return metaCryptoType;
-}
+  /**
+   * @return the metaCryptoType
+   */
+  public MetaCryptoType getMetaCryptoType() {
+    return metaCryptoType;
+  }
 
-/**
- * @param metaCryptoType the metaCryptoType to set
- */
-public void setMetaCryptoType(MetaCryptoType metaCryptoType) {
-	this.metaCryptoType = metaCryptoType;
-}
+  /**
+   * @param metaCryptoType the metaCryptoType to set
+   */
+  public void setMetaCryptoType(MetaCryptoType metaCryptoType) {
+    this.metaCryptoType = metaCryptoType;
+  }
 }
diff --git a/src/main/java/com/loafle/overflow/model/sensorconfig/Crawler.java b/src/main/java/com/loafle/overflow/model/sensorconfig/old/Crawler.java
similarity index 87%
rename from src/main/java/com/loafle/overflow/model/sensorconfig/Crawler.java
rename to src/main/java/com/loafle/overflow/model/sensorconfig/old/Crawler.java
index 1a25634..2a635eb 100644
--- a/src/main/java/com/loafle/overflow/model/sensorconfig/Crawler.java
+++ b/src/main/java/com/loafle/overflow/model/sensorconfig/old/Crawler.java
@@ -1,4 +1,4 @@
-package com.loafle.overflow.model.sensorconfig;
+package com.loafle.overflow.model.sensorconfig.old;
 
 /**
  * Crawler
diff --git a/src/main/java/com/loafle/overflow/model/sensorconfig/Item.java b/src/main/java/com/loafle/overflow/model/sensorconfig/old/Item.java
similarity index 91%
rename from src/main/java/com/loafle/overflow/model/sensorconfig/Item.java
rename to src/main/java/com/loafle/overflow/model/sensorconfig/old/Item.java
index e3582fd..866ab3f 100644
--- a/src/main/java/com/loafle/overflow/model/sensorconfig/Item.java
+++ b/src/main/java/com/loafle/overflow/model/sensorconfig/old/Item.java
@@ -1,4 +1,4 @@
-package com.loafle.overflow.model.sensorconfig;
+package com.loafle.overflow.model.sensorconfig.old;
 
 import java.util.List;
 
diff --git a/src/main/java/com/loafle/overflow/model/sensorconfig/Keys.java b/src/main/java/com/loafle/overflow/model/sensorconfig/old/Keys.java
similarity index 91%
rename from src/main/java/com/loafle/overflow/model/sensorconfig/Keys.java
rename to src/main/java/com/loafle/overflow/model/sensorconfig/old/Keys.java
index 7aa036f..402ebb1 100644
--- a/src/main/java/com/loafle/overflow/model/sensorconfig/Keys.java
+++ b/src/main/java/com/loafle/overflow/model/sensorconfig/old/Keys.java
@@ -1,4 +1,4 @@
-package com.loafle.overflow.model.sensorconfig;
+package com.loafle.overflow.model.sensorconfig.old;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/main/java/com/loafle/overflow/model/sensorconfig/MappingInfo.java b/src/main/java/com/loafle/overflow/model/sensorconfig/old/MappingInfo.java
similarity index 94%
rename from src/main/java/com/loafle/overflow/model/sensorconfig/MappingInfo.java
rename to src/main/java/com/loafle/overflow/model/sensorconfig/old/MappingInfo.java
index 29f3fee..001db13 100644
--- a/src/main/java/com/loafle/overflow/model/sensorconfig/MappingInfo.java
+++ b/src/main/java/com/loafle/overflow/model/sensorconfig/old/MappingInfo.java
@@ -1,4 +1,4 @@
-package com.loafle.overflow.model.sensorconfig;
+package com.loafle.overflow.model.sensorconfig.old;
 
 import java.util.List;
 
diff --git a/src/main/java/com/loafle/overflow/model/sensorconfig/QueryInfo.java b/src/main/java/com/loafle/overflow/model/sensorconfig/old/QueryInfo.java
similarity index 88%
rename from src/main/java/com/loafle/overflow/model/sensorconfig/QueryInfo.java
rename to src/main/java/com/loafle/overflow/model/sensorconfig/old/QueryInfo.java
index 786c74e..83dae00 100644
--- a/src/main/java/com/loafle/overflow/model/sensorconfig/QueryInfo.java
+++ b/src/main/java/com/loafle/overflow/model/sensorconfig/old/QueryInfo.java
@@ -1,4 +1,4 @@
-package com.loafle.overflow.model.sensorconfig;
+package com.loafle.overflow.model.sensorconfig.old;
 
 import java.util.Map;
 
diff --git a/src/main/java/com/loafle/overflow/model/sensorconfig/ResultSet.java b/src/main/java/com/loafle/overflow/model/sensorconfig/old/ResultSet.java
similarity index 96%
rename from src/main/java/com/loafle/overflow/model/sensorconfig/ResultSet.java
rename to src/main/java/com/loafle/overflow/model/sensorconfig/old/ResultSet.java
index d20b029..36e406c 100644
--- a/src/main/java/com/loafle/overflow/model/sensorconfig/ResultSet.java
+++ b/src/main/java/com/loafle/overflow/model/sensorconfig/old/ResultSet.java
@@ -1,4 +1,4 @@
-package com.loafle.overflow.model.sensorconfig;
+package com.loafle.overflow.model.sensorconfig.old;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/com/loafle/overflow/model/sensorconfig/ResultSetCol.java b/src/main/java/com/loafle/overflow/model/sensorconfig/old/ResultSetCol.java
similarity index 97%
rename from src/main/java/com/loafle/overflow/model/sensorconfig/ResultSetCol.java
rename to src/main/java/com/loafle/overflow/model/sensorconfig/old/ResultSetCol.java
index 91d9782..687d510 100644
--- a/src/main/java/com/loafle/overflow/model/sensorconfig/ResultSetCol.java
+++ b/src/main/java/com/loafle/overflow/model/sensorconfig/old/ResultSetCol.java
@@ -1,4 +1,4 @@
-package com.loafle.overflow.model.sensorconfig;
+package com.loafle.overflow.model.sensorconfig.old;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/src/main/java/com/loafle/overflow/model/sensorconfig/ResultSetRow.java b/src/main/java/com/loafle/overflow/model/sensorconfig/old/ResultSetRow.java
similarity index 98%
rename from src/main/java/com/loafle/overflow/model/sensorconfig/ResultSetRow.java
rename to src/main/java/com/loafle/overflow/model/sensorconfig/old/ResultSetRow.java
index f5619a4..4449fee 100644
--- a/src/main/java/com/loafle/overflow/model/sensorconfig/ResultSetRow.java
+++ b/src/main/java/com/loafle/overflow/model/sensorconfig/old/ResultSetRow.java
@@ -1,4 +1,4 @@
-package com.loafle.overflow.model.sensorconfig;
+package com.loafle.overflow.model.sensorconfig.old;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/src/main/java/com/loafle/overflow/model/sensorconfig/Schedule.java b/src/main/java/com/loafle/overflow/model/sensorconfig/old/Schedule.java
similarity index 80%
rename from src/main/java/com/loafle/overflow/model/sensorconfig/Schedule.java
rename to src/main/java/com/loafle/overflow/model/sensorconfig/old/Schedule.java
index 75e3e6c..d39bebd 100644
--- a/src/main/java/com/loafle/overflow/model/sensorconfig/Schedule.java
+++ b/src/main/java/com/loafle/overflow/model/sensorconfig/old/Schedule.java
@@ -1,4 +1,4 @@
-package com.loafle.overflow.model.sensorconfig;
+package com.loafle.overflow.model.sensorconfig.old;
 
 /**
  * Schedule
diff --git a/src/main/java/com/loafle/overflow/model/sensorconfig/old/Target.java b/src/main/java/com/loafle/overflow/model/sensorconfig/old/Target.java
new file mode 100644
index 0000000..65d89e7
--- /dev/null
+++ b/src/main/java/com/loafle/overflow/model/sensorconfig/old/Target.java
@@ -0,0 +1,8 @@
+package com.loafle.overflow.model.sensorconfig.old;
+
+public class Target {
+  // private Map<String, Object> auth;
+  // private Connection connection;
+  // private Map<String, Object> meta;
+
+}
\ No newline at end of file