diff --git a/src/main/java/com/loafle/bridge/discoveryhost/entity/DiscoveryHost.java b/src/main/java/com/loafle/bridge/discoveryhost/DiscoveryHost.java
similarity index 75%
rename from src/main/java/com/loafle/bridge/discoveryhost/entity/DiscoveryHost.java
rename to src/main/java/com/loafle/bridge/discoveryhost/DiscoveryHost.java
index d9a6494..ccc24fe 100644
--- a/src/main/java/com/loafle/bridge/discoveryhost/entity/DiscoveryHost.java
+++ b/src/main/java/com/loafle/bridge/discoveryhost/DiscoveryHost.java
@@ -1,4 +1,7 @@
-package com.loafle.bridge.discoveryhost.entity;
+package com.loafle.bridge.discoveryhost;
+
+import com.loafle.bridge.discoveryport.DiscoveryPort;
+import com.loafle.bridge.discoveryzone.DiscoveryZone;
 
 import javax.persistence.*;
 import java.util.Date;
@@ -20,17 +23,17 @@ public class DiscoveryHost {
     @Column(name = "MAC_ADDRESS",nullable = false)
     private long macAddress;
 
-//    @ManyToOne
-//    @JoinColumn(name = "ZONE_ID", nullable = false)
-//    private DiscoveryZone zone;
+    @ManyToOne
+    @JoinColumn(name = "ZONE_ID", nullable = false)
+    private DiscoveryZone zone;
 
-//    public DiscoveryZone getZone() {
-//        return zone;
-//    }
-//
-//    public void setZone(DiscoveryZone zone) {
-//        this.zone = zone;
-//    }
+    public DiscoveryZone getZone() {
+        return zone;
+    }
+
+    public void setZone(DiscoveryZone zone) {
+        this.zone = zone;
+    }
 
     @OneToMany(mappedBy = "host")
     private List<PortScanHistory> histories;
@@ -43,16 +46,16 @@ public class DiscoveryHost {
         this.histories = histories;
     }
 
-//    @OneToMany(mappedBy = "host")
-//    private List<DiscoveryPort> ports;
-//
-//    public List<DiscoveryPort> getPorts() {
-//        return ports;
-//    }
-//
-//    public void setPorts(List<DiscoveryPort> ports) {
-//        this.ports = ports;
-//    }
+    @OneToMany(mappedBy = "host")
+    private List<DiscoveryPort> ports;
+
+    public List<DiscoveryPort> getPorts() {
+        return ports;
+    }
+
+    public void setPorts(List<DiscoveryPort> ports) {
+        this.ports = ports;
+    }
 
     @Column(name = "CREATE_DATE", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP", nullable = false, insertable = false, updatable = false)
     private Date createDate;
diff --git a/src/main/java/com/loafle/bridge/discoveryhost/controller/DiscoveryHostController.java b/src/main/java/com/loafle/bridge/discoveryhost/DiscoveryHostController.java
similarity index 61%
rename from src/main/java/com/loafle/bridge/discoveryhost/controller/DiscoveryHostController.java
rename to src/main/java/com/loafle/bridge/discoveryhost/DiscoveryHostController.java
index b7b80aa..b6c7e0d 100644
--- a/src/main/java/com/loafle/bridge/discoveryhost/controller/DiscoveryHostController.java
+++ b/src/main/java/com/loafle/bridge/discoveryhost/DiscoveryHostController.java
@@ -1,4 +1,4 @@
-package com.loafle.bridge.discoveryhost.controller;
+package com.loafle.bridge.discoveryhost;
 
 /**
  * Created by root on 16. 11. 15.
diff --git a/src/main/java/com/loafle/bridge/discoveryhost/repository/DiscoveryHostRepository.java b/src/main/java/com/loafle/bridge/discoveryhost/DiscoveryHostRepository.java
similarity index 76%
rename from src/main/java/com/loafle/bridge/discoveryhost/repository/DiscoveryHostRepository.java
rename to src/main/java/com/loafle/bridge/discoveryhost/DiscoveryHostRepository.java
index 9b7cf08..aa8ce98 100644
--- a/src/main/java/com/loafle/bridge/discoveryhost/repository/DiscoveryHostRepository.java
+++ b/src/main/java/com/loafle/bridge/discoveryhost/DiscoveryHostRepository.java
@@ -1,6 +1,6 @@
-package com.loafle.bridge.discoveryhost.repository;
+package com.loafle.bridge.discoveryhost;
 
-import com.loafle.bridge.discoveryhost.entity.DiscoveryHost;
+import com.loafle.bridge.discoveryhost.DiscoveryHost;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.rest.core.annotation.RepositoryRestResource;
 
diff --git a/src/main/java/com/loafle/bridge/discoveryhost/entity/PortScanHistory.java b/src/main/java/com/loafle/bridge/discoveryhost/PortScanHistory.java
similarity index 98%
rename from src/main/java/com/loafle/bridge/discoveryhost/entity/PortScanHistory.java
rename to src/main/java/com/loafle/bridge/discoveryhost/PortScanHistory.java
index 3d4b85d..d33c744 100644
--- a/src/main/java/com/loafle/bridge/discoveryhost/entity/PortScanHistory.java
+++ b/src/main/java/com/loafle/bridge/discoveryhost/PortScanHistory.java
@@ -1,4 +1,4 @@
-package com.loafle.bridge.discoveryhost.entity;
+package com.loafle.bridge.discoveryhost;
 
 import com.loafle.bridge.discoveryport.type.DirectionType;
 import com.loafle.bridge.discoveryport.type.PortType;
diff --git a/src/main/java/com/loafle/bridge/discoveryport/DiscoveryPort.java b/src/main/java/com/loafle/bridge/discoveryport/DiscoveryPort.java
index 79d6ba3..3b0b905 100644
--- a/src/main/java/com/loafle/bridge/discoveryport/DiscoveryPort.java
+++ b/src/main/java/com/loafle/bridge/discoveryport/DiscoveryPort.java
@@ -1,6 +1,6 @@
 package com.loafle.bridge.discoveryport;
 
-import com.loafle.bridge.discoveryhost.entity.DiscoveryHost;
+import com.loafle.bridge.discoveryhost.DiscoveryHost;
 import com.loafle.bridge.discoveryport.type.PortType;
 import com.loafle.bridge.discoveryservice.DiscoveryService;
 
diff --git a/src/test/java/com/loafle/bridge/discoveryhost/repository/DiscoveryHostRepositoryTest.java b/src/test/java/com/loafle/bridge/discoveryhost/repository/DiscoveryHostRepositoryTest.java
index 624c498..a108af0 100644
--- a/src/test/java/com/loafle/bridge/discoveryhost/repository/DiscoveryHostRepositoryTest.java
+++ b/src/test/java/com/loafle/bridge/discoveryhost/repository/DiscoveryHostRepositoryTest.java
@@ -1,8 +1,9 @@
 package com.loafle.bridge.discoveryhost.repository;
 
 import com.loafle.bridge.Application;
-import com.loafle.bridge.discoveryhost.entity.DiscoveryHost;
-import com.loafle.bridge.discoveryhost.entity.PortScanHistory;
+import com.loafle.bridge.discoveryhost.DiscoveryHost;
+import com.loafle.bridge.discoveryhost.DiscoveryHostRepository;
+import com.loafle.bridge.discoveryhost.PortScanHistory;
 import com.loafle.bridge.discoveryport.type.DirectionType;
 import com.loafle.bridge.discoveryport.type.PortType;
 import org.apache.log4j.Logger;