diff --git a/Makefile b/Makefile
index 3f72b1b..fe7ad29 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-SUBDIRS = molecule
+SUBDIRS = plugins
 PREFIX = /usr
 BINDIR = $(PREFIX)/bin
 DESTDIR = 
diff --git a/molecule/Makefile b/molecule/Makefile
deleted file mode 100644
index f5366e0..0000000
--- a/molecule/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-PREFIX = /usr
-BINDIR = $(PREFIX)/bin
-DESTDIR = 
-LIBDIR = $(PREFIX)/lib
-SYSCONFDIR = /etc
-
-all:
-	
-
-clean:
-	
-
-install:
-	mkdir -p $(DESTDIR)$(LIBDIR)/molecule/molecule
-	cp *.py specs $(DESTDIR)$(LIBDIR)/molecule/molecule -Ra
diff --git a/plugins/Makefile b/plugins/Makefile
new file mode 100644
index 0000000..3f59008
--- /dev/null
+++ b/plugins/Makefile
@@ -0,0 +1,15 @@
+PREFIX = /usr
+BINDIR = $(PREFIX)/bin
+DESTDIR = 
+LIBDIR = $(PREFIX)/lib
+SYSCONFDIR = /etc
+
+all:
+	
+
+clean:
+	
+
+install:
+	install -d $(DESTDIR)$(LIBDIR)/molecule/molecule/specs/plugins
+	install -m 644 *.py $(DESTDIR)$(LIBDIR)/molecule/molecule/specs/plugins/
diff --git a/molecule/specs/plugins/__init__.py b/plugins/__init__.py
similarity index 100%
rename from molecule/specs/plugins/__init__.py
rename to plugins/__init__.py
diff --git a/molecule/specs/plugins/builtin_plugin.py b/plugins/builtin_plugin.py
similarity index 100%
rename from molecule/specs/plugins/builtin_plugin.py
rename to plugins/builtin_plugin.py
diff --git a/molecule/specs/plugins/image_plugin.py b/plugins/image_plugin.py
similarity index 100%
rename from molecule/specs/plugins/image_plugin.py
rename to plugins/image_plugin.py
diff --git a/molecule/specs/plugins/mmc_plugin.py b/plugins/mmc_plugin.py
similarity index 100%
rename from molecule/specs/plugins/mmc_plugin.py
rename to plugins/mmc_plugin.py
diff --git a/molecule/specs/plugins/remaster_plugin.py b/plugins/remaster_plugin.py
similarity index 100%
rename from molecule/specs/plugins/remaster_plugin.py
rename to plugins/remaster_plugin.py
diff --git a/molecule/specs/plugins/tar_plugin.py b/plugins/tar_plugin.py
similarity index 100%
rename from molecule/specs/plugins/tar_plugin.py
rename to plugins/tar_plugin.py