diff --git a/build/build-cloud-plugins.xml b/build/build-cloud-plugins.xml
index a464de99661..dcadb93184a 100755
--- a/build/build-cloud-plugins.xml
+++ b/build/build-cloud-plugins.xml
@@ -184,9 +184,9 @@
   </path>
 
 
-  <target name="compile-plugins" description="Compile all of the jars corresponding to plugins" depends="compile-utils, compile-api, compile-core, compile-server, compile-hypervisors, compile-deployment-planners, compile-host-allocators, compile-network-elements, compile-user-authenticators, compile-storage-allocators "/>
+  <target name="compile-plugins" description="Compile all of the jars corresponding to plugins" depends="compile-utils, compile-api, compile-core, compile-server, compile-hypervisors, compile-deployment-planners, compile-host-allocators, compile-network-elements, compile-user-authenticators, compile-storage-allocators, compile-file-systems "/>
 
-  <target name="build-plugins" depends="build-hypervisors, build-network-elements, build-deployment-planners, build-host-allocators, build-storage-allocators, build-user-authenticators" description="Builds all jar's for the plug-in's"/>
+  <target name="build-plugins" depends="build-hypervisors, build-network-elements, build-deployment-planners, build-host-allocators, build-storage-allocators, build-user-authenticators, build-file-systems" description="Builds all jar's for the plug-in's"/>
 
   <target name="clean-plugins" description="Clean all of the generated files by the plugins">
       <delete file="${build.log}" />
@@ -302,4 +302,16 @@
   </target>
   <target name="build-ovs" depends="compile-ovs"/>
 
+
+  <!-- ===================== File Systems ===================== -->
+
+  <target name="compile-file-systems" depends="compile-netapp" description="Compils all supported file systems"/>
+  <target name="build-file-systems" depends="build-netapp" description="Builds all supported file systems"/>
+ 
+  <target name="compile-netapp" depends="-init, compile-server" description="Compile NetApp plugin">
+  	<ant antfile="${base.dir}/plugins/file-systems/netapp/build.xml" target="build"/>
+  </target>
+  <target name="build-netapp" depends="compile-netapp"/>
+
+
 </project>
diff --git a/client/tomcatconf/components.xml.in b/client/tomcatconf/components.xml.in
index c81e3f02371..e4e062a27f3 100755
--- a/client/tomcatconf/components.xml.in
+++ b/client/tomcatconf/components.xml.in
@@ -168,6 +168,10 @@
         <dao name="CiscoNexusVSMDeviceDao" class="com.cloud.network.dao.CiscoNexusVSMDeviceDaoImpl" singleton="false"/>
         <dao name="OvsTunnelInterfaceDao" class="com.cloud.network.ovs.dao.OvsTunnelInterfaceDaoImpl" singleton="false"/>
         <dao name="OvsTunnelAccountDao" class="com.cloud.network.ovs.dao.OvsTunnelNetworkDaoImpl" singleton="false"/>
+        <dao name="NetappPool" class="com.cloud.netapp.dao.PoolDaoImpl" singleton="false"/>
+        <dao name="NetappVolume" class="com.cloud.netapp.dao.VolumeDaoImpl" singleton="false"/>
+        <dao name="NetappLun" class="com.cloud.netapp.dao.LunDaoImpl" singleton="false"/>
+        <manager name="NetappManager" key="com.cloud.netapp.NetappManager" class="com.cloud.netapp.NetappManagerImpl"/>
     </management-server>
 
     <configuration-server class="com.cloud.server.ConfigurationServerImpl">
