diff --git a/README.md b/README.md
index f8b8ae27..7aa10d44 100644
--- a/README.md
+++ b/README.md
@@ -20,4 +20,4 @@ If you add a file in the src directory, be sure to add the filename to the filen
 To run unit tests, open the `unitTests.html` file in the `tests` directory.  To run functional tests, open the `functionalTests.html` file.  The tests output the results to the console via `console.log()` so be sure to have it open.
 
 #Pull Requests
-I'd be happy to review any pull requests that may better the KineticJS project, in particular if you have a bug fix or a new geometry (see `src/geometries` for examples).  Before doing so, please first make sure that all of the unit tests and functional tests pass.
+I'd be happy to review any pull requests that may better the KineticJS project, in particular if you have a bug fix or a new shape (see `src/shapes` for examples).  Before doing so, please first make sure that all of the unit tests and functional tests pass.
diff --git a/Thorfile b/Thorfile
index 4276ca96..a48ade58 100644
--- a/Thorfile
+++ b/Thorfile
@@ -4,8 +4,8 @@ class Build < Thor
   # This is the list of files to concatenate. The first file will appear at the top of the final file. All files are relative to the lib directory.
   FILES = [
     "license.js", "src/GlobalObject.js", "src/Node.js", "src/Container.js", "src/Stage.js",
-    "src/Layer.js", "src/Group.js", "src/Shape.js", "src/geometries/Rect.js", "src/geometries/Circle.js", "src/geometries/Image.js",
-    "src/geometries/Polygon.js", "src/geometries/RegularPolygon.js", "src/geometries/Star.js", "src/geometries/Text.js"
+    "src/Layer.js", "src/Group.js", "src/Shape.js", "src/shapes/Rect.js", "src/shapes/Circle.js", "src/shapes/Image.js",
+    "src/shapes/Polygon.js", "src/shapes/RegularPolygon.js", "src/shapes/Star.js", "src/shapes/Text.js"
   ]
   
   desc "dev", "Concatenate all the js files into /dist/kinetic-VERSION.js."
diff --git a/src/geometries/Circle.js b/src/shapes/Circle.js
similarity index 100%
rename from src/geometries/Circle.js
rename to src/shapes/Circle.js
diff --git a/src/geometries/Image.js b/src/shapes/Image.js
similarity index 100%
rename from src/geometries/Image.js
rename to src/shapes/Image.js
diff --git a/src/geometries/Polygon.js b/src/shapes/Polygon.js
similarity index 100%
rename from src/geometries/Polygon.js
rename to src/shapes/Polygon.js
diff --git a/src/geometries/Rect.js b/src/shapes/Rect.js
similarity index 100%
rename from src/geometries/Rect.js
rename to src/shapes/Rect.js
diff --git a/src/geometries/RegularPolygon.js b/src/shapes/RegularPolygon.js
similarity index 100%
rename from src/geometries/RegularPolygon.js
rename to src/shapes/RegularPolygon.js
diff --git a/src/geometries/Star.js b/src/shapes/Star.js
similarity index 100%
rename from src/geometries/Star.js
rename to src/shapes/Star.js
diff --git a/src/geometries/Text.js b/src/shapes/Text.js
similarity index 100%
rename from src/geometries/Text.js
rename to src/shapes/Text.js