diff --git a/build b/build
index 14d8abed..4e503f56 100755
--- a/build
+++ b/build
@@ -15,7 +15,7 @@ export GOPATH=${PWD}/gopath
 mkdir -p "${PWD}/bin"
 
 echo "Building plugins"
-PLUGINS="plugins/*"
+PLUGINS="plugins/sample plugins/main/vlan"
 for d in $PLUGINS; do
 	if [ -d "$d" ]; then
 		plugin="$(basename "$d")"
diff --git a/plugins/vlan/vlan.go b/plugins/main/vlan/vlan.go
similarity index 100%
rename from plugins/vlan/vlan.go
rename to plugins/main/vlan/vlan.go
diff --git a/plugins/vlan/vlan_suite_test.go b/plugins/main/vlan/vlan_suite_test.go
similarity index 100%
rename from plugins/vlan/vlan_suite_test.go
rename to plugins/main/vlan/vlan_suite_test.go
diff --git a/plugins/vlan/vlan_test.go b/plugins/main/vlan/vlan_test.go
similarity index 100%
rename from plugins/vlan/vlan_test.go
rename to plugins/main/vlan/vlan_test.go
diff --git a/test b/test
index 342d4c6f..6c1ec4b8 100755
--- a/test
+++ b/test
@@ -27,7 +27,7 @@ CNI_PATH=$(pwd)/bin:${CNI_PATH}
 
 echo "Running tests"
 
-TESTABLE="plugins/sample plugins/vlan"
+TESTABLE="plugins/sample plugins/main/vlan"
 
 # user has not provided PKG override
 if [ -z "$PKG" ]; then