diff --git a/edbob/pyramid/scaffolds/__init__.py b/edbob/scaffolds/__init__.py
similarity index 97%
rename from edbob/pyramid/scaffolds/__init__.py
rename to edbob/scaffolds/__init__.py
index 6072e14..b058aff 100644
--- a/edbob/pyramid/scaffolds/__init__.py
+++ b/edbob/scaffolds/__init__.py
@@ -1,35 +1,35 @@
-#!/usr/bin/env python
-# -*- coding: utf-8  -*-
-################################################################################
-#
-#  edbob -- Pythonic Software Framework
-#  Copyright © 2010-2012 Lance Edgar
-#
-#  This file is part of edbob.
-#
-#  edbob is free software: you can redistribute it and/or modify it under the
-#  terms of the GNU Affero General Public License as published by the Free
-#  Software Foundation, either version 3 of the License, or (at your option)
-#  any later version.
-#
-#  edbob is distributed in the hope that it will be useful, but WITHOUT ANY
-#  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-#  FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for
-#  more details.
-#
-#  You should have received a copy of the GNU Affero General Public License
-#  along with edbob.  If not, see <http://www.gnu.org/licenses/>.
-#
-################################################################################
-
-"""
-``edbob.pyramid.scaffolds`` -- App Scaffolding
-"""
-
-from pyramid.scaffolds import PyramidTemplate
-
-
-class Template(PyramidTemplate):
-
-    _template_dir = 'edbob'
-    summary = "Pyramid edbob project"
+#!/usr/bin/env python
+# -*- coding: utf-8  -*-
+################################################################################
+#
+#  edbob -- Pythonic Software Framework
+#  Copyright © 2010-2012 Lance Edgar
+#
+#  This file is part of edbob.
+#
+#  edbob is free software: you can redistribute it and/or modify it under the
+#  terms of the GNU Affero General Public License as published by the Free
+#  Software Foundation, either version 3 of the License, or (at your option)
+#  any later version.
+#
+#  edbob is distributed in the hope that it will be useful, but WITHOUT ANY
+#  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+#  FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for
+#  more details.
+#
+#  You should have received a copy of the GNU Affero General Public License
+#  along with edbob.  If not, see <http://www.gnu.org/licenses/>.
+#
+################################################################################
+
+"""
+``edbob.pyramid.scaffolds`` -- App Scaffolding
+"""
+
+from pyramid.scaffolds import PyramidTemplate
+
+
+class Template(PyramidTemplate):
+
+    _template_dir = 'edbob'
+    summary = "Pyramid edbob project"
diff --git a/edbob/pyramid/scaffolds/edbob/+package+/__init__.py_tmpl b/edbob/scaffolds/edbob/+package+/__init__.py_tmpl
similarity index 100%
rename from edbob/pyramid/scaffolds/edbob/+package+/__init__.py_tmpl
rename to edbob/scaffolds/edbob/+package+/__init__.py_tmpl
diff --git a/edbob/pyramid/scaffolds/edbob/+package+/_version.py b/edbob/scaffolds/edbob/+package+/_version.py
similarity index 100%
rename from edbob/pyramid/scaffolds/edbob/+package+/_version.py
rename to edbob/scaffolds/edbob/+package+/_version.py
diff --git a/edbob/pyramid/scaffolds/edbob/+package+/commands.py_tmpl b/edbob/scaffolds/edbob/+package+/commands.py_tmpl
similarity index 100%
rename from edbob/pyramid/scaffolds/edbob/+package+/commands.py_tmpl
rename to edbob/scaffolds/edbob/+package+/commands.py_tmpl
diff --git a/edbob/pyramid/scaffolds/edbob/+package+/filemon.py_tmpl b/edbob/scaffolds/edbob/+package+/filemon.py_tmpl
similarity index 100%
rename from edbob/pyramid/scaffolds/edbob/+package+/filemon.py_tmpl
rename to edbob/scaffolds/edbob/+package+/filemon.py_tmpl
diff --git a/edbob/pyramid/scaffolds/edbob/+package+/static/favicon.ico b/edbob/scaffolds/edbob/+package+/static/favicon.ico
similarity index 100%
rename from edbob/pyramid/scaffolds/edbob/+package+/static/favicon.ico
rename to edbob/scaffolds/edbob/+package+/static/favicon.ico
diff --git a/edbob/pyramid/scaffolds/edbob/+package+/static/robots.txt b/edbob/scaffolds/edbob/+package+/static/robots.txt
similarity index 100%
rename from edbob/pyramid/scaffolds/edbob/+package+/static/robots.txt
rename to edbob/scaffolds/edbob/+package+/static/robots.txt
diff --git a/edbob/pyramid/scaffolds/edbob/+package+/subscribers.py_tmpl b/edbob/scaffolds/edbob/+package+/subscribers.py_tmpl
similarity index 100%
rename from edbob/pyramid/scaffolds/edbob/+package+/subscribers.py_tmpl
rename to edbob/scaffolds/edbob/+package+/subscribers.py_tmpl
diff --git a/edbob/pyramid/scaffolds/edbob/+package+/templates/base.mako_tmpl b/edbob/scaffolds/edbob/+package+/templates/base.mako_tmpl
similarity index 100%
rename from edbob/pyramid/scaffolds/edbob/+package+/templates/base.mako_tmpl
rename to edbob/scaffolds/edbob/+package+/templates/base.mako_tmpl
diff --git a/edbob/pyramid/scaffolds/edbob/+package+/templates/home.mako_tmpl b/edbob/scaffolds/edbob/+package+/templates/home.mako_tmpl
similarity index 100%
rename from edbob/pyramid/scaffolds/edbob/+package+/templates/home.mako_tmpl
rename to edbob/scaffolds/edbob/+package+/templates/home.mako_tmpl
diff --git a/edbob/pyramid/scaffolds/edbob/+package+/templates/index.mako b/edbob/scaffolds/edbob/+package+/templates/index.mako
similarity index 100%
rename from edbob/pyramid/scaffolds/edbob/+package+/templates/index.mako
rename to edbob/scaffolds/edbob/+package+/templates/index.mako
diff --git a/edbob/pyramid/scaffolds/edbob/+package+/views/__init__.py_tmpl b/edbob/scaffolds/edbob/+package+/views/__init__.py_tmpl
similarity index 100%
rename from edbob/pyramid/scaffolds/edbob/+package+/views/__init__.py_tmpl
rename to edbob/scaffolds/edbob/+package+/views/__init__.py_tmpl
diff --git a/edbob/pyramid/scaffolds/edbob/CHANGES.txt b/edbob/scaffolds/edbob/CHANGES.txt
similarity index 100%
rename from edbob/pyramid/scaffolds/edbob/CHANGES.txt
rename to edbob/scaffolds/edbob/CHANGES.txt
diff --git a/edbob/pyramid/scaffolds/edbob/MANIFEST.in_tmpl b/edbob/scaffolds/edbob/MANIFEST.in_tmpl
similarity index 100%
rename from edbob/pyramid/scaffolds/edbob/MANIFEST.in_tmpl
rename to edbob/scaffolds/edbob/MANIFEST.in_tmpl
diff --git a/edbob/pyramid/scaffolds/edbob/README.txt_tmpl b/edbob/scaffolds/edbob/README.txt_tmpl
similarity index 100%
rename from edbob/pyramid/scaffolds/edbob/README.txt_tmpl
rename to edbob/scaffolds/edbob/README.txt_tmpl
diff --git a/edbob/pyramid/scaffolds/edbob/development.ini_tmpl b/edbob/scaffolds/edbob/development.ini_tmpl
similarity index 100%
rename from edbob/pyramid/scaffolds/edbob/development.ini_tmpl
rename to edbob/scaffolds/edbob/development.ini_tmpl
diff --git a/edbob/pyramid/scaffolds/edbob/production.ini_tmpl b/edbob/scaffolds/edbob/production.ini_tmpl
similarity index 100%
rename from edbob/pyramid/scaffolds/edbob/production.ini_tmpl
rename to edbob/scaffolds/edbob/production.ini_tmpl
diff --git a/edbob/pyramid/scaffolds/edbob/setup.cfg_tmpl b/edbob/scaffolds/edbob/setup.cfg_tmpl
similarity index 100%
rename from edbob/pyramid/scaffolds/edbob/setup.cfg_tmpl
rename to edbob/scaffolds/edbob/setup.cfg_tmpl
diff --git a/edbob/pyramid/scaffolds/edbob/setup.py_tmpl b/edbob/scaffolds/edbob/setup.py_tmpl
similarity index 100%
rename from edbob/pyramid/scaffolds/edbob/setup.py_tmpl
rename to edbob/scaffolds/edbob/setup.py_tmpl
diff --git a/setup.py b/setup.py
index 7bfdeaf..a18574d 100644
--- a/setup.py
+++ b/setup.py
@@ -175,7 +175,7 @@ edbob = edbob.commands:main
 edbobw = edbob.commands:main
 
 [pyramid.scaffold]
-edbob = edbob.pyramid.scaffolds:Template
+edbob = edbob.scaffolds:Template
 
 [edbob.commands]
 db = edbob.commands:DatabaseCommand