diff --git a/ext/Commands/Help.tmCommand b/ext/Jinja.tmbundle/Commands/Help.tmCommand
similarity index 100%
rename from ext/Commands/Help.tmCommand
rename to ext/Jinja.tmbundle/Commands/Help.tmCommand
diff --git a/ext/Commands/Validate Syntax.tmCommand b/ext/Jinja.tmbundle/Commands/Validate Syntax.tmCommand
similarity index 100%
rename from ext/Commands/Validate Syntax.tmCommand
rename to ext/Jinja.tmbundle/Commands/Validate Syntax.tmCommand
diff --git a/ext/Commands/Wrap in Tag.tmCommand b/ext/Jinja.tmbundle/Commands/Wrap in Tag.tmCommand
similarity index 100%
rename from ext/Commands/Wrap in Tag.tmCommand
rename to ext/Jinja.tmbundle/Commands/Wrap in Tag.tmCommand
diff --git a/ext/Commands/Wrap in Variable Tag.tmCommand b/ext/Jinja.tmbundle/Commands/Wrap in Variable Tag.tmCommand
similarity index 100%
rename from ext/Commands/Wrap in Variable Tag.tmCommand
rename to ext/Jinja.tmbundle/Commands/Wrap in Variable Tag.tmCommand
diff --git a/ext/Preferences/Symbol List: Blocks.tmPreferences b/ext/Jinja.tmbundle/Preferences/Symbol List: Blocks.tmPreferences
similarity index 100%
rename from ext/Preferences/Symbol List: Blocks.tmPreferences
rename to ext/Jinja.tmbundle/Preferences/Symbol List: Blocks.tmPreferences
diff --git a/ext/Snippets/abs.tmSnippet b/ext/Jinja.tmbundle/Snippets/abs.tmSnippet
similarity index 100%
rename from ext/Snippets/abs.tmSnippet
rename to ext/Jinja.tmbundle/Snippets/abs.tmSnippet
diff --git a/ext/Snippets/batch.tmSnippet b/ext/Jinja.tmbundle/Snippets/batch.tmSnippet
similarity index 100%
rename from ext/Snippets/batch.tmSnippet
rename to ext/Jinja.tmbundle/Snippets/batch.tmSnippet
diff --git a/ext/Snippets/block.tmSnippet b/ext/Jinja.tmbundle/Snippets/block.tmSnippet
similarity index 100%
rename from ext/Snippets/block.tmSnippet
rename to ext/Jinja.tmbundle/Snippets/block.tmSnippet
diff --git a/ext/Snippets/capitalize.tmSnippet b/ext/Jinja.tmbundle/Snippets/capitalize.tmSnippet
similarity index 100%
rename from ext/Snippets/capitalize.tmSnippet
rename to ext/Jinja.tmbundle/Snippets/capitalize.tmSnippet
diff --git a/ext/Snippets/capture.tmSnippet b/ext/Jinja.tmbundle/Snippets/capture.tmSnippet
similarity index 100%
rename from ext/Snippets/capture.tmSnippet
rename to ext/Jinja.tmbundle/Snippets/capture.tmSnippet
diff --git a/ext/Snippets/center.tmSnippet b/ext/Jinja.tmbundle/Snippets/center.tmSnippet
similarity index 100%
rename from ext/Snippets/center.tmSnippet
rename to ext/Jinja.tmbundle/Snippets/center.tmSnippet
diff --git a/ext/Snippets/default.tmSnippet b/ext/Jinja.tmbundle/Snippets/default.tmSnippet
similarity index 100%
rename from ext/Snippets/default.tmSnippet
rename to ext/Jinja.tmbundle/Snippets/default.tmSnippet
diff --git a/ext/Snippets/dformat.tmSnippet b/ext/Jinja.tmbundle/Snippets/dformat.tmSnippet
similarity index 100%
rename from ext/Snippets/dformat.tmSnippet
rename to ext/Jinja.tmbundle/Snippets/dformat.tmSnippet
diff --git a/ext/Snippets/dictsort.tmSnippet b/ext/Jinja.tmbundle/Snippets/dictsort.tmSnippet
similarity index 100%
rename from ext/Snippets/dictsort.tmSnippet
rename to ext/Jinja.tmbundle/Snippets/dictsort.tmSnippet
diff --git a/ext/Snippets/escape.tmSnippet b/ext/Jinja.tmbundle/Snippets/escape.tmSnippet
similarity index 100%
rename from ext/Snippets/escape.tmSnippet
rename to ext/Jinja.tmbundle/Snippets/escape.tmSnippet
diff --git a/ext/Snippets/extends.tmSnippet b/ext/Jinja.tmbundle/Snippets/extends.tmSnippet
similarity index 100%
rename from ext/Snippets/extends.tmSnippet
rename to ext/Jinja.tmbundle/Snippets/extends.tmSnippet
diff --git a/ext/Snippets/filesizeformat.tmSnippet b/ext/Jinja.tmbundle/Snippets/filesizeformat.tmSnippet
similarity index 100%
rename from ext/Snippets/filesizeformat.tmSnippet
rename to ext/Jinja.tmbundle/Snippets/filesizeformat.tmSnippet
diff --git a/ext/Snippets/filter.tmSnippet b/ext/Jinja.tmbundle/Snippets/filter.tmSnippet
similarity index 100%
rename from ext/Snippets/filter.tmSnippet
rename to ext/Jinja.tmbundle/Snippets/filter.tmSnippet
diff --git a/ext/Snippets/first.tmSnippet b/ext/Jinja.tmbundle/Snippets/first.tmSnippet
similarity index 100%
rename from ext/Snippets/first.tmSnippet
rename to ext/Jinja.tmbundle/Snippets/first.tmSnippet
diff --git a/ext/Snippets/float.tmSnippet b/ext/Jinja.tmbundle/Snippets/float.tmSnippet
similarity index 100%
rename from ext/Snippets/float.tmSnippet
rename to ext/Jinja.tmbundle/Snippets/float.tmSnippet
diff --git a/ext/Snippets/for ___ in ___.tmSnippet b/ext/Jinja.tmbundle/Snippets/for ___ in ___.tmSnippet
similarity index 100%
rename from ext/Snippets/for ___ in ___.tmSnippet
rename to ext/Jinja.tmbundle/Snippets/for ___ in ___.tmSnippet
diff --git a/ext/Snippets/format.tmSnippet b/ext/Jinja.tmbundle/Snippets/format.tmSnippet
similarity index 100%
rename from ext/Snippets/format.tmSnippet
rename to ext/Jinja.tmbundle/Snippets/format.tmSnippet
diff --git a/ext/Snippets/if.tmSnippet b/ext/Jinja.tmbundle/Snippets/if.tmSnippet
similarity index 100%
rename from ext/Snippets/if.tmSnippet
rename to ext/Jinja.tmbundle/Snippets/if.tmSnippet
diff --git a/ext/Snippets/indent.tmSnippet b/ext/Jinja.tmbundle/Snippets/indent.tmSnippet
similarity index 100%
rename from ext/Snippets/indent.tmSnippet
rename to ext/Jinja.tmbundle/Snippets/indent.tmSnippet
diff --git a/ext/Snippets/int.tmSnippet b/ext/Jinja.tmbundle/Snippets/int.tmSnippet
similarity index 100%
rename from ext/Snippets/int.tmSnippet
rename to ext/Jinja.tmbundle/Snippets/int.tmSnippet
diff --git a/ext/Snippets/join.tmSnippet b/ext/Jinja.tmbundle/Snippets/join.tmSnippet
similarity index 100%
rename from ext/Snippets/join.tmSnippet
rename to ext/Jinja.tmbundle/Snippets/join.tmSnippet
diff --git a/ext/Snippets/jsonencode.tmSnippet b/ext/Jinja.tmbundle/Snippets/jsonencode.tmSnippet
similarity index 100%
rename from ext/Snippets/jsonencode.tmSnippet
rename to ext/Jinja.tmbundle/Snippets/jsonencode.tmSnippet
diff --git a/ext/Snippets/last.tmSnippet b/ext/Jinja.tmbundle/Snippets/last.tmSnippet
similarity index 100%
rename from ext/Snippets/last.tmSnippet
rename to ext/Jinja.tmbundle/Snippets/last.tmSnippet
diff --git a/ext/Snippets/length.tmSnippet b/ext/Jinja.tmbundle/Snippets/length.tmSnippet
similarity index 100%
rename from ext/Snippets/length.tmSnippet
rename to ext/Jinja.tmbundle/Snippets/length.tmSnippet
diff --git a/ext/Snippets/lower.tmSnippet b/ext/Jinja.tmbundle/Snippets/lower.tmSnippet
similarity index 100%
rename from ext/Snippets/lower.tmSnippet
rename to ext/Jinja.tmbundle/Snippets/lower.tmSnippet
diff --git a/ext/Snippets/macro.tmSnippet b/ext/Jinja.tmbundle/Snippets/macro.tmSnippet
similarity index 100%
rename from ext/Snippets/macro.tmSnippet
rename to ext/Jinja.tmbundle/Snippets/macro.tmSnippet
diff --git a/ext/Snippets/markdown.tmSnippet b/ext/Jinja.tmbundle/Snippets/markdown.tmSnippet
similarity index 100%
rename from ext/Snippets/markdown.tmSnippet
rename to ext/Jinja.tmbundle/Snippets/markdown.tmSnippet
diff --git a/ext/Snippets/pprint.tmSnippet b/ext/Jinja.tmbundle/Snippets/pprint.tmSnippet
similarity index 100%
rename from ext/Snippets/pprint.tmSnippet
rename to ext/Jinja.tmbundle/Snippets/pprint.tmSnippet
diff --git a/ext/Snippets/random.tmSnippet b/ext/Jinja.tmbundle/Snippets/random.tmSnippet
similarity index 100%
rename from ext/Snippets/random.tmSnippet
rename to ext/Jinja.tmbundle/Snippets/random.tmSnippet
diff --git a/ext/Snippets/raw.tmSnippet b/ext/Jinja.tmbundle/Snippets/raw.tmSnippet
similarity index 100%
rename from ext/Snippets/raw.tmSnippet
rename to ext/Jinja.tmbundle/Snippets/raw.tmSnippet
diff --git a/ext/Snippets/replace.tmSnippet b/ext/Jinja.tmbundle/Snippets/replace.tmSnippet
similarity index 100%
rename from ext/Snippets/replace.tmSnippet
rename to ext/Jinja.tmbundle/Snippets/replace.tmSnippet
diff --git a/ext/Snippets/reverse.tmSnippet b/ext/Jinja.tmbundle/Snippets/reverse.tmSnippet
similarity index 100%
rename from ext/Snippets/reverse.tmSnippet
rename to ext/Jinja.tmbundle/Snippets/reverse.tmSnippet
diff --git a/ext/Snippets/round.tmSnippet b/ext/Jinja.tmbundle/Snippets/round.tmSnippet
similarity index 100%
rename from ext/Snippets/round.tmSnippet
rename to ext/Jinja.tmbundle/Snippets/round.tmSnippet
diff --git a/ext/Snippets/rst.tmSnippet b/ext/Jinja.tmbundle/Snippets/rst.tmSnippet
similarity index 100%
rename from ext/Snippets/rst.tmSnippet
rename to ext/Jinja.tmbundle/Snippets/rst.tmSnippet
diff --git a/ext/Snippets/slice.tmSnippet b/ext/Jinja.tmbundle/Snippets/slice.tmSnippet
similarity index 100%
rename from ext/Snippets/slice.tmSnippet
rename to ext/Jinja.tmbundle/Snippets/slice.tmSnippet
diff --git a/ext/Snippets/sort.tmSnippet b/ext/Jinja.tmbundle/Snippets/sort.tmSnippet
similarity index 100%
rename from ext/Snippets/sort.tmSnippet
rename to ext/Jinja.tmbundle/Snippets/sort.tmSnippet
diff --git a/ext/Snippets/string.tmSnippet b/ext/Jinja.tmbundle/Snippets/string.tmSnippet
similarity index 100%
rename from ext/Snippets/string.tmSnippet
rename to ext/Jinja.tmbundle/Snippets/string.tmSnippet
diff --git a/ext/Snippets/striptags.tmSnippet b/ext/Jinja.tmbundle/Snippets/striptags.tmSnippet
similarity index 100%
rename from ext/Snippets/striptags.tmSnippet
rename to ext/Jinja.tmbundle/Snippets/striptags.tmSnippet
diff --git a/ext/Snippets/sum.tmSnippet b/ext/Jinja.tmbundle/Snippets/sum.tmSnippet
similarity index 100%
rename from ext/Snippets/sum.tmSnippet
rename to ext/Jinja.tmbundle/Snippets/sum.tmSnippet
diff --git a/ext/Snippets/textile.tmSnippet b/ext/Jinja.tmbundle/Snippets/textile.tmSnippet
similarity index 100%
rename from ext/Snippets/textile.tmSnippet
rename to ext/Jinja.tmbundle/Snippets/textile.tmSnippet
diff --git a/ext/Snippets/title.tmSnippet b/ext/Jinja.tmbundle/Snippets/title.tmSnippet
similarity index 100%
rename from ext/Snippets/title.tmSnippet
rename to ext/Jinja.tmbundle/Snippets/title.tmSnippet
diff --git a/ext/Snippets/trim.tmSnippet b/ext/Jinja.tmbundle/Snippets/trim.tmSnippet
similarity index 100%
rename from ext/Snippets/trim.tmSnippet
rename to ext/Jinja.tmbundle/Snippets/trim.tmSnippet
diff --git a/ext/Snippets/truncate.tmSnippet b/ext/Jinja.tmbundle/Snippets/truncate.tmSnippet
similarity index 100%
rename from ext/Snippets/truncate.tmSnippet
rename to ext/Jinja.tmbundle/Snippets/truncate.tmSnippet
diff --git a/ext/Snippets/upper.tmSnippet b/ext/Jinja.tmbundle/Snippets/upper.tmSnippet
similarity index 100%
rename from ext/Snippets/upper.tmSnippet
rename to ext/Jinja.tmbundle/Snippets/upper.tmSnippet
diff --git a/ext/Snippets/urlencode.tmSnippet b/ext/Jinja.tmbundle/Snippets/urlencode.tmSnippet
similarity index 100%
rename from ext/Snippets/urlencode.tmSnippet
rename to ext/Jinja.tmbundle/Snippets/urlencode.tmSnippet
diff --git a/ext/Snippets/urlize.tmSnippet b/ext/Jinja.tmbundle/Snippets/urlize.tmSnippet
similarity index 100%
rename from ext/Snippets/urlize.tmSnippet
rename to ext/Jinja.tmbundle/Snippets/urlize.tmSnippet
diff --git a/ext/Snippets/wordcount.tmSnippet b/ext/Jinja.tmbundle/Snippets/wordcount.tmSnippet
similarity index 100%
rename from ext/Snippets/wordcount.tmSnippet
rename to ext/Jinja.tmbundle/Snippets/wordcount.tmSnippet
diff --git a/ext/Snippets/wordwrap.tmSnippet b/ext/Jinja.tmbundle/Snippets/wordwrap.tmSnippet
similarity index 100%
rename from ext/Snippets/wordwrap.tmSnippet
rename to ext/Jinja.tmbundle/Snippets/wordwrap.tmSnippet
diff --git a/ext/Snippets/xmlattr.tmSnippet b/ext/Jinja.tmbundle/Snippets/xmlattr.tmSnippet
similarity index 100%
rename from ext/Snippets/xmlattr.tmSnippet
rename to ext/Jinja.tmbundle/Snippets/xmlattr.tmSnippet
diff --git a/ext/Syntaxes/HTML (Jinja Templates).tmLanguage b/ext/Jinja.tmbundle/Syntaxes/HTML (Jinja Templates).tmLanguage
similarity index 100%
rename from ext/Syntaxes/HTML (Jinja Templates).tmLanguage
rename to ext/Jinja.tmbundle/Syntaxes/HTML (Jinja Templates).tmLanguage
diff --git a/ext/Syntaxes/Jinja Templates.tmLanguage b/ext/Jinja.tmbundle/Syntaxes/Jinja Templates.tmLanguage
similarity index 100%
rename from ext/Syntaxes/Jinja Templates.tmLanguage
rename to ext/Jinja.tmbundle/Syntaxes/Jinja Templates.tmLanguage
diff --git a/ext/info.plist b/ext/Jinja.tmbundle/info.plist
similarity index 100%
rename from ext/info.plist
rename to ext/Jinja.tmbundle/info.plist