diff --git a/Package.swift b/Package.swift
index adfcea4..43d2019 100644
--- a/Package.swift
+++ b/Package.swift
@@ -13,7 +13,7 @@ let package = Package(
   targets: [
     .target(name: "Stencil", dependencies: [
       "PathKit"
-    ], path: "Sources"),
+    ]),
     .testTarget(name: "StencilTests", dependencies: [
       "Stencil",
       "Spectre"
diff --git a/Sources/Context.swift b/Sources/Stencil/Context.swift
similarity index 100%
rename from Sources/Context.swift
rename to Sources/Stencil/Context.swift
diff --git a/Sources/DynamicMemberLookup.swift b/Sources/Stencil/DynamicMemberLookup.swift
similarity index 100%
rename from Sources/DynamicMemberLookup.swift
rename to Sources/Stencil/DynamicMemberLookup.swift
diff --git a/Sources/Environment.swift b/Sources/Stencil/Environment.swift
similarity index 100%
rename from Sources/Environment.swift
rename to Sources/Stencil/Environment.swift
diff --git a/Sources/Errors.swift b/Sources/Stencil/Errors.swift
similarity index 100%
rename from Sources/Errors.swift
rename to Sources/Stencil/Errors.swift
diff --git a/Sources/Expression.swift b/Sources/Stencil/Expression.swift
similarity index 100%
rename from Sources/Expression.swift
rename to Sources/Stencil/Expression.swift
diff --git a/Sources/Extension.swift b/Sources/Stencil/Extension.swift
similarity index 100%
rename from Sources/Extension.swift
rename to Sources/Stencil/Extension.swift
diff --git a/Sources/FilterTag.swift b/Sources/Stencil/FilterTag.swift
similarity index 100%
rename from Sources/FilterTag.swift
rename to Sources/Stencil/FilterTag.swift
diff --git a/Sources/Filters.swift b/Sources/Stencil/Filters.swift
similarity index 100%
rename from Sources/Filters.swift
rename to Sources/Stencil/Filters.swift
diff --git a/Sources/ForTag.swift b/Sources/Stencil/ForTag.swift
similarity index 100%
rename from Sources/ForTag.swift
rename to Sources/Stencil/ForTag.swift
diff --git a/Sources/IfTag.swift b/Sources/Stencil/IfTag.swift
similarity index 100%
rename from Sources/IfTag.swift
rename to Sources/Stencil/IfTag.swift
diff --git a/Sources/Include.swift b/Sources/Stencil/Include.swift
similarity index 100%
rename from Sources/Include.swift
rename to Sources/Stencil/Include.swift
diff --git a/Sources/Inheritence.swift b/Sources/Stencil/Inheritance.swift
similarity index 100%
rename from Sources/Inheritence.swift
rename to Sources/Stencil/Inheritance.swift
diff --git a/Sources/KeyPath.swift b/Sources/Stencil/KeyPath.swift
similarity index 100%
rename from Sources/KeyPath.swift
rename to Sources/Stencil/KeyPath.swift
diff --git a/Sources/Lexer.swift b/Sources/Stencil/Lexer.swift
similarity index 100%
rename from Sources/Lexer.swift
rename to Sources/Stencil/Lexer.swift
diff --git a/Sources/Loader.swift b/Sources/Stencil/Loader.swift
similarity index 100%
rename from Sources/Loader.swift
rename to Sources/Stencil/Loader.swift
diff --git a/Sources/Node.swift b/Sources/Stencil/Node.swift
similarity index 100%
rename from Sources/Node.swift
rename to Sources/Stencil/Node.swift
diff --git a/Sources/NowTag.swift b/Sources/Stencil/NowTag.swift
similarity index 100%
rename from Sources/NowTag.swift
rename to Sources/Stencil/NowTag.swift
diff --git a/Sources/Parser.swift b/Sources/Stencil/Parser.swift
similarity index 100%
rename from Sources/Parser.swift
rename to Sources/Stencil/Parser.swift
diff --git a/Sources/Template.swift b/Sources/Stencil/Template.swift
similarity index 100%
rename from Sources/Template.swift
rename to Sources/Stencil/Template.swift
diff --git a/Sources/Tokenizer.swift b/Sources/Stencil/Tokenizer.swift
similarity index 100%
rename from Sources/Tokenizer.swift
rename to Sources/Stencil/Tokenizer.swift
diff --git a/Sources/Variable.swift b/Sources/Stencil/Variable.swift
similarity index 100%
rename from Sources/Variable.swift
rename to Sources/Stencil/Variable.swift
diff --git a/Stencil.podspec.json b/Stencil.podspec.json
index fc5a430..be5b59d 100644
--- a/Stencil.podspec.json
+++ b/Stencil.podspec.json
@@ -16,7 +16,7 @@
     "tag": "0.14.2"
   },
   "source_files": [
-    "Sources/*.swift"
+    "Sources/Stencil/*.swift"
   ],
   "platforms": {
     "ios": "8.0",
diff --git a/rakelib/lint.sh b/rakelib/lint.sh
index d1a2140..efd2721 100755
--- a/rakelib/lint.sh
+++ b/rakelib/lint.sh
@@ -10,7 +10,7 @@ else
 fi
 
 # possible paths
-paths_sources="Sources"
+paths_sources="Sources/Stencil"
 paths_tests="Tests/StencilTests"
 
 # load selected group