diff --git a/plugins/file-systems/netapp/.classpath b/plugins/file-systems/netapp/.classpath
new file mode 100644
index 00000000000..a3f5d12a4c8
--- /dev/null
+++ b/plugins/file-systems/netapp/.classpath
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/api"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/core"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/server"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/utils"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/deps"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/file-systems/netapp/.project b/plugins/file-systems/netapp/.project
new file mode 100644
index 00000000000..a4445c25081
--- /dev/null
+++ b/plugins/file-systems/netapp/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>netapp</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/file-systems/netapp/build.xml b/plugins/file-systems/netapp/build.xml
new file mode 100755
index 00000000000..6326e144f6a
--- /dev/null
+++ b/plugins/file-systems/netapp/build.xml
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+
+<project name="Cloud Stack Netapp FS" default="help" basedir=".">
+  <description>
+		Cloud Stack ant build file
+    </description>
+
+  <dirname property="netapp.base.dir" file="${ant.file.Cloud Stack Netapp FS}/"/>
+  <!-- This directory must be set -->
+  <property name="top.dir" location="${netapp.base.dir}/../../.."/>
+  <property name="build.dir" location="${top.dir}/build"/>
+	
+	<echo message="build.dir=${build.dir}; top.dir=${top.dir}; netapp.base.dir=${netapp.base.dir}"/>
+
+  <!-- Import anything that the user wants to set-->
+  <!-- Import properties files and environment variables here -->
+
+  <property environment="env" />
+
+  <condition property="build-cloud.properties.file" value="${build.dir}/override/build-cloud.properties" else="${build.dir}/build-cloud.properties">
+    <available file="${build.dir}/override/build-cloud.properties" />
+  </condition>
+
+  <condition property="cloud.properties.file" value="${build.dir}/override/cloud.properties" else="${build.dir}/cloud.properties">
+    <available file="${build.dir}/override/cloud.properties" />
+  </condition>
+
+  <condition property="override.file" value="${build.dir}/override/replace.properties" else="${build.dir}/replace.properties">
+    <available file="${build.dir}/override/replace.properties" />
+  </condition>
+
+  <echo message="Using build parameters from ${build-cloud.properties.file}" />
+  <property file="${build-cloud.properties.file}" />
+
+  <echo message="Using company info from ${cloud.properties.file}" />
+  <property file="${cloud.properties.file}" />
+
+  <echo message="Using override file from ${override.file}" />
+  <property file="${override.file}" />
+
+  <property file="${build.dir}/build.number" />
+
+  <!-- In case these didn't get defined in the build-cloud.properties -->
+  <property name="branding.name" value="default" />
+  <property name="deprecation" value="off" />
+  <property name="target.compat.version" value="1.6" />
+  <property name="source.compat.version" value="1.6" />
+  <property name="debug" value="true" />
+  <property name="debuglevel" value="lines,source"/>
+
+  <echo message="target.dir=${target.dir}; top.dir=${top.dir}"/>
+  <!-- directories for build and distribution -->
+  <property name="target.dir" location="${top.dir}/target" />
+  <property name="classes.dir" location="${target.dir}/classes" />
+  <property name="jar.dir" location="${target.dir}/jar" />
+  <property name="dep.cache.dir" location="${target.dir}/dep-cache" />
+  <property name="build.log" location="${target.dir}/ant_verbose.txt" />
+
+  <property name="deps.dir" location="${top.dir}/deps" />
+  
+  <property name="cloud-plugin-netapp.jar" value="cloud-plugin-netapp.jar" />
+	
+  <import file="${build.dir}/build-common.xml"/>
+
+  <echo message="target.dir=${target.dir}; top.dir=${top.dir}"/>
+	
+  <!-- This section needs to be replaced by some kind of dependency library-->
+  <path id="deps.classpath">
+    <!--filelist files="${deps.classpath}" /-->
+    <fileset dir="${deps.dir}" erroronmissingdir="false">
+      <include name="*.jar" />
+    </fileset>
+  </path>
+	
+  <path id="cloudstack.classpath">
+  	<fileset dir="${jar.dir}">
+  	  <include name="*.jar"/>
+    </fileset>
+  </path>
+	
+  <path id="netapp.classpath">
+	<path refid="deps.classpath"/>
+  	<path refid="cloudstack.classpath"/>
+  </path>
+	
+  <!-- This section needs to be replaced by some kind of dependency library-->
+
+  <target name="deploy-netapp" >
+  </target>
+
+  <target name="init" description="Initialize binaries directory">
+  	<mkdir dir="${classes.dir}/${cloud-plugin-netapp.jar}"/>
+  	<mkdir dir="${jar.dir}"/>
+  </target>
+
+  <target name="compile-netapp" depends="init" description="Compile Netapp filesystem">
+    <compile-java jar.name="${cloud-plugin-netapp.jar}" top.dir="${netapp.base.dir}" classpath="netapp.classpath" />
+  </target>
+
+  <target name="clean-netapp">
+    <delete dir="${classes.dir}/${cloud-plugin-netapp.jar}"/>
+  </target>
+	
+  <target name="build" depends="compile-netapp"/>
+  <target name="clean" depends="clean-netapp"/>
+
+  <target name="help" description="help">
+    <echo level="info" message="This is the build file for NetApp FS for CloudStack"/>
+    <echo level="info" message="You can do a build by doing ant build or clean by doing ant clean" />
+  </target>
+
+</project>
diff --git a/server/src/com/cloud/api/commands/netapp/AssociateLunCmd.java b/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/AssociateLunCmd.java
similarity index 100%
rename from server/src/com/cloud/api/commands/netapp/AssociateLunCmd.java
rename to plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/AssociateLunCmd.java
diff --git a/server/src/com/cloud/api/commands/netapp/CreateLunCmd.java b/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/CreateLunCmd.java
similarity index 100%
rename from server/src/com/cloud/api/commands/netapp/CreateLunCmd.java
rename to plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/CreateLunCmd.java
diff --git a/server/src/com/cloud/api/commands/netapp/CreateVolumeOnFilerCmd.java b/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/CreateVolumeOnFilerCmd.java
similarity index 100%
rename from server/src/com/cloud/api/commands/netapp/CreateVolumeOnFilerCmd.java
rename to plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/CreateVolumeOnFilerCmd.java
diff --git a/server/src/com/cloud/api/commands/netapp/CreateVolumePoolCmd.java b/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/CreateVolumePoolCmd.java
similarity index 100%
rename from server/src/com/cloud/api/commands/netapp/CreateVolumePoolCmd.java
rename to plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/CreateVolumePoolCmd.java
diff --git a/server/src/com/cloud/api/commands/netapp/DeleteVolumePoolCmd.java b/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/DeleteVolumePoolCmd.java
similarity index 100%
rename from server/src/com/cloud/api/commands/netapp/DeleteVolumePoolCmd.java
rename to plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/DeleteVolumePoolCmd.java
diff --git a/server/src/com/cloud/api/commands/netapp/DestroyLunCmd.java b/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/DestroyLunCmd.java
similarity index 100%
rename from server/src/com/cloud/api/commands/netapp/DestroyLunCmd.java
rename to plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/DestroyLunCmd.java
diff --git a/server/src/com/cloud/api/commands/netapp/DestroyVolumeOnFilerCmd.java b/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/DestroyVolumeOnFilerCmd.java
similarity index 100%
rename from server/src/com/cloud/api/commands/netapp/DestroyVolumeOnFilerCmd.java
rename to plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/DestroyVolumeOnFilerCmd.java
diff --git a/server/src/com/cloud/api/commands/netapp/DissociateLunCmd.java b/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/DissociateLunCmd.java
similarity index 100%
rename from server/src/com/cloud/api/commands/netapp/DissociateLunCmd.java
rename to plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/DissociateLunCmd.java
diff --git a/server/src/com/cloud/api/commands/netapp/ListLunsCmd.java b/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/ListLunsCmd.java
similarity index 100%
rename from server/src/com/cloud/api/commands/netapp/ListLunsCmd.java
rename to plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/ListLunsCmd.java
diff --git a/server/src/com/cloud/api/commands/netapp/ListVolumePoolsCmd.java b/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/ListVolumePoolsCmd.java
similarity index 100%
rename from server/src/com/cloud/api/commands/netapp/ListVolumePoolsCmd.java
rename to plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/ListVolumePoolsCmd.java
diff --git a/server/src/com/cloud/api/commands/netapp/ListVolumesOnFilerCmd.java b/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/ListVolumesOnFilerCmd.java
similarity index 100%
rename from server/src/com/cloud/api/commands/netapp/ListVolumesOnFilerCmd.java
rename to plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/ListVolumesOnFilerCmd.java
diff --git a/server/src/com/cloud/api/commands/netapp/ModifyVolumePoolCmd.java b/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/ModifyVolumePoolCmd.java
similarity index 100%
rename from server/src/com/cloud/api/commands/netapp/ModifyVolumePoolCmd.java
rename to plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/ModifyVolumePoolCmd.java
diff --git a/server/src/com/cloud/netapp/LunVO.java b/plugins/file-systems/netapp/src/com/cloud/netapp/LunVO.java
similarity index 100%
rename from server/src/com/cloud/netapp/LunVO.java
rename to plugins/file-systems/netapp/src/com/cloud/netapp/LunVO.java
diff --git a/server/src/com/cloud/netapp/NetappAllocator.java b/plugins/file-systems/netapp/src/com/cloud/netapp/NetappAllocator.java
similarity index 100%
rename from server/src/com/cloud/netapp/NetappAllocator.java
rename to plugins/file-systems/netapp/src/com/cloud/netapp/NetappAllocator.java
diff --git a/server/src/com/cloud/netapp/NetappDefaultAllocatorImpl.java b/plugins/file-systems/netapp/src/com/cloud/netapp/NetappDefaultAllocatorImpl.java
similarity index 100%
rename from server/src/com/cloud/netapp/NetappDefaultAllocatorImpl.java
rename to plugins/file-systems/netapp/src/com/cloud/netapp/NetappDefaultAllocatorImpl.java
diff --git a/server/src/com/cloud/netapp/NetappManager.java b/plugins/file-systems/netapp/src/com/cloud/netapp/NetappManager.java
similarity index 100%
rename from server/src/com/cloud/netapp/NetappManager.java
rename to plugins/file-systems/netapp/src/com/cloud/netapp/NetappManager.java
diff --git a/server/src/com/cloud/netapp/NetappManagerImpl.java b/plugins/file-systems/netapp/src/com/cloud/netapp/NetappManagerImpl.java
similarity index 100%
rename from server/src/com/cloud/netapp/NetappManagerImpl.java
rename to plugins/file-systems/netapp/src/com/cloud/netapp/NetappManagerImpl.java
diff --git a/server/src/com/cloud/netapp/NetappVolumeVO.java b/plugins/file-systems/netapp/src/com/cloud/netapp/NetappVolumeVO.java
similarity index 100%
rename from server/src/com/cloud/netapp/NetappVolumeVO.java
rename to plugins/file-systems/netapp/src/com/cloud/netapp/NetappVolumeVO.java
diff --git a/server/src/com/cloud/netapp/PoolVO.java b/plugins/file-systems/netapp/src/com/cloud/netapp/PoolVO.java
similarity index 100%
rename from server/src/com/cloud/netapp/PoolVO.java
rename to plugins/file-systems/netapp/src/com/cloud/netapp/PoolVO.java
diff --git a/server/src/com/cloud/netapp/dao/LunDao.java b/plugins/file-systems/netapp/src/com/cloud/netapp/dao/LunDao.java
similarity index 100%
rename from server/src/com/cloud/netapp/dao/LunDao.java
rename to plugins/file-systems/netapp/src/com/cloud/netapp/dao/LunDao.java
diff --git a/server/src/com/cloud/netapp/dao/LunDaoImpl.java b/plugins/file-systems/netapp/src/com/cloud/netapp/dao/LunDaoImpl.java
similarity index 100%
rename from server/src/com/cloud/netapp/dao/LunDaoImpl.java
rename to plugins/file-systems/netapp/src/com/cloud/netapp/dao/LunDaoImpl.java
diff --git a/server/src/com/cloud/netapp/dao/PoolDao.java b/plugins/file-systems/netapp/src/com/cloud/netapp/dao/PoolDao.java
similarity index 100%
rename from server/src/com/cloud/netapp/dao/PoolDao.java
rename to plugins/file-systems/netapp/src/com/cloud/netapp/dao/PoolDao.java
diff --git a/server/src/com/cloud/netapp/dao/PoolDaoImpl.java b/plugins/file-systems/netapp/src/com/cloud/netapp/dao/PoolDaoImpl.java
similarity index 100%
rename from server/src/com/cloud/netapp/dao/PoolDaoImpl.java
rename to plugins/file-systems/netapp/src/com/cloud/netapp/dao/PoolDaoImpl.java
diff --git a/server/src/com/cloud/netapp/dao/VolumeDao.java b/plugins/file-systems/netapp/src/com/cloud/netapp/dao/VolumeDao.java
similarity index 100%
rename from server/src/com/cloud/netapp/dao/VolumeDao.java
rename to plugins/file-systems/netapp/src/com/cloud/netapp/dao/VolumeDao.java
diff --git a/server/src/com/cloud/netapp/dao/VolumeDaoImpl.java b/plugins/file-systems/netapp/src/com/cloud/netapp/dao/VolumeDaoImpl.java
similarity index 100%
rename from server/src/com/cloud/netapp/dao/VolumeDaoImpl.java
rename to plugins/file-systems/netapp/src/com/cloud/netapp/dao/VolumeDaoImpl.java
diff --git a/server/src/com/cloud/configuration/PremiumComponentLibrary.java b/server/src/com/cloud/configuration/PremiumComponentLibrary.java
index ac82603207b..b25f462f4d0 100755
--- a/server/src/com/cloud/configuration/PremiumComponentLibrary.java
+++ b/server/src/com/cloud/configuration/PremiumComponentLibrary.java
@@ -27,10 +27,6 @@ import com.cloud.baremetal.PxeServerManager.PxeServerType;
 import com.cloud.baremetal.PxeServerManagerImpl;
 import com.cloud.baremetal.PxeServerService;
 import com.cloud.ha.HighAvailabilityManagerExtImpl;
