diff --git a/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxElement.java b/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxElement.java
index c6c305c73e9..a4c562c931a 100644
--- a/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxElement.java
+++ b/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxElement.java
@@ -14,12 +14,14 @@ import com.cloud.vm.NicProfile;
 import com.cloud.vm.ReservationContext;
 import com.cloud.vm.VirtualMachineProfile;
 import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
 
 import javax.naming.ConfigurationException;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 
+@Component
 public class NsxElement extends AdapterBase implements DhcpServiceProvider, DnsServiceProvider {
     private static final Logger LOGGER = Logger.getLogger(NsxElement.class);
 
diff --git a/plugins/network-elements/nsx/src/main/resources/META-INF.cloudstack.nsx/module.properties b/plugins/network-elements/nsx/src/main/resources/META-INF/cloudstack/nsx/module.properties
similarity index 100%
rename from plugins/network-elements/nsx/src/main/resources/META-INF.cloudstack.nsx/module.properties
rename to plugins/network-elements/nsx/src/main/resources/META-INF/cloudstack/nsx/module.properties
diff --git a/plugins/network-elements/nsx/src/main/resources/META-INF.cloudstack.nsx/spring-nsx-context.xml b/plugins/network-elements/nsx/src/main/resources/META-INF/cloudstack/nsx/spring-nsx-context.xml
similarity index 100%
rename from plugins/network-elements/nsx/src/main/resources/META-INF.cloudstack.nsx/spring-nsx-context.xml
rename to plugins/network-elements/nsx/src/main/resources/META-INF/cloudstack/nsx/spring-nsx-context.xml