-import com.cloud.netapp.NetappManagerImpl;
-import com.cloud.netapp.dao.LunDaoImpl;
-import com.cloud.netapp.dao.PoolDaoImpl;
-import com.cloud.netapp.dao.VolumeDaoImpl;
 import com.cloud.network.ExternalNetworkDeviceManagerImpl;
 import com.cloud.network.NetworkUsageManagerImpl;
 import com.cloud.secstorage.CommandExecLogDaoImpl;
@@ -51,9 +47,6 @@ public class PremiumComponentLibrary extends DefaultComponentLibrary {
         addDao("UsageDao", UsageDaoImpl.class);
         addDao("UsageIpAddressDao", UsageIPAddressDaoImpl.class);
         addDao("CommandExecLogDao", CommandExecLogDaoImpl.class);
-        addDao("NetappPool", PoolDaoImpl.class);
-        addDao("NetappVolume", VolumeDaoImpl.class);
-        addDao("NetappLun", LunDaoImpl.class);
     }
 
     @Override
@@ -68,7 +61,6 @@ public class PremiumComponentLibrary extends DefaultComponentLibrary {
         addManager("ExternalDhcpManager", ExternalDhcpManagerImpl.class);
         addManager("PxeServerManager", PxeServerManagerImpl.class);
         addManager("NetworkUsageManager", NetworkUsageManagerImpl.class);
-        addManager("NetappManager", NetappManagerImpl.class);
     }
 
     @Override