diff --git a/Haanga/LICENSE b/lib/Haanga/LICENSE
similarity index 100%
rename from Haanga/LICENSE
rename to lib/Haanga/LICENSE
diff --git a/Haanga/Makefile b/lib/Haanga/Makefile
similarity index 100%
rename from Haanga/Makefile
rename to lib/Haanga/Makefile
diff --git a/Haanga/README b/lib/Haanga/README
similarity index 100%
rename from Haanga/README
rename to lib/Haanga/README
diff --git a/Haanga/contrib/dummy.php b/lib/Haanga/contrib/dummy.php
similarity index 100%
rename from Haanga/contrib/dummy.php
rename to lib/Haanga/contrib/dummy.php
diff --git a/Haanga/contrib/meneame_pagination.php b/lib/Haanga/contrib/meneame_pagination.php
similarity index 100%
rename from Haanga/contrib/meneame_pagination.php
rename to lib/Haanga/contrib/meneame_pagination.php
diff --git a/Haanga/examples/complex/base.html b/lib/Haanga/examples/complex/base.html
similarity index 100%
rename from Haanga/examples/complex/base.html
rename to lib/Haanga/examples/complex/base.html
diff --git a/Haanga/examples/complex/include.html b/lib/Haanga/examples/complex/include.html
similarity index 100%
rename from Haanga/examples/complex/include.html
rename to lib/Haanga/examples/complex/include.html
diff --git a/Haanga/examples/complex/index-test.html b/lib/Haanga/examples/complex/index-test.html
similarity index 100%
rename from Haanga/examples/complex/index-test.html
rename to lib/Haanga/examples/complex/index-test.html
diff --git a/Haanga/examples/complex/index.html b/lib/Haanga/examples/complex/index.html
similarity index 100%
rename from Haanga/examples/complex/index.html
rename to lib/Haanga/examples/complex/index.html
diff --git a/Haanga/examples/complex/subtemplate.html b/lib/Haanga/examples/complex/subtemplate.html
similarity index 100%
rename from Haanga/examples/complex/subtemplate.html
rename to lib/Haanga/examples/complex/subtemplate.html
diff --git a/Haanga/examples/django-yui-layout-templates/README b/lib/Haanga/examples/django-yui-layout-templates/README
similarity index 100%
rename from Haanga/examples/django-yui-layout-templates/README
rename to lib/Haanga/examples/django-yui-layout-templates/README
diff --git a/Haanga/examples/django-yui-layout-templates/layout_1_column_full_width.html b/lib/Haanga/examples/django-yui-layout-templates/layout_1_column_full_width.html
similarity index 100%
rename from Haanga/examples/django-yui-layout-templates/layout_1_column_full_width.html
rename to lib/Haanga/examples/django-yui-layout-templates/layout_1_column_full_width.html
diff --git a/Haanga/examples/django-yui-layout-templates/layout_2_columns_narrow_left_column.html b/lib/Haanga/examples/django-yui-layout-templates/layout_2_columns_narrow_left_column.html
similarity index 100%
rename from Haanga/examples/django-yui-layout-templates/layout_2_columns_narrow_left_column.html
rename to lib/Haanga/examples/django-yui-layout-templates/layout_2_columns_narrow_left_column.html
diff --git a/Haanga/examples/django-yui-layout-templates/layout_2_columns_narrow_right_column.html b/lib/Haanga/examples/django-yui-layout-templates/layout_2_columns_narrow_right_column.html
similarity index 100%
rename from Haanga/examples/django-yui-layout-templates/layout_2_columns_narrow_right_column.html
rename to lib/Haanga/examples/django-yui-layout-templates/layout_2_columns_narrow_right_column.html
diff --git a/Haanga/examples/django-yui-layout-templates/layout_2_equal_columns.html b/lib/Haanga/examples/django-yui-layout-templates/layout_2_equal_columns.html
similarity index 100%
rename from Haanga/examples/django-yui-layout-templates/layout_2_equal_columns.html
rename to lib/Haanga/examples/django-yui-layout-templates/layout_2_equal_columns.html
diff --git a/Haanga/examples/django-yui-layout-templates/layout_3_columns_quarter_half_quarter.html b/lib/Haanga/examples/django-yui-layout-templates/layout_3_columns_quarter_half_quarter.html
similarity index 100%
rename from Haanga/examples/django-yui-layout-templates/layout_3_columns_quarter_half_quarter.html
rename to lib/Haanga/examples/django-yui-layout-templates/layout_3_columns_quarter_half_quarter.html
diff --git a/Haanga/examples/django-yui-layout-templates/layout_3_columns_varying_width.html b/lib/Haanga/examples/django-yui-layout-templates/layout_3_columns_varying_width.html
similarity index 100%
rename from Haanga/examples/django-yui-layout-templates/layout_3_columns_varying_width.html
rename to lib/Haanga/examples/django-yui-layout-templates/layout_3_columns_varying_width.html
diff --git a/Haanga/examples/django-yui-layout-templates/layout_3_equal_columns.html b/lib/Haanga/examples/django-yui-layout-templates/layout_3_equal_columns.html
similarity index 100%
rename from Haanga/examples/django-yui-layout-templates/layout_3_equal_columns.html
rename to lib/Haanga/examples/django-yui-layout-templates/layout_3_equal_columns.html
diff --git a/Haanga/examples/django-yui-layout-templates/layout_4_equal_columns.html b/lib/Haanga/examples/django-yui-layout-templates/layout_4_equal_columns.html
similarity index 100%
rename from Haanga/examples/django-yui-layout-templates/layout_4_equal_columns.html
rename to lib/Haanga/examples/django-yui-layout-templates/layout_4_equal_columns.html
diff --git a/Haanga/examples/django-yui-layout-templates/layout_base.html b/lib/Haanga/examples/django-yui-layout-templates/layout_base.html
similarity index 100%
rename from Haanga/examples/django-yui-layout-templates/layout_base.html
rename to lib/Haanga/examples/django-yui-layout-templates/layout_base.html
diff --git a/Haanga/examples/django-yui-layout-templates/layout_overrides.html b/lib/Haanga/examples/django-yui-layout-templates/layout_overrides.html
similarity index 100%
rename from Haanga/examples/django-yui-layout-templates/layout_overrides.html
rename to lib/Haanga/examples/django-yui-layout-templates/layout_overrides.html
diff --git a/Haanga/examples/django-yui-layout-templates/shared/footer.html b/lib/Haanga/examples/django-yui-layout-templates/shared/footer.html
similarity index 100%
rename from Haanga/examples/django-yui-layout-templates/shared/footer.html
rename to lib/Haanga/examples/django-yui-layout-templates/shared/footer.html
diff --git a/Haanga/examples/django-yui-layout-templates/shared/header.html b/lib/Haanga/examples/django-yui-layout-templates/shared/header.html
similarity index 100%
rename from Haanga/examples/django-yui-layout-templates/shared/header.html
rename to lib/Haanga/examples/django-yui-layout-templates/shared/header.html
diff --git a/Haanga/examples/django-yui.php b/lib/Haanga/examples/django-yui.php
similarity index 100%
rename from Haanga/examples/django-yui.php
rename to lib/Haanga/examples/django-yui.php
diff --git a/Haanga/examples/index.php b/lib/Haanga/examples/index.php
similarity index 100%
rename from Haanga/examples/index.php
rename to lib/Haanga/examples/index.php
diff --git a/Haanga/examples/inheritance.php b/lib/Haanga/examples/inheritance.php
similarity index 100%
rename from Haanga/examples/inheritance.php
rename to lib/Haanga/examples/inheritance.php
diff --git a/Haanga/examples/inheritance/layout.html b/lib/Haanga/examples/inheritance/layout.html
similarity index 100%
rename from Haanga/examples/inheritance/layout.html
rename to lib/Haanga/examples/inheritance/layout.html
diff --git a/Haanga/examples/inheritance/page.html b/lib/Haanga/examples/inheritance/page.html
similarity index 100%
rename from Haanga/examples/inheritance/page.html
rename to lib/Haanga/examples/inheritance/page.html
diff --git a/Haanga/examples/inheritance/section.html b/lib/Haanga/examples/inheritance/section.html
similarity index 100%
rename from Haanga/examples/inheritance/section.html
rename to lib/Haanga/examples/inheritance/section.html
diff --git a/Haanga/examples/inheritance/shared/about.html b/lib/Haanga/examples/inheritance/shared/about.html
similarity index 100%
rename from Haanga/examples/inheritance/shared/about.html
rename to lib/Haanga/examples/inheritance/shared/about.html
diff --git a/Haanga/examples/template_runtime.php b/lib/Haanga/examples/template_runtime.php
similarity index 100%
rename from Haanga/examples/template_runtime.php
rename to lib/Haanga/examples/template_runtime.php
diff --git a/Haanga/examples/tmp/.empty b/lib/Haanga/examples/tmp/.empty
similarity index 100%
rename from Haanga/examples/tmp/.empty
rename to lib/Haanga/examples/tmp/.empty
diff --git a/Haanga/haanga-cli.php b/lib/Haanga/haanga-cli.php
similarity index 100%
rename from Haanga/haanga-cli.php
rename to lib/Haanga/haanga-cli.php
diff --git a/Haanga/lib/Haanga.php b/lib/Haanga/lib/Haanga.php
similarity index 100%
rename from Haanga/lib/Haanga.php
rename to lib/Haanga/lib/Haanga.php
diff --git a/Haanga/lib/Haanga/AST.php b/lib/Haanga/lib/Haanga/AST.php
similarity index 100%
rename from Haanga/lib/Haanga/AST.php
rename to lib/Haanga/lib/Haanga/AST.php
diff --git a/Haanga/lib/Haanga/Compiler.php b/lib/Haanga/lib/Haanga/Compiler.php
similarity index 100%
rename from Haanga/lib/Haanga/Compiler.php
rename to lib/Haanga/lib/Haanga/Compiler.php
diff --git a/Haanga/lib/Haanga/Compiler/Exception.php b/lib/Haanga/lib/Haanga/Compiler/Exception.php
similarity index 100%
rename from Haanga/lib/Haanga/Compiler/Exception.php
rename to lib/Haanga/lib/Haanga/Compiler/Exception.php
diff --git a/Haanga/lib/Haanga/Compiler/Parser.php b/lib/Haanga/lib/Haanga/Compiler/Parser.php
similarity index 100%
rename from Haanga/lib/Haanga/Compiler/Parser.php
rename to lib/Haanga/lib/Haanga/Compiler/Parser.php
diff --git a/Haanga/lib/Haanga/Compiler/Parser.y b/lib/Haanga/lib/Haanga/Compiler/Parser.y
similarity index 100%
rename from Haanga/lib/Haanga/Compiler/Parser.y
rename to lib/Haanga/lib/Haanga/Compiler/Parser.y
diff --git a/Haanga/lib/Haanga/Compiler/Runtime.php b/lib/Haanga/lib/Haanga/Compiler/Runtime.php
similarity index 100%
rename from Haanga/lib/Haanga/Compiler/Runtime.php
rename to lib/Haanga/lib/Haanga/Compiler/Runtime.php
diff --git a/Haanga/lib/Haanga/Compiler/Tokenizer.php b/lib/Haanga/lib/Haanga/Compiler/Tokenizer.php
similarity index 100%
rename from Haanga/lib/Haanga/Compiler/Tokenizer.php
rename to lib/Haanga/lib/Haanga/Compiler/Tokenizer.php
diff --git a/Haanga/lib/Haanga/Exception.php b/lib/Haanga/lib/Haanga/Exception.php
similarity index 100%
rename from Haanga/lib/Haanga/Exception.php
rename to lib/Haanga/lib/Haanga/Exception.php
diff --git a/Haanga/lib/Haanga/Extension.php b/lib/Haanga/lib/Haanga/Extension.php
similarity index 100%
rename from Haanga/lib/Haanga/Extension.php
rename to lib/Haanga/lib/Haanga/Extension.php
diff --git a/Haanga/lib/Haanga/Extension/Filter.php b/lib/Haanga/lib/Haanga/Extension/Filter.php
similarity index 100%
rename from Haanga/lib/Haanga/Extension/Filter.php
rename to lib/Haanga/lib/Haanga/Extension/Filter.php
diff --git a/Haanga/lib/Haanga/Extension/Filter/Capfirst.php b/lib/Haanga/lib/Haanga/Extension/Filter/Capfirst.php
similarity index 100%
rename from Haanga/lib/Haanga/Extension/Filter/Capfirst.php
rename to lib/Haanga/lib/Haanga/Extension/Filter/Capfirst.php
diff --git a/Haanga/lib/Haanga/Extension/Filter/Count.php b/lib/Haanga/lib/Haanga/Extension/Filter/Count.php
similarity index 100%
rename from Haanga/lib/Haanga/Extension/Filter/Count.php
rename to lib/Haanga/lib/Haanga/Extension/Filter/Count.php
diff --git a/Haanga/lib/Haanga/Extension/Filter/Cut.php b/lib/Haanga/lib/Haanga/Extension/Filter/Cut.php
similarity index 100%
rename from Haanga/lib/Haanga/Extension/Filter/Cut.php
rename to lib/Haanga/lib/Haanga/Extension/Filter/Cut.php
diff --git a/Haanga/lib/Haanga/Extension/Filter/Date.php b/lib/Haanga/lib/Haanga/Extension/Filter/Date.php
similarity index 100%
rename from Haanga/lib/Haanga/Extension/Filter/Date.php
rename to lib/Haanga/lib/Haanga/Extension/Filter/Date.php
diff --git a/Haanga/lib/Haanga/Extension/Filter/Default.php b/lib/Haanga/lib/Haanga/Extension/Filter/Default.php
similarity index 100%
rename from Haanga/lib/Haanga/Extension/Filter/Default.php
rename to lib/Haanga/lib/Haanga/Extension/Filter/Default.php
diff --git a/Haanga/lib/Haanga/Extension/Filter/Dictsort.php b/lib/Haanga/lib/Haanga/Extension/Filter/Dictsort.php
similarity index 100%
rename from Haanga/lib/Haanga/Extension/Filter/Dictsort.php
rename to lib/Haanga/lib/Haanga/Extension/Filter/Dictsort.php
diff --git a/Haanga/lib/Haanga/Extension/Filter/Empty.php b/lib/Haanga/lib/Haanga/Extension/Filter/Empty.php
similarity index 100%
rename from Haanga/lib/Haanga/Extension/Filter/Empty.php
rename to lib/Haanga/lib/Haanga/Extension/Filter/Empty.php
diff --git a/Haanga/lib/Haanga/Extension/Filter/Escape.php b/lib/Haanga/lib/Haanga/Extension/Filter/Escape.php
similarity index 100%
rename from Haanga/lib/Haanga/Extension/Filter/Escape.php
rename to lib/Haanga/lib/Haanga/Extension/Filter/Escape.php
diff --git a/Haanga/lib/Haanga/Extension/Filter/Exists.php b/lib/Haanga/lib/Haanga/Extension/Filter/Exists.php
similarity index 100%
rename from Haanga/lib/Haanga/Extension/Filter/Exists.php
rename to lib/Haanga/lib/Haanga/Extension/Filter/Exists.php
diff --git a/Haanga/lib/Haanga/Extension/Filter/Hostname.php b/lib/Haanga/lib/Haanga/Extension/Filter/Hostname.php
similarity index 100%
rename from Haanga/lib/Haanga/Extension/Filter/Hostname.php
rename to lib/Haanga/lib/Haanga/Extension/Filter/Hostname.php
diff --git a/Haanga/lib/Haanga/Extension/Filter/Intval.php b/lib/Haanga/lib/Haanga/Extension/Filter/Intval.php
similarity index 100%
rename from Haanga/lib/Haanga/Extension/Filter/Intval.php
rename to lib/Haanga/lib/Haanga/Extension/Filter/Intval.php
diff --git a/Haanga/lib/Haanga/Extension/Filter/Join.php b/lib/Haanga/lib/Haanga/Extension/Filter/Join.php
similarity index 100%
rename from Haanga/lib/Haanga/Extension/Filter/Join.php
rename to lib/Haanga/lib/Haanga/Extension/Filter/Join.php
diff --git a/Haanga/lib/Haanga/Extension/Filter/Length.php b/lib/Haanga/lib/Haanga/Extension/Filter/Length.php
similarity index 100%
rename from Haanga/lib/Haanga/Extension/Filter/Length.php
rename to lib/Haanga/lib/Haanga/Extension/Filter/Length.php
diff --git a/Haanga/lib/Haanga/Extension/Filter/Lower.php b/lib/Haanga/lib/Haanga/Extension/Filter/Lower.php
similarity index 100%
rename from Haanga/lib/Haanga/Extension/Filter/Lower.php
rename to lib/Haanga/lib/Haanga/Extension/Filter/Lower.php
diff --git a/Haanga/lib/Haanga/Extension/Filter/Pluralize.php b/lib/Haanga/lib/Haanga/Extension/Filter/Pluralize.php
similarity index 100%
rename from Haanga/lib/Haanga/Extension/Filter/Pluralize.php
rename to lib/Haanga/lib/Haanga/Extension/Filter/Pluralize.php
diff --git a/Haanga/lib/Haanga/Extension/Filter/Reverse.php b/lib/Haanga/lib/Haanga/Extension/Filter/Reverse.php
similarity index 100%
rename from Haanga/lib/Haanga/Extension/Filter/Reverse.php
rename to lib/Haanga/lib/Haanga/Extension/Filter/Reverse.php
diff --git a/Haanga/lib/Haanga/Extension/Filter/Safe.php b/lib/Haanga/lib/Haanga/Extension/Filter/Safe.php
similarity index 100%
rename from Haanga/lib/Haanga/Extension/Filter/Safe.php
rename to lib/Haanga/lib/Haanga/Extension/Filter/Safe.php
diff --git a/Haanga/lib/Haanga/Extension/Filter/Slugify.php b/lib/Haanga/lib/Haanga/Extension/Filter/Slugify.php
similarity index 100%
rename from Haanga/lib/Haanga/Extension/Filter/Slugify.php
rename to lib/Haanga/lib/Haanga/Extension/Filter/Slugify.php
diff --git a/Haanga/lib/Haanga/Extension/Filter/Stringformat.php b/lib/Haanga/lib/Haanga/Extension/Filter/Stringformat.php
similarity index 100%
rename from Haanga/lib/Haanga/Extension/Filter/Stringformat.php
rename to lib/Haanga/lib/Haanga/Extension/Filter/Stringformat.php
diff --git a/Haanga/lib/Haanga/Extension/Filter/Strlen.php b/lib/Haanga/lib/Haanga/Extension/Filter/Strlen.php
similarity index 100%
rename from Haanga/lib/Haanga/Extension/Filter/Strlen.php
rename to lib/Haanga/lib/Haanga/Extension/Filter/Strlen.php
diff --git a/Haanga/lib/Haanga/Extension/Filter/Substr.php b/lib/Haanga/lib/Haanga/Extension/Filter/Substr.php
similarity index 100%
rename from Haanga/lib/Haanga/Extension/Filter/Substr.php
rename to lib/Haanga/lib/Haanga/Extension/Filter/Substr.php
diff --git a/Haanga/lib/Haanga/Extension/Filter/Title.php b/lib/Haanga/lib/Haanga/Extension/Filter/Title.php
similarity index 100%
rename from Haanga/lib/Haanga/Extension/Filter/Title.php
rename to lib/Haanga/lib/Haanga/Extension/Filter/Title.php
diff --git a/Haanga/lib/Haanga/Extension/Filter/Trans.php b/lib/Haanga/lib/Haanga/Extension/Filter/Trans.php
similarity index 100%
rename from Haanga/lib/Haanga/Extension/Filter/Trans.php
rename to lib/Haanga/lib/Haanga/Extension/Filter/Trans.php
diff --git a/Haanga/lib/Haanga/Extension/Filter/Translation.php b/lib/Haanga/lib/Haanga/Extension/Filter/Translation.php
similarity index 100%
rename from Haanga/lib/Haanga/Extension/Filter/Translation.php
rename to lib/Haanga/lib/Haanga/Extension/Filter/Translation.php
diff --git a/Haanga/lib/Haanga/Extension/Filter/Trim.php b/lib/Haanga/lib/Haanga/Extension/Filter/Trim.php
similarity index 100%
rename from Haanga/lib/Haanga/Extension/Filter/Trim.php
rename to lib/Haanga/lib/Haanga/Extension/Filter/Trim.php
diff --git a/Haanga/lib/Haanga/Extension/Filter/Truncatewords.php b/lib/Haanga/lib/Haanga/Extension/Filter/Truncatewords.php
similarity index 100%
rename from Haanga/lib/Haanga/Extension/Filter/Truncatewords.php
rename to lib/Haanga/lib/Haanga/Extension/Filter/Truncatewords.php
diff --git a/Haanga/lib/Haanga/Extension/Filter/Upper.php b/lib/Haanga/lib/Haanga/Extension/Filter/Upper.php
similarity index 100%
rename from Haanga/lib/Haanga/Extension/Filter/Upper.php
rename to lib/Haanga/lib/Haanga/Extension/Filter/Upper.php
diff --git a/Haanga/lib/Haanga/Extension/Filter/Urlencode.php b/lib/Haanga/lib/Haanga/Extension/Filter/Urlencode.php
similarity index 100%
rename from Haanga/lib/Haanga/Extension/Filter/Urlencode.php
rename to lib/Haanga/lib/Haanga/Extension/Filter/Urlencode.php
diff --git a/Haanga/lib/Haanga/Extension/Tag.php b/lib/Haanga/lib/Haanga/Extension/Tag.php
similarity index 100%
rename from Haanga/lib/Haanga/Extension/Tag.php
rename to lib/Haanga/lib/Haanga/Extension/Tag.php
diff --git a/Haanga/lib/Haanga/Extension/Tag/Buffer.php b/lib/Haanga/lib/Haanga/Extension/Tag/Buffer.php
similarity index 100%
rename from Haanga/lib/Haanga/Extension/Tag/Buffer.php
rename to lib/Haanga/lib/Haanga/Extension/Tag/Buffer.php
diff --git a/Haanga/lib/Haanga/Extension/Tag/Currenttime.php b/lib/Haanga/lib/Haanga/Extension/Tag/Currenttime.php
similarity index 100%
rename from Haanga/lib/Haanga/Extension/Tag/Currenttime.php
rename to lib/Haanga/lib/Haanga/Extension/Tag/Currenttime.php
diff --git a/Haanga/lib/Haanga/Extension/Tag/Cycle.php b/lib/Haanga/lib/Haanga/Extension/Tag/Cycle.php
similarity index 100%
rename from Haanga/lib/Haanga/Extension/Tag/Cycle.php
rename to lib/Haanga/lib/Haanga/Extension/Tag/Cycle.php
diff --git a/Haanga/lib/Haanga/Extension/Tag/Dictsort.php b/lib/Haanga/lib/Haanga/Extension/Tag/Dictsort.php
similarity index 100%
rename from Haanga/lib/Haanga/Extension/Tag/Dictsort.php
rename to lib/Haanga/lib/Haanga/Extension/Tag/Dictsort.php
diff --git a/Haanga/lib/Haanga/Extension/Tag/Exec.php b/lib/Haanga/lib/Haanga/Extension/Tag/Exec.php
similarity index 100%
rename from Haanga/lib/Haanga/Extension/Tag/Exec.php
rename to lib/Haanga/lib/Haanga/Extension/Tag/Exec.php
diff --git a/Haanga/lib/Haanga/Extension/Tag/Firstof.php b/lib/Haanga/lib/Haanga/Extension/Tag/Firstof.php
similarity index 100%
rename from Haanga/lib/Haanga/Extension/Tag/Firstof.php
rename to lib/Haanga/lib/Haanga/Extension/Tag/Firstof.php
diff --git a/Haanga/lib/Haanga/Extension/Tag/Inline.php b/lib/Haanga/lib/Haanga/Extension/Tag/Inline.php
similarity index 100%
rename from Haanga/lib/Haanga/Extension/Tag/Inline.php
rename to lib/Haanga/lib/Haanga/Extension/Tag/Inline.php
diff --git a/Haanga/lib/Haanga/Extension/Tag/Lower.php b/lib/Haanga/lib/Haanga/Extension/Tag/Lower.php
similarity index 100%
rename from Haanga/lib/Haanga/Extension/Tag/Lower.php
rename to lib/Haanga/lib/Haanga/Extension/Tag/Lower.php
diff --git a/Haanga/lib/Haanga/Extension/Tag/Min.php b/lib/Haanga/lib/Haanga/Extension/Tag/Min.php
similarity index 100%
rename from Haanga/lib/Haanga/Extension/Tag/Min.php
rename to lib/Haanga/lib/Haanga/Extension/Tag/Min.php
diff --git a/Haanga/lib/Haanga/Extension/Tag/Setsafe.php b/lib/Haanga/lib/Haanga/Extension/Tag/Setsafe.php
similarity index 100%
rename from Haanga/lib/Haanga/Extension/Tag/Setsafe.php
rename to lib/Haanga/lib/Haanga/Extension/Tag/Setsafe.php
diff --git a/Haanga/lib/Haanga/Extension/Tag/Spaceless.php b/lib/Haanga/lib/Haanga/Extension/Tag/Spaceless.php
similarity index 100%
rename from Haanga/lib/Haanga/Extension/Tag/Spaceless.php
rename to lib/Haanga/lib/Haanga/Extension/Tag/Spaceless.php
diff --git a/Haanga/lib/Haanga/Extension/Tag/Templatetag.php b/lib/Haanga/lib/Haanga/Extension/Tag/Templatetag.php
similarity index 100%
rename from Haanga/lib/Haanga/Extension/Tag/Templatetag.php
rename to lib/Haanga/lib/Haanga/Extension/Tag/Templatetag.php
diff --git a/Haanga/lib/Haanga/Extension/Tag/Trans.php b/lib/Haanga/lib/Haanga/Extension/Tag/Trans.php
similarity index 100%
rename from Haanga/lib/Haanga/Extension/Tag/Trans.php
rename to lib/Haanga/lib/Haanga/Extension/Tag/Trans.php
diff --git a/Haanga/lib/Haanga/Extension/Tag/Tryinclude.php b/lib/Haanga/lib/Haanga/Extension/Tag/Tryinclude.php
similarity index 100%
rename from Haanga/lib/Haanga/Extension/Tag/Tryinclude.php
rename to lib/Haanga/lib/Haanga/Extension/Tag/Tryinclude.php
diff --git a/Haanga/lib/Haanga/Extension/Tag/Upper.php b/lib/Haanga/lib/Haanga/Extension/Tag/Upper.php
similarity index 100%
rename from Haanga/lib/Haanga/Extension/Tag/Upper.php
rename to lib/Haanga/lib/Haanga/Extension/Tag/Upper.php
diff --git a/Haanga/lib/Haanga/Generator/PHP.php b/lib/Haanga/lib/Haanga/Generator/PHP.php
similarity index 100%
rename from Haanga/lib/Haanga/Generator/PHP.php
rename to lib/Haanga/lib/Haanga/Generator/PHP.php
diff --git a/Haanga/tests/TestSuite.php b/lib/Haanga/tests/TestSuite.php
similarity index 100%
rename from Haanga/tests/TestSuite.php
rename to lib/Haanga/tests/TestSuite.php
diff --git a/Haanga/tests/assert_templates/autoescape.html b/lib/Haanga/tests/assert_templates/autoescape.html
similarity index 100%
rename from Haanga/tests/assert_templates/autoescape.html
rename to lib/Haanga/tests/assert_templates/autoescape.html
diff --git a/Haanga/tests/assert_templates/autoescape.php b/lib/Haanga/tests/assert_templates/autoescape.php
similarity index 100%
rename from Haanga/tests/assert_templates/autoescape.php
rename to lib/Haanga/tests/assert_templates/autoescape.php
diff --git a/Haanga/tests/assert_templates/autoescape.tpl b/lib/Haanga/tests/assert_templates/autoescape.tpl
similarity index 100%
rename from Haanga/tests/assert_templates/autoescape.tpl
rename to lib/Haanga/tests/assert_templates/autoescape.tpl
diff --git a/Haanga/tests/assert_templates/base.html b/lib/Haanga/tests/assert_templates/base.html
similarity index 100%
rename from Haanga/tests/assert_templates/base.html
rename to lib/Haanga/tests/assert_templates/base.html
diff --git a/Haanga/tests/assert_templates/base.php b/lib/Haanga/tests/assert_templates/base.php
similarity index 100%
rename from Haanga/tests/assert_templates/base.php
rename to lib/Haanga/tests/assert_templates/base.php
diff --git a/Haanga/tests/assert_templates/base.tpl b/lib/Haanga/tests/assert_templates/base.tpl
similarity index 100%
rename from Haanga/tests/assert_templates/base.tpl
rename to lib/Haanga/tests/assert_templates/base.tpl
diff --git a/Haanga/tests/assert_templates/bitwise.html b/lib/Haanga/tests/assert_templates/bitwise.html
similarity index 100%
rename from Haanga/tests/assert_templates/bitwise.html
rename to lib/Haanga/tests/assert_templates/bitwise.html
diff --git a/Haanga/tests/assert_templates/bitwise.tpl b/lib/Haanga/tests/assert_templates/bitwise.tpl
similarity index 100%
rename from Haanga/tests/assert_templates/bitwise.tpl
rename to lib/Haanga/tests/assert_templates/bitwise.tpl
diff --git a/Haanga/tests/assert_templates/bug_001.html b/lib/Haanga/tests/assert_templates/bug_001.html
similarity index 100%
rename from Haanga/tests/assert_templates/bug_001.html
rename to lib/Haanga/tests/assert_templates/bug_001.html
diff --git a/Haanga/tests/assert_templates/bug_001.php b/lib/Haanga/tests/assert_templates/bug_001.php
similarity index 100%
rename from Haanga/tests/assert_templates/bug_001.php
rename to lib/Haanga/tests/assert_templates/bug_001.php
diff --git a/Haanga/tests/assert_templates/bug_001.tpl b/lib/Haanga/tests/assert_templates/bug_001.tpl
similarity index 100%
rename from Haanga/tests/assert_templates/bug_001.tpl
rename to lib/Haanga/tests/assert_templates/bug_001.tpl
diff --git a/Haanga/tests/assert_templates/class_static.html b/lib/Haanga/tests/assert_templates/class_static.html
similarity index 100%
rename from Haanga/tests/assert_templates/class_static.html
rename to lib/Haanga/tests/assert_templates/class_static.html
diff --git a/Haanga/tests/assert_templates/class_static.tpl b/lib/Haanga/tests/assert_templates/class_static.tpl
similarity index 100%
rename from Haanga/tests/assert_templates/class_static.tpl
rename to lib/Haanga/tests/assert_templates/class_static.tpl
diff --git a/Haanga/tests/assert_templates/concat.html b/lib/Haanga/tests/assert_templates/concat.html
similarity index 100%
rename from Haanga/tests/assert_templates/concat.html
rename to lib/Haanga/tests/assert_templates/concat.html
diff --git a/Haanga/tests/assert_templates/concat.tpl b/lib/Haanga/tests/assert_templates/concat.tpl
similarity index 100%
rename from Haanga/tests/assert_templates/concat.tpl
rename to lib/Haanga/tests/assert_templates/concat.tpl
diff --git a/Haanga/tests/assert_templates/concat1.html b/lib/Haanga/tests/assert_templates/concat1.html
similarity index 100%
rename from Haanga/tests/assert_templates/concat1.html
rename to lib/Haanga/tests/assert_templates/concat1.html
diff --git a/Haanga/tests/assert_templates/concat1.tpl b/lib/Haanga/tests/assert_templates/concat1.tpl
similarity index 100%
rename from Haanga/tests/assert_templates/concat1.tpl
rename to lib/Haanga/tests/assert_templates/concat1.tpl
diff --git a/Haanga/tests/assert_templates/custom_tag.html.php b/lib/Haanga/tests/assert_templates/custom_tag.html.php
similarity index 100%
rename from Haanga/tests/assert_templates/custom_tag.html.php
rename to lib/Haanga/tests/assert_templates/custom_tag.html.php
diff --git a/Haanga/tests/assert_templates/custom_tag.tpl b/lib/Haanga/tests/assert_templates/custom_tag.tpl
similarity index 100%
rename from Haanga/tests/assert_templates/custom_tag.tpl
rename to lib/Haanga/tests/assert_templates/custom_tag.tpl
diff --git a/Haanga/tests/assert_templates/cycle.html b/lib/Haanga/tests/assert_templates/cycle.html
similarity index 100%
rename from Haanga/tests/assert_templates/cycle.html
rename to lib/Haanga/tests/assert_templates/cycle.html
diff --git a/Haanga/tests/assert_templates/cycle.php b/lib/Haanga/tests/assert_templates/cycle.php
similarity index 100%
rename from Haanga/tests/assert_templates/cycle.php
rename to lib/Haanga/tests/assert_templates/cycle.php
diff --git a/Haanga/tests/assert_templates/cycle.tpl b/lib/Haanga/tests/assert_templates/cycle.tpl
similarity index 100%
rename from Haanga/tests/assert_templates/cycle.tpl
rename to lib/Haanga/tests/assert_templates/cycle.tpl
diff --git a/Haanga/tests/assert_templates/dummy.html b/lib/Haanga/tests/assert_templates/dummy.html
similarity index 100%
rename from Haanga/tests/assert_templates/dummy.html
rename to lib/Haanga/tests/assert_templates/dummy.html
diff --git a/Haanga/tests/assert_templates/dummy.tpl b/lib/Haanga/tests/assert_templates/dummy.tpl
similarity index 100%
rename from Haanga/tests/assert_templates/dummy.tpl
rename to lib/Haanga/tests/assert_templates/dummy.tpl
diff --git a/Haanga/tests/assert_templates/empty_block.html b/lib/Haanga/tests/assert_templates/empty_block.html
similarity index 100%
rename from Haanga/tests/assert_templates/empty_block.html
rename to lib/Haanga/tests/assert_templates/empty_block.html
diff --git a/Haanga/tests/assert_templates/empty_block.tpl b/lib/Haanga/tests/assert_templates/empty_block.tpl
similarity index 100%
rename from Haanga/tests/assert_templates/empty_block.tpl
rename to lib/Haanga/tests/assert_templates/empty_block.tpl
diff --git a/Haanga/tests/assert_templates/empty_block_base.tpl b/lib/Haanga/tests/assert_templates/empty_block_base.tpl
similarity index 100%
rename from Haanga/tests/assert_templates/empty_block_base.tpl
rename to lib/Haanga/tests/assert_templates/empty_block_base.tpl
diff --git a/Haanga/tests/assert_templates/empty_loop.html b/lib/Haanga/tests/assert_templates/empty_loop.html
similarity index 100%
rename from Haanga/tests/assert_templates/empty_loop.html
rename to lib/Haanga/tests/assert_templates/empty_loop.html
diff --git a/Haanga/tests/assert_templates/empty_loop.php b/lib/Haanga/tests/assert_templates/empty_loop.php
similarity index 100%
rename from Haanga/tests/assert_templates/empty_loop.php
rename to lib/Haanga/tests/assert_templates/empty_loop.php
diff --git a/Haanga/tests/assert_templates/empty_loop.tpl b/lib/Haanga/tests/assert_templates/empty_loop.tpl
similarity index 100%
rename from Haanga/tests/assert_templates/empty_loop.tpl
rename to lib/Haanga/tests/assert_templates/empty_loop.tpl
diff --git a/Haanga/tests/assert_templates/exec.html.php b/lib/Haanga/tests/assert_templates/exec.html.php
similarity index 100%
rename from Haanga/tests/assert_templates/exec.html.php
rename to lib/Haanga/tests/assert_templates/exec.html.php
diff --git a/Haanga/tests/assert_templates/exec.tpl b/lib/Haanga/tests/assert_templates/exec.tpl
similarity index 100%
rename from Haanga/tests/assert_templates/exec.tpl
rename to lib/Haanga/tests/assert_templates/exec.tpl
diff --git a/Haanga/tests/assert_templates/filter.html b/lib/Haanga/tests/assert_templates/filter.html
similarity index 100%
rename from Haanga/tests/assert_templates/filter.html
rename to lib/Haanga/tests/assert_templates/filter.html
diff --git a/Haanga/tests/assert_templates/filter.php b/lib/Haanga/tests/assert_templates/filter.php
similarity index 100%
rename from Haanga/tests/assert_templates/filter.php
rename to lib/Haanga/tests/assert_templates/filter.php
diff --git a/Haanga/tests/assert_templates/filter.tpl b/lib/Haanga/tests/assert_templates/filter.tpl
similarity index 100%
rename from Haanga/tests/assert_templates/filter.tpl
rename to lib/Haanga/tests/assert_templates/filter.tpl
diff --git a/Haanga/tests/assert_templates/first_of.html b/lib/Haanga/tests/assert_templates/first_of.html
similarity index 100%
rename from Haanga/tests/assert_templates/first_of.html
rename to lib/Haanga/tests/assert_templates/first_of.html
diff --git a/Haanga/tests/assert_templates/first_of.php b/lib/Haanga/tests/assert_templates/first_of.php
similarity index 100%
rename from Haanga/tests/assert_templates/first_of.php
rename to lib/Haanga/tests/assert_templates/first_of.php
diff --git a/Haanga/tests/assert_templates/first_of.tpl b/lib/Haanga/tests/assert_templates/first_of.tpl
similarity index 100%
rename from Haanga/tests/assert_templates/first_of.tpl
rename to lib/Haanga/tests/assert_templates/first_of.tpl
diff --git a/Haanga/tests/assert_templates/for_range.html b/lib/Haanga/tests/assert_templates/for_range.html
similarity index 100%
rename from Haanga/tests/assert_templates/for_range.html
rename to lib/Haanga/tests/assert_templates/for_range.html
diff --git a/Haanga/tests/assert_templates/for_range.tpl b/lib/Haanga/tests/assert_templates/for_range.tpl
similarity index 100%
rename from Haanga/tests/assert_templates/for_range.tpl
rename to lib/Haanga/tests/assert_templates/for_range.tpl
diff --git a/Haanga/tests/assert_templates/for_range1.html b/lib/Haanga/tests/assert_templates/for_range1.html
similarity index 100%
rename from Haanga/tests/assert_templates/for_range1.html
rename to lib/Haanga/tests/assert_templates/for_range1.html
diff --git a/Haanga/tests/assert_templates/for_range1.tpl b/lib/Haanga/tests/assert_templates/for_range1.tpl
similarity index 100%
rename from Haanga/tests/assert_templates/for_range1.tpl
rename to lib/Haanga/tests/assert_templates/for_range1.tpl
diff --git a/Haanga/tests/assert_templates/for_range2.html b/lib/Haanga/tests/assert_templates/for_range2.html
similarity index 100%
rename from Haanga/tests/assert_templates/for_range2.html
rename to lib/Haanga/tests/assert_templates/for_range2.html
diff --git a/Haanga/tests/assert_templates/for_range2.tpl b/lib/Haanga/tests/assert_templates/for_range2.tpl
similarity index 100%
rename from Haanga/tests/assert_templates/for_range2.tpl
rename to lib/Haanga/tests/assert_templates/for_range2.tpl
diff --git a/Haanga/tests/assert_templates/for_range3.html b/lib/Haanga/tests/assert_templates/for_range3.html
similarity index 100%
rename from Haanga/tests/assert_templates/for_range3.html
rename to lib/Haanga/tests/assert_templates/for_range3.html
diff --git a/Haanga/tests/assert_templates/for_range3.tpl b/lib/Haanga/tests/assert_templates/for_range3.tpl
similarity index 100%
rename from Haanga/tests/assert_templates/for_range3.tpl
rename to lib/Haanga/tests/assert_templates/for_range3.tpl
diff --git a/Haanga/tests/assert_templates/for_range4.html b/lib/Haanga/tests/assert_templates/for_range4.html
similarity index 100%
rename from Haanga/tests/assert_templates/for_range4.html
rename to lib/Haanga/tests/assert_templates/for_range4.html
diff --git a/Haanga/tests/assert_templates/for_range4.php b/lib/Haanga/tests/assert_templates/for_range4.php
similarity index 100%
rename from Haanga/tests/assert_templates/for_range4.php
rename to lib/Haanga/tests/assert_templates/for_range4.php
diff --git a/Haanga/tests/assert_templates/for_range4.tpl b/lib/Haanga/tests/assert_templates/for_range4.tpl
similarity index 100%
rename from Haanga/tests/assert_templates/for_range4.tpl
rename to lib/Haanga/tests/assert_templates/for_range4.tpl
diff --git a/Haanga/tests/assert_templates/for_range5.html b/lib/Haanga/tests/assert_templates/for_range5.html
similarity index 100%
rename from Haanga/tests/assert_templates/for_range5.html
rename to lib/Haanga/tests/assert_templates/for_range5.html
diff --git a/Haanga/tests/assert_templates/for_range5.php b/lib/Haanga/tests/assert_templates/for_range5.php
similarity index 100%
rename from Haanga/tests/assert_templates/for_range5.php
rename to lib/Haanga/tests/assert_templates/for_range5.php
diff --git a/Haanga/tests/assert_templates/for_range5.tpl b/lib/Haanga/tests/assert_templates/for_range5.tpl
similarity index 100%
rename from Haanga/tests/assert_templates/for_range5.tpl
rename to lib/Haanga/tests/assert_templates/for_range5.tpl
diff --git a/Haanga/tests/assert_templates/foreach_vars.html b/lib/Haanga/tests/assert_templates/foreach_vars.html
similarity index 100%
rename from Haanga/tests/assert_templates/foreach_vars.html
rename to lib/Haanga/tests/assert_templates/foreach_vars.html
diff --git a/Haanga/tests/assert_templates/foreach_vars.php b/lib/Haanga/tests/assert_templates/foreach_vars.php
similarity index 100%
rename from Haanga/tests/assert_templates/foreach_vars.php
rename to lib/Haanga/tests/assert_templates/foreach_vars.php
diff --git a/Haanga/tests/assert_templates/foreach_vars.tpl b/lib/Haanga/tests/assert_templates/foreach_vars.tpl
similarity index 100%
rename from Haanga/tests/assert_templates/foreach_vars.tpl
rename to lib/Haanga/tests/assert_templates/foreach_vars.tpl
diff --git a/Haanga/tests/assert_templates/global.html b/lib/Haanga/tests/assert_templates/global.html
similarity index 100%
rename from Haanga/tests/assert_templates/global.html
rename to lib/Haanga/tests/assert_templates/global.html
diff --git a/Haanga/tests/assert_templates/global.php b/lib/Haanga/tests/assert_templates/global.php
similarity index 100%
rename from Haanga/tests/assert_templates/global.php
rename to lib/Haanga/tests/assert_templates/global.php
diff --git a/Haanga/tests/assert_templates/global.tpl b/lib/Haanga/tests/assert_templates/global.tpl
similarity index 100%
rename from Haanga/tests/assert_templates/global.tpl
rename to lib/Haanga/tests/assert_templates/global.tpl
diff --git a/Haanga/tests/assert_templates/if_else_simple.html b/lib/Haanga/tests/assert_templates/if_else_simple.html
similarity index 100%
rename from Haanga/tests/assert_templates/if_else_simple.html
rename to lib/Haanga/tests/assert_templates/if_else_simple.html
diff --git a/Haanga/tests/assert_templates/if_else_simple.php b/lib/Haanga/tests/assert_templates/if_else_simple.php
similarity index 100%
rename from Haanga/tests/assert_templates/if_else_simple.php
rename to lib/Haanga/tests/assert_templates/if_else_simple.php
diff --git a/Haanga/tests/assert_templates/if_else_simple.tpl b/lib/Haanga/tests/assert_templates/if_else_simple.tpl
similarity index 100%
rename from Haanga/tests/assert_templates/if_else_simple.tpl
rename to lib/Haanga/tests/assert_templates/if_else_simple.tpl
diff --git a/Haanga/tests/assert_templates/ifchanged.html b/lib/Haanga/tests/assert_templates/ifchanged.html
similarity index 100%
rename from Haanga/tests/assert_templates/ifchanged.html
rename to lib/Haanga/tests/assert_templates/ifchanged.html
diff --git a/Haanga/tests/assert_templates/ifchanged.php b/lib/Haanga/tests/assert_templates/ifchanged.php
similarity index 100%
rename from Haanga/tests/assert_templates/ifchanged.php
rename to lib/Haanga/tests/assert_templates/ifchanged.php
diff --git a/Haanga/tests/assert_templates/ifchanged.tpl b/lib/Haanga/tests/assert_templates/ifchanged.tpl
similarity index 100%
rename from Haanga/tests/assert_templates/ifchanged.tpl
rename to lib/Haanga/tests/assert_templates/ifchanged.tpl
diff --git a/Haanga/tests/assert_templates/ifequals.html b/lib/Haanga/tests/assert_templates/ifequals.html
similarity index 100%
rename from Haanga/tests/assert_templates/ifequals.html
rename to lib/Haanga/tests/assert_templates/ifequals.html
diff --git a/Haanga/tests/assert_templates/ifequals.tpl b/lib/Haanga/tests/assert_templates/ifequals.tpl
similarity index 100%
rename from Haanga/tests/assert_templates/ifequals.tpl
rename to lib/Haanga/tests/assert_templates/ifequals.tpl
diff --git a/Haanga/tests/assert_templates/in.html b/lib/Haanga/tests/assert_templates/in.html
similarity index 100%
rename from Haanga/tests/assert_templates/in.html
rename to lib/Haanga/tests/assert_templates/in.html
diff --git a/Haanga/tests/assert_templates/in.php b/lib/Haanga/tests/assert_templates/in.php
similarity index 100%
rename from Haanga/tests/assert_templates/in.php
rename to lib/Haanga/tests/assert_templates/in.php
diff --git a/Haanga/tests/assert_templates/in.tpl b/lib/Haanga/tests/assert_templates/in.tpl
similarity index 100%
rename from Haanga/tests/assert_templates/in.tpl
rename to lib/Haanga/tests/assert_templates/in.tpl
diff --git a/Haanga/tests/assert_templates/inheritence_nested_block.html b/lib/Haanga/tests/assert_templates/inheritence_nested_block.html
similarity index 100%
rename from Haanga/tests/assert_templates/inheritence_nested_block.html
rename to lib/Haanga/tests/assert_templates/inheritence_nested_block.html
diff --git a/Haanga/tests/assert_templates/inheritence_nested_block.tpl b/lib/Haanga/tests/assert_templates/inheritence_nested_block.tpl
similarity index 100%
rename from Haanga/tests/assert_templates/inheritence_nested_block.tpl
rename to lib/Haanga/tests/assert_templates/inheritence_nested_block.tpl
diff --git a/Haanga/tests/assert_templates/inheritence_nested_block_duplicated.html b/lib/Haanga/tests/assert_templates/inheritence_nested_block_duplicated.html
similarity index 100%
rename from Haanga/tests/assert_templates/inheritence_nested_block_duplicated.html
rename to lib/Haanga/tests/assert_templates/inheritence_nested_block_duplicated.html
diff --git a/Haanga/tests/assert_templates/inheritence_nested_block_duplicated.tpl b/lib/Haanga/tests/assert_templates/inheritence_nested_block_duplicated.tpl
similarity index 100%
rename from Haanga/tests/assert_templates/inheritence_nested_block_duplicated.tpl
rename to lib/Haanga/tests/assert_templates/inheritence_nested_block_duplicated.tpl
diff --git a/Haanga/tests/assert_templates/inline.html b/lib/Haanga/tests/assert_templates/inline.html
similarity index 100%
rename from Haanga/tests/assert_templates/inline.html
rename to lib/Haanga/tests/assert_templates/inline.html
diff --git a/Haanga/tests/assert_templates/inline.tpl b/lib/Haanga/tests/assert_templates/inline.tpl
similarity index 100%
rename from Haanga/tests/assert_templates/inline.tpl
rename to lib/Haanga/tests/assert_templates/inline.tpl
diff --git a/Haanga/tests/assert_templates/inline_buffer.tpl b/lib/Haanga/tests/assert_templates/inline_buffer.tpl
similarity index 100%
rename from Haanga/tests/assert_templates/inline_buffer.tpl
rename to lib/Haanga/tests/assert_templates/inline_buffer.tpl
diff --git a/Haanga/tests/assert_templates/intval.html b/lib/Haanga/tests/assert_templates/intval.html
similarity index 100%
rename from Haanga/tests/assert_templates/intval.html
rename to lib/Haanga/tests/assert_templates/intval.html
diff --git a/Haanga/tests/assert_templates/intval.php b/lib/Haanga/tests/assert_templates/intval.php
similarity index 100%
rename from Haanga/tests/assert_templates/intval.php
rename to lib/Haanga/tests/assert_templates/intval.php
diff --git a/Haanga/tests/assert_templates/intval.tpl b/lib/Haanga/tests/assert_templates/intval.tpl
similarity index 100%
rename from Haanga/tests/assert_templates/intval.tpl
rename to lib/Haanga/tests/assert_templates/intval.tpl
diff --git a/Haanga/tests/assert_templates/join.html b/lib/Haanga/tests/assert_templates/join.html
similarity index 100%
rename from Haanga/tests/assert_templates/join.html
rename to lib/Haanga/tests/assert_templates/join.html
diff --git a/Haanga/tests/assert_templates/join.php b/lib/Haanga/tests/assert_templates/join.php
similarity index 100%
rename from Haanga/tests/assert_templates/join.php
rename to lib/Haanga/tests/assert_templates/join.php
diff --git a/Haanga/tests/assert_templates/join.tpl b/lib/Haanga/tests/assert_templates/join.tpl
similarity index 100%
rename from Haanga/tests/assert_templates/join.tpl
rename to lib/Haanga/tests/assert_templates/join.tpl
diff --git a/Haanga/tests/assert_templates/load.html b/lib/Haanga/tests/assert_templates/load.html
similarity index 100%
rename from Haanga/tests/assert_templates/load.html
rename to lib/Haanga/tests/assert_templates/load.html
diff --git a/Haanga/tests/assert_templates/load.php b/lib/Haanga/tests/assert_templates/load.php
similarity index 100%
rename from Haanga/tests/assert_templates/load.php
rename to lib/Haanga/tests/assert_templates/load.php
diff --git a/Haanga/tests/assert_templates/load.tpl b/lib/Haanga/tests/assert_templates/load.tpl
similarity index 100%
rename from Haanga/tests/assert_templates/load.tpl
rename to lib/Haanga/tests/assert_templates/load.tpl
diff --git a/Haanga/tests/assert_templates/locale/es_ES/LC_MESSAGES/messages.mo b/lib/Haanga/tests/assert_templates/locale/es_ES/LC_MESSAGES/messages.mo
similarity index 100%
rename from Haanga/tests/assert_templates/locale/es_ES/LC_MESSAGES/messages.mo
rename to lib/Haanga/tests/assert_templates/locale/es_ES/LC_MESSAGES/messages.mo
diff --git a/Haanga/tests/assert_templates/locale/es_ES/LC_MESSAGES/messages.po b/lib/Haanga/tests/assert_templates/locale/es_ES/LC_MESSAGES/messages.po
similarity index 100%
rename from Haanga/tests/assert_templates/locale/es_ES/LC_MESSAGES/messages.po
rename to lib/Haanga/tests/assert_templates/locale/es_ES/LC_MESSAGES/messages.po
diff --git a/Haanga/tests/assert_templates/loop.html b/lib/Haanga/tests/assert_templates/loop.html
similarity index 100%
rename from Haanga/tests/assert_templates/loop.html
rename to lib/Haanga/tests/assert_templates/loop.html
diff --git a/Haanga/tests/assert_templates/loop.php b/lib/Haanga/tests/assert_templates/loop.php
similarity index 100%
rename from Haanga/tests/assert_templates/loop.php
rename to lib/Haanga/tests/assert_templates/loop.php
diff --git a/Haanga/tests/assert_templates/loop.tpl b/lib/Haanga/tests/assert_templates/loop.tpl
similarity index 100%
rename from Haanga/tests/assert_templates/loop.tpl
rename to lib/Haanga/tests/assert_templates/loop.tpl
diff --git a/Haanga/tests/assert_templates/loop_object.html b/lib/Haanga/tests/assert_templates/loop_object.html
similarity index 100%
rename from Haanga/tests/assert_templates/loop_object.html
rename to lib/Haanga/tests/assert_templates/loop_object.html
diff --git a/Haanga/tests/assert_templates/loop_object.php b/lib/Haanga/tests/assert_templates/loop_object.php
similarity index 100%
rename from Haanga/tests/assert_templates/loop_object.php
rename to lib/Haanga/tests/assert_templates/loop_object.php
diff --git a/Haanga/tests/assert_templates/loop_object.tpl b/lib/Haanga/tests/assert_templates/loop_object.tpl
similarity index 100%
rename from Haanga/tests/assert_templates/loop_object.tpl
rename to lib/Haanga/tests/assert_templates/loop_object.tpl
diff --git a/Haanga/tests/assert_templates/method.html b/lib/Haanga/tests/assert_templates/method.html
similarity index 100%
rename from Haanga/tests/assert_templates/method.html
rename to lib/Haanga/tests/assert_templates/method.html
diff --git a/Haanga/tests/assert_templates/method.php b/lib/Haanga/tests/assert_templates/method.php
similarity index 100%
rename from Haanga/tests/assert_templates/method.php
rename to lib/Haanga/tests/assert_templates/method.php
diff --git a/Haanga/tests/assert_templates/method.tpl b/lib/Haanga/tests/assert_templates/method.tpl
similarity index 100%
rename from Haanga/tests/assert_templates/method.tpl
rename to lib/Haanga/tests/assert_templates/method.tpl
diff --git a/Haanga/tests/assert_templates/nested_block.html b/lib/Haanga/tests/assert_templates/nested_block.html
similarity index 100%
rename from Haanga/tests/assert_templates/nested_block.html
rename to lib/Haanga/tests/assert_templates/nested_block.html
diff --git a/Haanga/tests/assert_templates/nested_block.tpl b/lib/Haanga/tests/assert_templates/nested_block.tpl
similarity index 100%
rename from Haanga/tests/assert_templates/nested_block.tpl
rename to lib/Haanga/tests/assert_templates/nested_block.tpl
diff --git a/Haanga/tests/assert_templates/nested_block_second_parent.html b/lib/Haanga/tests/assert_templates/nested_block_second_parent.html
similarity index 100%
rename from Haanga/tests/assert_templates/nested_block_second_parent.html
rename to lib/Haanga/tests/assert_templates/nested_block_second_parent.html
diff --git a/Haanga/tests/assert_templates/nested_block_second_parent.tpl b/lib/Haanga/tests/assert_templates/nested_block_second_parent.tpl
similarity index 100%
rename from Haanga/tests/assert_templates/nested_block_second_parent.tpl
rename to lib/Haanga/tests/assert_templates/nested_block_second_parent.tpl
diff --git a/Haanga/tests/assert_templates/nested_block_second_parent_override.html b/lib/Haanga/tests/assert_templates/nested_block_second_parent_override.html
similarity index 100%
rename from Haanga/tests/assert_templates/nested_block_second_parent_override.html
rename to lib/Haanga/tests/assert_templates/nested_block_second_parent_override.html
diff --git a/Haanga/tests/assert_templates/nested_block_second_parent_override.tpl b/lib/Haanga/tests/assert_templates/nested_block_second_parent_override.tpl
similarity index 100%
rename from Haanga/tests/assert_templates/nested_block_second_parent_override.tpl
rename to lib/Haanga/tests/assert_templates/nested_block_second_parent_override.tpl
diff --git a/Haanga/tests/assert_templates/object.html b/lib/Haanga/tests/assert_templates/object.html
similarity index 100%
rename from Haanga/tests/assert_templates/object.html
rename to lib/Haanga/tests/assert_templates/object.html
diff --git a/Haanga/tests/assert_templates/object.php b/lib/Haanga/tests/assert_templates/object.php
similarity index 100%
rename from Haanga/tests/assert_templates/object.php
rename to lib/Haanga/tests/assert_templates/object.php
diff --git a/Haanga/tests/assert_templates/object.tpl b/lib/Haanga/tests/assert_templates/object.tpl
similarity index 100%
rename from Haanga/tests/assert_templates/object.tpl
rename to lib/Haanga/tests/assert_templates/object.tpl
diff --git a/Haanga/tests/assert_templates/partial.tpl b/lib/Haanga/tests/assert_templates/partial.tpl
similarity index 100%
rename from Haanga/tests/assert_templates/partial.tpl
rename to lib/Haanga/tests/assert_templates/partial.tpl
diff --git a/Haanga/tests/assert_templates/pluralize.html b/lib/Haanga/tests/assert_templates/pluralize.html
similarity index 100%
rename from Haanga/tests/assert_templates/pluralize.html
rename to lib/Haanga/tests/assert_templates/pluralize.html
diff --git a/Haanga/tests/assert_templates/pluralize.php b/lib/Haanga/tests/assert_templates/pluralize.php
similarity index 100%
rename from Haanga/tests/assert_templates/pluralize.php
rename to lib/Haanga/tests/assert_templates/pluralize.php
diff --git a/Haanga/tests/assert_templates/pluralize.tpl b/lib/Haanga/tests/assert_templates/pluralize.tpl
similarity index 100%
rename from Haanga/tests/assert_templates/pluralize.tpl
rename to lib/Haanga/tests/assert_templates/pluralize.tpl
diff --git a/Haanga/tests/assert_templates/regroup.html b/lib/Haanga/tests/assert_templates/regroup.html
similarity index 100%
rename from Haanga/tests/assert_templates/regroup.html
rename to lib/Haanga/tests/assert_templates/regroup.html
diff --git a/Haanga/tests/assert_templates/regroup.php b/lib/Haanga/tests/assert_templates/regroup.php
similarity index 100%
rename from Haanga/tests/assert_templates/regroup.php
rename to lib/Haanga/tests/assert_templates/regroup.php
diff --git a/Haanga/tests/assert_templates/regroup.tpl b/lib/Haanga/tests/assert_templates/regroup.tpl
similarity index 100%
rename from Haanga/tests/assert_templates/regroup.tpl
rename to lib/Haanga/tests/assert_templates/regroup.tpl
diff --git a/Haanga/tests/assert_templates/set.html b/lib/Haanga/tests/assert_templates/set.html
similarity index 100%
rename from Haanga/tests/assert_templates/set.html
rename to lib/Haanga/tests/assert_templates/set.html
diff --git a/Haanga/tests/assert_templates/set.tpl b/lib/Haanga/tests/assert_templates/set.tpl
similarity index 100%
rename from Haanga/tests/assert_templates/set.tpl
rename to lib/Haanga/tests/assert_templates/set.tpl
diff --git a/Haanga/tests/assert_templates/spaceless.html b/lib/Haanga/tests/assert_templates/spaceless.html
similarity index 100%
rename from Haanga/tests/assert_templates/spaceless.html
rename to lib/Haanga/tests/assert_templates/spaceless.html
diff --git a/Haanga/tests/assert_templates/spaceless.tpl b/lib/Haanga/tests/assert_templates/spaceless.tpl
similarity index 100%
rename from Haanga/tests/assert_templates/spaceless.tpl
rename to lib/Haanga/tests/assert_templates/spaceless.tpl
diff --git a/Haanga/tests/assert_templates/strip_whitespace.html b/lib/Haanga/tests/assert_templates/strip_whitespace.html
similarity index 100%
rename from Haanga/tests/assert_templates/strip_whitespace.html
rename to lib/Haanga/tests/assert_templates/strip_whitespace.html
diff --git a/Haanga/tests/assert_templates/strip_whitespace.tpl b/lib/Haanga/tests/assert_templates/strip_whitespace.tpl
similarity index 100%
rename from Haanga/tests/assert_templates/strip_whitespace.tpl
rename to lib/Haanga/tests/assert_templates/strip_whitespace.tpl
diff --git a/Haanga/tests/assert_templates/sub_set.tpl b/lib/Haanga/tests/assert_templates/sub_set.tpl
similarity index 100%
rename from Haanga/tests/assert_templates/sub_set.tpl
rename to lib/Haanga/tests/assert_templates/sub_set.tpl
diff --git a/Haanga/tests/assert_templates/subtemplate.html b/lib/Haanga/tests/assert_templates/subtemplate.html
similarity index 100%
rename from Haanga/tests/assert_templates/subtemplate.html
rename to lib/Haanga/tests/assert_templates/subtemplate.html
diff --git a/Haanga/tests/assert_templates/subtemplate.php b/lib/Haanga/tests/assert_templates/subtemplate.php
similarity index 100%
rename from Haanga/tests/assert_templates/subtemplate.php
rename to lib/Haanga/tests/assert_templates/subtemplate.php
diff --git a/Haanga/tests/assert_templates/subtemplate.tpl b/lib/Haanga/tests/assert_templates/subtemplate.tpl
similarity index 100%
rename from Haanga/tests/assert_templates/subtemplate.tpl
rename to lib/Haanga/tests/assert_templates/subtemplate.tpl
diff --git a/Haanga/tests/assert_templates/templatetag.html b/lib/Haanga/tests/assert_templates/templatetag.html
similarity index 100%
rename from Haanga/tests/assert_templates/templatetag.html
rename to lib/Haanga/tests/assert_templates/templatetag.html
diff --git a/Haanga/tests/assert_templates/templatetag.tpl b/lib/Haanga/tests/assert_templates/templatetag.tpl
similarity index 100%
rename from Haanga/tests/assert_templates/templatetag.tpl
rename to lib/Haanga/tests/assert_templates/templatetag.tpl
diff --git a/Haanga/tests/assert_templates/title.html b/lib/Haanga/tests/assert_templates/title.html
similarity index 100%
rename from Haanga/tests/assert_templates/title.html
rename to lib/Haanga/tests/assert_templates/title.html
diff --git a/Haanga/tests/assert_templates/title.php b/lib/Haanga/tests/assert_templates/title.php
similarity index 100%
rename from Haanga/tests/assert_templates/title.php
rename to lib/Haanga/tests/assert_templates/title.php
diff --git a/Haanga/tests/assert_templates/title.tpl b/lib/Haanga/tests/assert_templates/title.tpl
similarity index 100%
rename from Haanga/tests/assert_templates/title.tpl
rename to lib/Haanga/tests/assert_templates/title.tpl
diff --git a/Haanga/tests/assert_templates/trans.html b/lib/Haanga/tests/assert_templates/trans.html
similarity index 100%
rename from Haanga/tests/assert_templates/trans.html
rename to lib/Haanga/tests/assert_templates/trans.html
diff --git a/Haanga/tests/assert_templates/trans.php b/lib/Haanga/tests/assert_templates/trans.php
similarity index 100%
rename from Haanga/tests/assert_templates/trans.php
rename to lib/Haanga/tests/assert_templates/trans.php
diff --git a/Haanga/tests/assert_templates/trans.tpl b/lib/Haanga/tests/assert_templates/trans.tpl
similarity index 100%
rename from Haanga/tests/assert_templates/trans.tpl
rename to lib/Haanga/tests/assert_templates/trans.tpl
diff --git a/Haanga/tests/assert_templates/truncatewords.html b/lib/Haanga/tests/assert_templates/truncatewords.html
similarity index 100%
rename from Haanga/tests/assert_templates/truncatewords.html
rename to lib/Haanga/tests/assert_templates/truncatewords.html
diff --git a/Haanga/tests/assert_templates/truncatewords.php b/lib/Haanga/tests/assert_templates/truncatewords.php
similarity index 100%
rename from Haanga/tests/assert_templates/truncatewords.php
rename to lib/Haanga/tests/assert_templates/truncatewords.php
diff --git a/Haanga/tests/assert_templates/truncatewords.tpl b/lib/Haanga/tests/assert_templates/truncatewords.tpl
similarity index 100%
rename from Haanga/tests/assert_templates/truncatewords.tpl
rename to lib/Haanga/tests/assert_templates/truncatewords.tpl
diff --git a/Haanga/tests/assert_templates/try_include.html b/lib/Haanga/tests/assert_templates/try_include.html
similarity index 100%
rename from Haanga/tests/assert_templates/try_include.html
rename to lib/Haanga/tests/assert_templates/try_include.html
diff --git a/Haanga/tests/assert_templates/try_include.tpl b/lib/Haanga/tests/assert_templates/try_include.tpl
similarity index 100%
rename from Haanga/tests/assert_templates/try_include.tpl
rename to lib/Haanga/tests/assert_templates/try_include.tpl
diff --git a/Haanga/tests/assert_templates/variable_existe.html b/lib/Haanga/tests/assert_templates/variable_existe.html
similarity index 100%
rename from Haanga/tests/assert_templates/variable_existe.html
rename to lib/Haanga/tests/assert_templates/variable_existe.html
diff --git a/Haanga/tests/assert_templates/variable_existe.tpl b/lib/Haanga/tests/assert_templates/variable_existe.tpl
similarity index 100%
rename from Haanga/tests/assert_templates/variable_existe.tpl
rename to lib/Haanga/tests/assert_templates/variable_existe.tpl
diff --git a/Haanga/tests/assert_templates/with.html b/lib/Haanga/tests/assert_templates/with.html
similarity index 100%
rename from Haanga/tests/assert_templates/with.html
rename to lib/Haanga/tests/assert_templates/with.html
diff --git a/Haanga/tests/assert_templates/with.php b/lib/Haanga/tests/assert_templates/with.php
similarity index 100%
rename from Haanga/tests/assert_templates/with.php
rename to lib/Haanga/tests/assert_templates/with.php
diff --git a/Haanga/tests/assert_templates/with.tpl b/lib/Haanga/tests/assert_templates/with.tpl
similarity index 100%
rename from Haanga/tests/assert_templates/with.tpl
rename to lib/Haanga/tests/assert_templates/with.tpl
diff --git a/Haanga/tests/err_templates/block.tpl b/lib/Haanga/tests/err_templates/block.tpl
similarity index 100%
rename from Haanga/tests/err_templates/block.tpl
rename to lib/Haanga/tests/err_templates/block.tpl
diff --git a/Haanga/tests/err_templates/block_nonparent.tpl b/lib/Haanga/tests/err_templates/block_nonparent.tpl
similarity index 100%
rename from Haanga/tests/err_templates/block_nonparent.tpl
rename to lib/Haanga/tests/err_templates/block_nonparent.tpl
diff --git a/Haanga/tests/err_templates/block_super.tpl b/lib/Haanga/tests/err_templates/block_super.tpl
similarity index 100%
rename from Haanga/tests/err_templates/block_super.tpl
rename to lib/Haanga/tests/err_templates/block_super.tpl
diff --git a/Haanga/tests/err_templates/block_super_filter.tpl b/lib/Haanga/tests/err_templates/block_super_filter.tpl
similarity index 100%
rename from Haanga/tests/err_templates/block_super_filter.tpl
rename to lib/Haanga/tests/err_templates/block_super_filter.tpl
diff --git a/Haanga/tests/err_templates/block_super_nonsubtemplate.tpl b/lib/Haanga/tests/err_templates/block_super_nonsubtemplate.tpl
similarity index 100%
rename from Haanga/tests/err_templates/block_super_nonsubtemplate.tpl
rename to lib/Haanga/tests/err_templates/block_super_nonsubtemplate.tpl
diff --git a/Haanga/tests/err_templates/dictsort.tpl b/lib/Haanga/tests/err_templates/dictsort.tpl
similarity index 100%
rename from Haanga/tests/err_templates/dictsort.tpl
rename to lib/Haanga/tests/err_templates/dictsort.tpl
diff --git a/Haanga/tests/err_templates/dictsort1.tpl b/lib/Haanga/tests/err_templates/dictsort1.tpl
similarity index 100%
rename from Haanga/tests/err_templates/dictsort1.tpl
rename to lib/Haanga/tests/err_templates/dictsort1.tpl
diff --git a/Haanga/tests/err_templates/dictsort2.tpl b/lib/Haanga/tests/err_templates/dictsort2.tpl
similarity index 100%
rename from Haanga/tests/err_templates/dictsort2.tpl
rename to lib/Haanga/tests/err_templates/dictsort2.tpl
diff --git a/Haanga/tests/err_templates/err_block.tpl b/lib/Haanga/tests/err_templates/err_block.tpl
similarity index 100%
rename from Haanga/tests/err_templates/err_block.tpl
rename to lib/Haanga/tests/err_templates/err_block.tpl
diff --git a/Haanga/tests/err_templates/err_block_nonparent.tpl b/lib/Haanga/tests/err_templates/err_block_nonparent.tpl
similarity index 100%
rename from Haanga/tests/err_templates/err_block_nonparent.tpl
rename to lib/Haanga/tests/err_templates/err_block_nonparent.tpl
diff --git a/Haanga/tests/err_templates/err_block_super.tpl b/lib/Haanga/tests/err_templates/err_block_super.tpl
similarity index 100%
rename from Haanga/tests/err_templates/err_block_super.tpl
rename to lib/Haanga/tests/err_templates/err_block_super.tpl
diff --git a/Haanga/tests/err_templates/err_block_super_filter.tpl b/lib/Haanga/tests/err_templates/err_block_super_filter.tpl
similarity index 100%
rename from Haanga/tests/err_templates/err_block_super_filter.tpl
rename to lib/Haanga/tests/err_templates/err_block_super_filter.tpl
diff --git a/Haanga/tests/err_templates/err_block_super_nonsubtemplate.tpl b/lib/Haanga/tests/err_templates/err_block_super_nonsubtemplate.tpl
similarity index 100%
rename from Haanga/tests/err_templates/err_block_super_nonsubtemplate.tpl
rename to lib/Haanga/tests/err_templates/err_block_super_nonsubtemplate.tpl
diff --git a/Haanga/tests/err_templates/err_dictsort.tpl b/lib/Haanga/tests/err_templates/err_dictsort.tpl
similarity index 100%
rename from Haanga/tests/err_templates/err_dictsort.tpl
rename to lib/Haanga/tests/err_templates/err_dictsort.tpl
diff --git a/Haanga/tests/err_templates/err_dictsort1.tpl b/lib/Haanga/tests/err_templates/err_dictsort1.tpl
similarity index 100%
rename from Haanga/tests/err_templates/err_dictsort1.tpl
rename to lib/Haanga/tests/err_templates/err_dictsort1.tpl
diff --git a/Haanga/tests/err_templates/err_dictsort2.tpl b/lib/Haanga/tests/err_templates/err_dictsort2.tpl
similarity index 100%
rename from Haanga/tests/err_templates/err_dictsort2.tpl
rename to lib/Haanga/tests/err_templates/err_dictsort2.tpl
diff --git a/Haanga/tests/err_templates/err_forloop.tpl b/lib/Haanga/tests/err_templates/err_forloop.tpl
similarity index 100%
rename from Haanga/tests/err_templates/err_forloop.tpl
rename to lib/Haanga/tests/err_templates/err_forloop.tpl
diff --git a/Haanga/tests/err_templates/err_forloop1.tpl b/lib/Haanga/tests/err_templates/err_forloop1.tpl
similarity index 100%
rename from Haanga/tests/err_templates/err_forloop1.tpl
rename to lib/Haanga/tests/err_templates/err_forloop1.tpl
diff --git a/Haanga/tests/err_templates/err_ifchanged.tpl b/lib/Haanga/tests/err_templates/err_ifchanged.tpl
similarity index 100%
rename from Haanga/tests/err_templates/err_ifchanged.tpl
rename to lib/Haanga/tests/err_templates/err_ifchanged.tpl
diff --git a/Haanga/tests/err_templates/err_invalid_blockname.tpl b/lib/Haanga/tests/err_templates/err_invalid_blockname.tpl
similarity index 100%
rename from Haanga/tests/err_templates/err_invalid_blockname.tpl
rename to lib/Haanga/tests/err_templates/err_invalid_blockname.tpl
diff --git a/Haanga/tests/err_templates/err_invalid_tryinclude.tpl b/lib/Haanga/tests/err_templates/err_invalid_tryinclude.tpl
similarity index 100%
rename from Haanga/tests/err_templates/err_invalid_tryinclude.tpl
rename to lib/Haanga/tests/err_templates/err_invalid_tryinclude.tpl
diff --git a/Haanga/tests/err_templates/err_load1.tpl b/lib/Haanga/tests/err_templates/err_load1.tpl
similarity index 100%
rename from Haanga/tests/err_templates/err_load1.tpl
rename to lib/Haanga/tests/err_templates/err_load1.tpl
diff --git a/Haanga/tests/err_templates/err_load2.tpl b/lib/Haanga/tests/err_templates/err_load2.tpl
similarity index 100%
rename from Haanga/tests/err_templates/err_load2.tpl
rename to lib/Haanga/tests/err_templates/err_load2.tpl
diff --git a/Haanga/tests/err_templates/err_loop_varname.tpl b/lib/Haanga/tests/err_templates/err_loop_varname.tpl
similarity index 100%
rename from Haanga/tests/err_templates/err_loop_varname.tpl
rename to lib/Haanga/tests/err_templates/err_loop_varname.tpl
diff --git a/Haanga/tests/err_templates/err_pluralize.tpl b/lib/Haanga/tests/err_templates/err_pluralize.tpl
similarity index 100%
rename from Haanga/tests/err_templates/err_pluralize.tpl
rename to lib/Haanga/tests/err_templates/err_pluralize.tpl
diff --git a/Haanga/tests/err_templates/err_reverse.tpl b/lib/Haanga/tests/err_templates/err_reverse.tpl
similarity index 100%
rename from Haanga/tests/err_templates/err_reverse.tpl
rename to lib/Haanga/tests/err_templates/err_reverse.tpl
diff --git a/Haanga/tests/err_templates/err_templatetag1.tpl b/lib/Haanga/tests/err_templates/err_templatetag1.tpl
similarity index 100%
rename from Haanga/tests/err_templates/err_templatetag1.tpl
rename to lib/Haanga/tests/err_templates/err_templatetag1.tpl
diff --git a/Haanga/tests/err_templates/err_templatetag2.tpl b/lib/Haanga/tests/err_templates/err_templatetag2.tpl
similarity index 100%
rename from Haanga/tests/err_templates/err_templatetag2.tpl
rename to lib/Haanga/tests/err_templates/err_templatetag2.tpl
diff --git a/Haanga/tests/err_templates/err_templatetag3.tpl b/lib/Haanga/tests/err_templates/err_templatetag3.tpl
similarity index 100%
rename from Haanga/tests/err_templates/err_templatetag3.tpl
rename to lib/Haanga/tests/err_templates/err_templatetag3.tpl
diff --git a/Haanga/tests/err_templates/err_title.tpl b/lib/Haanga/tests/err_templates/err_title.tpl
similarity index 100%
rename from Haanga/tests/err_templates/err_title.tpl
rename to lib/Haanga/tests/err_templates/err_title.tpl
diff --git a/Haanga/tests/err_templates/exec_notallowed.tpl b/lib/Haanga/tests/err_templates/exec_notallowed.tpl
similarity index 100%
rename from Haanga/tests/err_templates/exec_notallowed.tpl
rename to lib/Haanga/tests/err_templates/exec_notallowed.tpl
diff --git a/Haanga/tests/err_templates/forloop.tpl b/lib/Haanga/tests/err_templates/forloop.tpl
similarity index 100%
rename from Haanga/tests/err_templates/forloop.tpl
rename to lib/Haanga/tests/err_templates/forloop.tpl
diff --git a/Haanga/tests/err_templates/forloop1.tpl b/lib/Haanga/tests/err_templates/forloop1.tpl
similarity index 100%
rename from Haanga/tests/err_templates/forloop1.tpl
rename to lib/Haanga/tests/err_templates/forloop1.tpl
diff --git a/Haanga/tests/err_templates/ifchanged.tpl b/lib/Haanga/tests/err_templates/ifchanged.tpl
similarity index 100%
rename from Haanga/tests/err_templates/ifchanged.tpl
rename to lib/Haanga/tests/err_templates/ifchanged.tpl
diff --git a/Haanga/tests/err_templates/inline1.tpl b/lib/Haanga/tests/err_templates/inline1.tpl
similarity index 100%
rename from Haanga/tests/err_templates/inline1.tpl
rename to lib/Haanga/tests/err_templates/inline1.tpl
diff --git a/Haanga/tests/err_templates/inline2.tpl b/lib/Haanga/tests/err_templates/inline2.tpl
similarity index 100%
rename from Haanga/tests/err_templates/inline2.tpl
rename to lib/Haanga/tests/err_templates/inline2.tpl
diff --git a/Haanga/tests/err_templates/inline3.tpl b/lib/Haanga/tests/err_templates/inline3.tpl
similarity index 100%
rename from Haanga/tests/err_templates/inline3.tpl
rename to lib/Haanga/tests/err_templates/inline3.tpl
diff --git a/Haanga/tests/err_templates/inline4.tpl b/lib/Haanga/tests/err_templates/inline4.tpl
similarity index 100%
rename from Haanga/tests/err_templates/inline4.tpl
rename to lib/Haanga/tests/err_templates/inline4.tpl
diff --git a/Haanga/tests/err_templates/inline5.tpl b/lib/Haanga/tests/err_templates/inline5.tpl
similarity index 100%
rename from Haanga/tests/err_templates/inline5.tpl
rename to lib/Haanga/tests/err_templates/inline5.tpl
diff --git a/Haanga/tests/err_templates/invalid_blockname.tpl b/lib/Haanga/tests/err_templates/invalid_blockname.tpl
similarity index 100%
rename from Haanga/tests/err_templates/invalid_blockname.tpl
rename to lib/Haanga/tests/err_templates/invalid_blockname.tpl
diff --git a/Haanga/tests/err_templates/loop_varname.tpl b/lib/Haanga/tests/err_templates/loop_varname.tpl
similarity index 100%
rename from Haanga/tests/err_templates/loop_varname.tpl
rename to lib/Haanga/tests/err_templates/loop_varname.tpl
diff --git a/Haanga/tests/err_templates/pluralize.tpl b/lib/Haanga/tests/err_templates/pluralize.tpl
similarity index 100%
rename from Haanga/tests/err_templates/pluralize.tpl
rename to lib/Haanga/tests/err_templates/pluralize.tpl
diff --git a/Haanga/tests/err_templates/reverse.tpl b/lib/Haanga/tests/err_templates/reverse.tpl
similarity index 100%
rename from Haanga/tests/err_templates/reverse.tpl
rename to lib/Haanga/tests/err_templates/reverse.tpl
diff --git a/Haanga/tests/err_templates/templatetag1.tpl b/lib/Haanga/tests/err_templates/templatetag1.tpl
similarity index 100%
rename from Haanga/tests/err_templates/templatetag1.tpl
rename to lib/Haanga/tests/err_templates/templatetag1.tpl
diff --git a/Haanga/tests/err_templates/templatetag2.tpl b/lib/Haanga/tests/err_templates/templatetag2.tpl
similarity index 100%
rename from Haanga/tests/err_templates/templatetag2.tpl
rename to lib/Haanga/tests/err_templates/templatetag2.tpl
diff --git a/Haanga/tests/err_templates/templatetag3.tpl b/lib/Haanga/tests/err_templates/templatetag3.tpl
similarity index 100%
rename from Haanga/tests/err_templates/templatetag3.tpl
rename to lib/Haanga/tests/err_templates/templatetag3.tpl
diff --git a/Haanga/tests/err_templates/title.tpl b/lib/Haanga/tests/err_templates/title.tpl
similarity index 100%
rename from Haanga/tests/err_templates/title.tpl
rename to lib/Haanga/tests/err_templates/title.tpl
diff --git a/Haanga/tests/err_templates/tokenizer_1.tpl b/lib/Haanga/tests/err_templates/tokenizer_1.tpl
similarity index 100%
rename from Haanga/tests/err_templates/tokenizer_1.tpl
rename to lib/Haanga/tests/err_templates/tokenizer_1.tpl
diff --git a/Haanga/tests/err_templates/tokenizer_2.tpl b/lib/Haanga/tests/err_templates/tokenizer_2.tpl
similarity index 100%
rename from Haanga/tests/err_templates/tokenizer_2.tpl
rename to lib/Haanga/tests/err_templates/tokenizer_2.tpl
diff --git a/Haanga/tests/err_templates/tokenizer_3.tpl b/lib/Haanga/tests/err_templates/tokenizer_3.tpl
similarity index 100%
rename from Haanga/tests/err_templates/tokenizer_3.tpl
rename to lib/Haanga/tests/err_templates/tokenizer_3.tpl
diff --git a/Haanga/tests/err_templates/tokenizer_4.tpl b/lib/Haanga/tests/err_templates/tokenizer_4.tpl
similarity index 100%
rename from Haanga/tests/err_templates/tokenizer_4.tpl
rename to lib/Haanga/tests/err_templates/tokenizer_4.tpl
diff --git a/Haanga/tests/err_templates/tokenizer_5.tpl b/lib/Haanga/tests/err_templates/tokenizer_5.tpl
similarity index 100%
rename from Haanga/tests/err_templates/tokenizer_5.tpl
rename to lib/Haanga/tests/err_templates/tokenizer_5.tpl
diff --git a/Haanga/tests/errorTest.php b/lib/Haanga/tests/errorTest.php
similarity index 100%
rename from Haanga/tests/errorTest.php
rename to lib/Haanga/tests/errorTest.php
diff --git a/Haanga/tests/templateTest.php b/lib/Haanga/tests/templateTest.php
similarity index 100%
rename from Haanga/tests/templateTest.php
rename to lib/Haanga/tests/templateTest.php
diff --git a/Haanga/tests/tmp/assert_templates/autoescape.tpl.php b/lib/Haanga/tests/tmp/assert_templates/autoescape.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/autoescape.tpl.php
rename to lib/Haanga/tests/tmp/assert_templates/autoescape.tpl.php
diff --git a/Haanga/tests/tmp/assert_templates/autoescape.tpl.php.dump b/lib/Haanga/tests/tmp/assert_templates/autoescape.tpl.php.dump
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/autoescape.tpl.php.dump
rename to lib/Haanga/tests/tmp/assert_templates/autoescape.tpl.php.dump
diff --git a/Haanga/tests/tmp/assert_templates/base.tpl.php b/lib/Haanga/tests/tmp/assert_templates/base.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/base.tpl.php
rename to lib/Haanga/tests/tmp/assert_templates/base.tpl.php
diff --git a/Haanga/tests/tmp/assert_templates/base.tpl.php.dump b/lib/Haanga/tests/tmp/assert_templates/base.tpl.php.dump
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/base.tpl.php.dump
rename to lib/Haanga/tests/tmp/assert_templates/base.tpl.php.dump
diff --git a/Haanga/tests/tmp/assert_templates/bitwise.tpl.php b/lib/Haanga/tests/tmp/assert_templates/bitwise.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/bitwise.tpl.php
rename to lib/Haanga/tests/tmp/assert_templates/bitwise.tpl.php
diff --git a/Haanga/tests/tmp/assert_templates/bitwise.tpl.php.dump b/lib/Haanga/tests/tmp/assert_templates/bitwise.tpl.php.dump
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/bitwise.tpl.php.dump
rename to lib/Haanga/tests/tmp/assert_templates/bitwise.tpl.php.dump
diff --git a/Haanga/tests/tmp/assert_templates/bug_001.tpl.php b/lib/Haanga/tests/tmp/assert_templates/bug_001.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/bug_001.tpl.php
rename to lib/Haanga/tests/tmp/assert_templates/bug_001.tpl.php
diff --git a/Haanga/tests/tmp/assert_templates/bug_001.tpl.php.dump b/lib/Haanga/tests/tmp/assert_templates/bug_001.tpl.php.dump
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/bug_001.tpl.php.dump
rename to lib/Haanga/tests/tmp/assert_templates/bug_001.tpl.php.dump
diff --git a/Haanga/tests/tmp/assert_templates/class_static.tpl.php b/lib/Haanga/tests/tmp/assert_templates/class_static.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/class_static.tpl.php
rename to lib/Haanga/tests/tmp/assert_templates/class_static.tpl.php
diff --git a/Haanga/tests/tmp/assert_templates/class_static.tpl.php.dump b/lib/Haanga/tests/tmp/assert_templates/class_static.tpl.php.dump
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/class_static.tpl.php.dump
rename to lib/Haanga/tests/tmp/assert_templates/class_static.tpl.php.dump
diff --git a/Haanga/tests/tmp/assert_templates/concat.tpl.php b/lib/Haanga/tests/tmp/assert_templates/concat.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/concat.tpl.php
rename to lib/Haanga/tests/tmp/assert_templates/concat.tpl.php
diff --git a/Haanga/tests/tmp/assert_templates/concat.tpl.php.dump b/lib/Haanga/tests/tmp/assert_templates/concat.tpl.php.dump
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/concat.tpl.php.dump
rename to lib/Haanga/tests/tmp/assert_templates/concat.tpl.php.dump
diff --git a/Haanga/tests/tmp/assert_templates/concat1.tpl.php b/lib/Haanga/tests/tmp/assert_templates/concat1.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/concat1.tpl.php
rename to lib/Haanga/tests/tmp/assert_templates/concat1.tpl.php
diff --git a/Haanga/tests/tmp/assert_templates/concat1.tpl.php.dump b/lib/Haanga/tests/tmp/assert_templates/concat1.tpl.php.dump
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/concat1.tpl.php.dump
rename to lib/Haanga/tests/tmp/assert_templates/concat1.tpl.php.dump
diff --git a/Haanga/tests/tmp/assert_templates/custom_tag.tpl.php b/lib/Haanga/tests/tmp/assert_templates/custom_tag.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/custom_tag.tpl.php
rename to lib/Haanga/tests/tmp/assert_templates/custom_tag.tpl.php
diff --git a/Haanga/tests/tmp/assert_templates/custom_tag.tpl.php.dump b/lib/Haanga/tests/tmp/assert_templates/custom_tag.tpl.php.dump
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/custom_tag.tpl.php.dump
rename to lib/Haanga/tests/tmp/assert_templates/custom_tag.tpl.php.dump
diff --git a/Haanga/tests/tmp/assert_templates/cycle.tpl.php b/lib/Haanga/tests/tmp/assert_templates/cycle.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/cycle.tpl.php
rename to lib/Haanga/tests/tmp/assert_templates/cycle.tpl.php
diff --git a/Haanga/tests/tmp/assert_templates/cycle.tpl.php.dump b/lib/Haanga/tests/tmp/assert_templates/cycle.tpl.php.dump
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/cycle.tpl.php.dump
rename to lib/Haanga/tests/tmp/assert_templates/cycle.tpl.php.dump
diff --git a/Haanga/tests/tmp/assert_templates/dummy.tpl.php b/lib/Haanga/tests/tmp/assert_templates/dummy.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/dummy.tpl.php
rename to lib/Haanga/tests/tmp/assert_templates/dummy.tpl.php
diff --git a/Haanga/tests/tmp/assert_templates/dummy.tpl.php.dump b/lib/Haanga/tests/tmp/assert_templates/dummy.tpl.php.dump
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/dummy.tpl.php.dump
rename to lib/Haanga/tests/tmp/assert_templates/dummy.tpl.php.dump
diff --git a/Haanga/tests/tmp/assert_templates/empty_block.tpl.php b/lib/Haanga/tests/tmp/assert_templates/empty_block.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/empty_block.tpl.php
rename to lib/Haanga/tests/tmp/assert_templates/empty_block.tpl.php
diff --git a/Haanga/tests/tmp/assert_templates/empty_block.tpl.php.dump b/lib/Haanga/tests/tmp/assert_templates/empty_block.tpl.php.dump
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/empty_block.tpl.php.dump
rename to lib/Haanga/tests/tmp/assert_templates/empty_block.tpl.php.dump
diff --git a/Haanga/tests/tmp/assert_templates/empty_block_base.tpl.php b/lib/Haanga/tests/tmp/assert_templates/empty_block_base.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/empty_block_base.tpl.php
rename to lib/Haanga/tests/tmp/assert_templates/empty_block_base.tpl.php
diff --git a/Haanga/tests/tmp/assert_templates/empty_block_base.tpl.php.dump b/lib/Haanga/tests/tmp/assert_templates/empty_block_base.tpl.php.dump
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/empty_block_base.tpl.php.dump
rename to lib/Haanga/tests/tmp/assert_templates/empty_block_base.tpl.php.dump
diff --git a/Haanga/tests/tmp/assert_templates/empty_loop.tpl.php b/lib/Haanga/tests/tmp/assert_templates/empty_loop.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/empty_loop.tpl.php
rename to lib/Haanga/tests/tmp/assert_templates/empty_loop.tpl.php
diff --git a/Haanga/tests/tmp/assert_templates/empty_loop.tpl.php.dump b/lib/Haanga/tests/tmp/assert_templates/empty_loop.tpl.php.dump
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/empty_loop.tpl.php.dump
rename to lib/Haanga/tests/tmp/assert_templates/empty_loop.tpl.php.dump
diff --git a/Haanga/tests/tmp/assert_templates/exec.tpl.php b/lib/Haanga/tests/tmp/assert_templates/exec.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/exec.tpl.php
rename to lib/Haanga/tests/tmp/assert_templates/exec.tpl.php
diff --git a/Haanga/tests/tmp/assert_templates/exec.tpl.php.dump b/lib/Haanga/tests/tmp/assert_templates/exec.tpl.php.dump
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/exec.tpl.php.dump
rename to lib/Haanga/tests/tmp/assert_templates/exec.tpl.php.dump
diff --git a/Haanga/tests/tmp/assert_templates/filter.tpl.php b/lib/Haanga/tests/tmp/assert_templates/filter.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/filter.tpl.php
rename to lib/Haanga/tests/tmp/assert_templates/filter.tpl.php
diff --git a/Haanga/tests/tmp/assert_templates/filter.tpl.php.dump b/lib/Haanga/tests/tmp/assert_templates/filter.tpl.php.dump
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/filter.tpl.php.dump
rename to lib/Haanga/tests/tmp/assert_templates/filter.tpl.php.dump
diff --git a/Haanga/tests/tmp/assert_templates/first_of.tpl.php b/lib/Haanga/tests/tmp/assert_templates/first_of.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/first_of.tpl.php
rename to lib/Haanga/tests/tmp/assert_templates/first_of.tpl.php
diff --git a/Haanga/tests/tmp/assert_templates/first_of.tpl.php.dump b/lib/Haanga/tests/tmp/assert_templates/first_of.tpl.php.dump
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/first_of.tpl.php.dump
rename to lib/Haanga/tests/tmp/assert_templates/first_of.tpl.php.dump
diff --git a/Haanga/tests/tmp/assert_templates/for_range.tpl.php b/lib/Haanga/tests/tmp/assert_templates/for_range.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/for_range.tpl.php
rename to lib/Haanga/tests/tmp/assert_templates/for_range.tpl.php
diff --git a/Haanga/tests/tmp/assert_templates/for_range.tpl.php.dump b/lib/Haanga/tests/tmp/assert_templates/for_range.tpl.php.dump
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/for_range.tpl.php.dump
rename to lib/Haanga/tests/tmp/assert_templates/for_range.tpl.php.dump
diff --git a/Haanga/tests/tmp/assert_templates/for_range1.tpl.php b/lib/Haanga/tests/tmp/assert_templates/for_range1.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/for_range1.tpl.php
rename to lib/Haanga/tests/tmp/assert_templates/for_range1.tpl.php
diff --git a/Haanga/tests/tmp/assert_templates/for_range1.tpl.php.dump b/lib/Haanga/tests/tmp/assert_templates/for_range1.tpl.php.dump
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/for_range1.tpl.php.dump
rename to lib/Haanga/tests/tmp/assert_templates/for_range1.tpl.php.dump
diff --git a/Haanga/tests/tmp/assert_templates/for_range2.tpl.php b/lib/Haanga/tests/tmp/assert_templates/for_range2.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/for_range2.tpl.php
rename to lib/Haanga/tests/tmp/assert_templates/for_range2.tpl.php
diff --git a/Haanga/tests/tmp/assert_templates/for_range2.tpl.php.dump b/lib/Haanga/tests/tmp/assert_templates/for_range2.tpl.php.dump
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/for_range2.tpl.php.dump
rename to lib/Haanga/tests/tmp/assert_templates/for_range2.tpl.php.dump
diff --git a/Haanga/tests/tmp/assert_templates/for_range3.tpl.php b/lib/Haanga/tests/tmp/assert_templates/for_range3.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/for_range3.tpl.php
rename to lib/Haanga/tests/tmp/assert_templates/for_range3.tpl.php
diff --git a/Haanga/tests/tmp/assert_templates/for_range3.tpl.php.dump b/lib/Haanga/tests/tmp/assert_templates/for_range3.tpl.php.dump
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/for_range3.tpl.php.dump
rename to lib/Haanga/tests/tmp/assert_templates/for_range3.tpl.php.dump
diff --git a/Haanga/tests/tmp/assert_templates/for_range4.tpl.php b/lib/Haanga/tests/tmp/assert_templates/for_range4.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/for_range4.tpl.php
rename to lib/Haanga/tests/tmp/assert_templates/for_range4.tpl.php
diff --git a/Haanga/tests/tmp/assert_templates/for_range4.tpl.php.dump b/lib/Haanga/tests/tmp/assert_templates/for_range4.tpl.php.dump
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/for_range4.tpl.php.dump
rename to lib/Haanga/tests/tmp/assert_templates/for_range4.tpl.php.dump
diff --git a/Haanga/tests/tmp/assert_templates/for_range5.tpl.php b/lib/Haanga/tests/tmp/assert_templates/for_range5.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/for_range5.tpl.php
rename to lib/Haanga/tests/tmp/assert_templates/for_range5.tpl.php
diff --git a/Haanga/tests/tmp/assert_templates/for_range5.tpl.php.dump b/lib/Haanga/tests/tmp/assert_templates/for_range5.tpl.php.dump
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/for_range5.tpl.php.dump
rename to lib/Haanga/tests/tmp/assert_templates/for_range5.tpl.php.dump
diff --git a/Haanga/tests/tmp/assert_templates/foreach_vars.tpl.php b/lib/Haanga/tests/tmp/assert_templates/foreach_vars.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/foreach_vars.tpl.php
rename to lib/Haanga/tests/tmp/assert_templates/foreach_vars.tpl.php
diff --git a/Haanga/tests/tmp/assert_templates/foreach_vars.tpl.php.dump b/lib/Haanga/tests/tmp/assert_templates/foreach_vars.tpl.php.dump
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/foreach_vars.tpl.php.dump
rename to lib/Haanga/tests/tmp/assert_templates/foreach_vars.tpl.php.dump
diff --git a/Haanga/tests/tmp/assert_templates/global.tpl.php b/lib/Haanga/tests/tmp/assert_templates/global.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/global.tpl.php
rename to lib/Haanga/tests/tmp/assert_templates/global.tpl.php
diff --git a/Haanga/tests/tmp/assert_templates/global.tpl.php.dump b/lib/Haanga/tests/tmp/assert_templates/global.tpl.php.dump
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/global.tpl.php.dump
rename to lib/Haanga/tests/tmp/assert_templates/global.tpl.php.dump
diff --git a/Haanga/tests/tmp/assert_templates/if_else_simple.tpl.php b/lib/Haanga/tests/tmp/assert_templates/if_else_simple.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/if_else_simple.tpl.php
rename to lib/Haanga/tests/tmp/assert_templates/if_else_simple.tpl.php
diff --git a/Haanga/tests/tmp/assert_templates/if_else_simple.tpl.php.dump b/lib/Haanga/tests/tmp/assert_templates/if_else_simple.tpl.php.dump
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/if_else_simple.tpl.php.dump
rename to lib/Haanga/tests/tmp/assert_templates/if_else_simple.tpl.php.dump
diff --git a/Haanga/tests/tmp/assert_templates/ifchanged.tpl.php b/lib/Haanga/tests/tmp/assert_templates/ifchanged.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/ifchanged.tpl.php
rename to lib/Haanga/tests/tmp/assert_templates/ifchanged.tpl.php
diff --git a/Haanga/tests/tmp/assert_templates/ifchanged.tpl.php.dump b/lib/Haanga/tests/tmp/assert_templates/ifchanged.tpl.php.dump
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/ifchanged.tpl.php.dump
rename to lib/Haanga/tests/tmp/assert_templates/ifchanged.tpl.php.dump
diff --git a/Haanga/tests/tmp/assert_templates/ifequals.tpl.php b/lib/Haanga/tests/tmp/assert_templates/ifequals.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/ifequals.tpl.php
rename to lib/Haanga/tests/tmp/assert_templates/ifequals.tpl.php
diff --git a/Haanga/tests/tmp/assert_templates/ifequals.tpl.php.dump b/lib/Haanga/tests/tmp/assert_templates/ifequals.tpl.php.dump
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/ifequals.tpl.php.dump
rename to lib/Haanga/tests/tmp/assert_templates/ifequals.tpl.php.dump
diff --git a/Haanga/tests/tmp/assert_templates/in.tpl.php b/lib/Haanga/tests/tmp/assert_templates/in.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/in.tpl.php
rename to lib/Haanga/tests/tmp/assert_templates/in.tpl.php
diff --git a/Haanga/tests/tmp/assert_templates/in.tpl.php.dump b/lib/Haanga/tests/tmp/assert_templates/in.tpl.php.dump
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/in.tpl.php.dump
rename to lib/Haanga/tests/tmp/assert_templates/in.tpl.php.dump
diff --git a/Haanga/tests/tmp/assert_templates/inheritence_nested_block.tpl.php b/lib/Haanga/tests/tmp/assert_templates/inheritence_nested_block.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/inheritence_nested_block.tpl.php
rename to lib/Haanga/tests/tmp/assert_templates/inheritence_nested_block.tpl.php
diff --git a/Haanga/tests/tmp/assert_templates/inheritence_nested_block.tpl.php.dump b/lib/Haanga/tests/tmp/assert_templates/inheritence_nested_block.tpl.php.dump
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/inheritence_nested_block.tpl.php.dump
rename to lib/Haanga/tests/tmp/assert_templates/inheritence_nested_block.tpl.php.dump
diff --git a/Haanga/tests/tmp/assert_templates/inheritence_nested_block_duplicated.tpl.php b/lib/Haanga/tests/tmp/assert_templates/inheritence_nested_block_duplicated.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/inheritence_nested_block_duplicated.tpl.php
rename to lib/Haanga/tests/tmp/assert_templates/inheritence_nested_block_duplicated.tpl.php
diff --git a/Haanga/tests/tmp/assert_templates/inheritence_nested_block_duplicated.tpl.php.dump b/lib/Haanga/tests/tmp/assert_templates/inheritence_nested_block_duplicated.tpl.php.dump
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/inheritence_nested_block_duplicated.tpl.php.dump
rename to lib/Haanga/tests/tmp/assert_templates/inheritence_nested_block_duplicated.tpl.php.dump
diff --git a/Haanga/tests/tmp/assert_templates/inline.tpl.php b/lib/Haanga/tests/tmp/assert_templates/inline.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/inline.tpl.php
rename to lib/Haanga/tests/tmp/assert_templates/inline.tpl.php
diff --git a/Haanga/tests/tmp/assert_templates/inline.tpl.php.dump b/lib/Haanga/tests/tmp/assert_templates/inline.tpl.php.dump
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/inline.tpl.php.dump
rename to lib/Haanga/tests/tmp/assert_templates/inline.tpl.php.dump
diff --git a/Haanga/tests/tmp/assert_templates/intval.tpl.php b/lib/Haanga/tests/tmp/assert_templates/intval.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/intval.tpl.php
rename to lib/Haanga/tests/tmp/assert_templates/intval.tpl.php
diff --git a/Haanga/tests/tmp/assert_templates/intval.tpl.php.dump b/lib/Haanga/tests/tmp/assert_templates/intval.tpl.php.dump
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/intval.tpl.php.dump
rename to lib/Haanga/tests/tmp/assert_templates/intval.tpl.php.dump
diff --git a/Haanga/tests/tmp/assert_templates/join.tpl.php b/lib/Haanga/tests/tmp/assert_templates/join.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/join.tpl.php
rename to lib/Haanga/tests/tmp/assert_templates/join.tpl.php
diff --git a/Haanga/tests/tmp/assert_templates/join.tpl.php.dump b/lib/Haanga/tests/tmp/assert_templates/join.tpl.php.dump
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/join.tpl.php.dump
rename to lib/Haanga/tests/tmp/assert_templates/join.tpl.php.dump
diff --git a/Haanga/tests/tmp/assert_templates/load.tpl.php b/lib/Haanga/tests/tmp/assert_templates/load.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/load.tpl.php
rename to lib/Haanga/tests/tmp/assert_templates/load.tpl.php
diff --git a/Haanga/tests/tmp/assert_templates/load.tpl.php.dump b/lib/Haanga/tests/tmp/assert_templates/load.tpl.php.dump
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/load.tpl.php.dump
rename to lib/Haanga/tests/tmp/assert_templates/load.tpl.php.dump
diff --git a/Haanga/tests/tmp/assert_templates/loop.tpl.php b/lib/Haanga/tests/tmp/assert_templates/loop.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/loop.tpl.php
rename to lib/Haanga/tests/tmp/assert_templates/loop.tpl.php
diff --git a/Haanga/tests/tmp/assert_templates/loop.tpl.php.dump b/lib/Haanga/tests/tmp/assert_templates/loop.tpl.php.dump
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/loop.tpl.php.dump
rename to lib/Haanga/tests/tmp/assert_templates/loop.tpl.php.dump
diff --git a/Haanga/tests/tmp/assert_templates/loop_object.tpl.php b/lib/Haanga/tests/tmp/assert_templates/loop_object.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/loop_object.tpl.php
rename to lib/Haanga/tests/tmp/assert_templates/loop_object.tpl.php
diff --git a/Haanga/tests/tmp/assert_templates/loop_object.tpl.php.dump b/lib/Haanga/tests/tmp/assert_templates/loop_object.tpl.php.dump
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/loop_object.tpl.php.dump
rename to lib/Haanga/tests/tmp/assert_templates/loop_object.tpl.php.dump
diff --git a/Haanga/tests/tmp/assert_templates/method.tpl.php b/lib/Haanga/tests/tmp/assert_templates/method.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/method.tpl.php
rename to lib/Haanga/tests/tmp/assert_templates/method.tpl.php
diff --git a/Haanga/tests/tmp/assert_templates/method.tpl.php.dump b/lib/Haanga/tests/tmp/assert_templates/method.tpl.php.dump
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/method.tpl.php.dump
rename to lib/Haanga/tests/tmp/assert_templates/method.tpl.php.dump
diff --git a/Haanga/tests/tmp/assert_templates/nested_block.tpl.php b/lib/Haanga/tests/tmp/assert_templates/nested_block.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/nested_block.tpl.php
rename to lib/Haanga/tests/tmp/assert_templates/nested_block.tpl.php
diff --git a/Haanga/tests/tmp/assert_templates/nested_block.tpl.php.dump b/lib/Haanga/tests/tmp/assert_templates/nested_block.tpl.php.dump
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/nested_block.tpl.php.dump
rename to lib/Haanga/tests/tmp/assert_templates/nested_block.tpl.php.dump
diff --git a/Haanga/tests/tmp/assert_templates/nested_block_second_parent.tpl.php b/lib/Haanga/tests/tmp/assert_templates/nested_block_second_parent.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/nested_block_second_parent.tpl.php
rename to lib/Haanga/tests/tmp/assert_templates/nested_block_second_parent.tpl.php
diff --git a/Haanga/tests/tmp/assert_templates/nested_block_second_parent.tpl.php.dump b/lib/Haanga/tests/tmp/assert_templates/nested_block_second_parent.tpl.php.dump
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/nested_block_second_parent.tpl.php.dump
rename to lib/Haanga/tests/tmp/assert_templates/nested_block_second_parent.tpl.php.dump
diff --git a/Haanga/tests/tmp/assert_templates/nested_block_second_parent_override.tpl.php b/lib/Haanga/tests/tmp/assert_templates/nested_block_second_parent_override.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/nested_block_second_parent_override.tpl.php
rename to lib/Haanga/tests/tmp/assert_templates/nested_block_second_parent_override.tpl.php
diff --git a/Haanga/tests/tmp/assert_templates/nested_block_second_parent_override.tpl.php.dump b/lib/Haanga/tests/tmp/assert_templates/nested_block_second_parent_override.tpl.php.dump
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/nested_block_second_parent_override.tpl.php.dump
rename to lib/Haanga/tests/tmp/assert_templates/nested_block_second_parent_override.tpl.php.dump
diff --git a/Haanga/tests/tmp/assert_templates/object.tpl.php b/lib/Haanga/tests/tmp/assert_templates/object.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/object.tpl.php
rename to lib/Haanga/tests/tmp/assert_templates/object.tpl.php
diff --git a/Haanga/tests/tmp/assert_templates/object.tpl.php.dump b/lib/Haanga/tests/tmp/assert_templates/object.tpl.php.dump
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/object.tpl.php.dump
rename to lib/Haanga/tests/tmp/assert_templates/object.tpl.php.dump
diff --git a/Haanga/tests/tmp/assert_templates/partial.tpl.php b/lib/Haanga/tests/tmp/assert_templates/partial.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/partial.tpl.php
rename to lib/Haanga/tests/tmp/assert_templates/partial.tpl.php
diff --git a/Haanga/tests/tmp/assert_templates/partial.tpl.php.dump b/lib/Haanga/tests/tmp/assert_templates/partial.tpl.php.dump
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/partial.tpl.php.dump
rename to lib/Haanga/tests/tmp/assert_templates/partial.tpl.php.dump
diff --git a/Haanga/tests/tmp/assert_templates/pluralize.tpl.php b/lib/Haanga/tests/tmp/assert_templates/pluralize.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/pluralize.tpl.php
rename to lib/Haanga/tests/tmp/assert_templates/pluralize.tpl.php
diff --git a/Haanga/tests/tmp/assert_templates/pluralize.tpl.php.dump b/lib/Haanga/tests/tmp/assert_templates/pluralize.tpl.php.dump
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/pluralize.tpl.php.dump
rename to lib/Haanga/tests/tmp/assert_templates/pluralize.tpl.php.dump
diff --git a/Haanga/tests/tmp/assert_templates/regroup.tpl.php b/lib/Haanga/tests/tmp/assert_templates/regroup.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/regroup.tpl.php
rename to lib/Haanga/tests/tmp/assert_templates/regroup.tpl.php
diff --git a/Haanga/tests/tmp/assert_templates/regroup.tpl.php.dump b/lib/Haanga/tests/tmp/assert_templates/regroup.tpl.php.dump
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/regroup.tpl.php.dump
rename to lib/Haanga/tests/tmp/assert_templates/regroup.tpl.php.dump
diff --git a/Haanga/tests/tmp/assert_templates/set.tpl.php b/lib/Haanga/tests/tmp/assert_templates/set.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/set.tpl.php
rename to lib/Haanga/tests/tmp/assert_templates/set.tpl.php
diff --git a/Haanga/tests/tmp/assert_templates/set.tpl.php.dump b/lib/Haanga/tests/tmp/assert_templates/set.tpl.php.dump
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/set.tpl.php.dump
rename to lib/Haanga/tests/tmp/assert_templates/set.tpl.php.dump
diff --git a/Haanga/tests/tmp/assert_templates/spaceless.tpl.php b/lib/Haanga/tests/tmp/assert_templates/spaceless.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/spaceless.tpl.php
rename to lib/Haanga/tests/tmp/assert_templates/spaceless.tpl.php
diff --git a/Haanga/tests/tmp/assert_templates/spaceless.tpl.php.dump b/lib/Haanga/tests/tmp/assert_templates/spaceless.tpl.php.dump
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/spaceless.tpl.php.dump
rename to lib/Haanga/tests/tmp/assert_templates/spaceless.tpl.php.dump
diff --git a/Haanga/tests/tmp/assert_templates/strip_whitespace.tpl.php b/lib/Haanga/tests/tmp/assert_templates/strip_whitespace.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/strip_whitespace.tpl.php
rename to lib/Haanga/tests/tmp/assert_templates/strip_whitespace.tpl.php
diff --git a/Haanga/tests/tmp/assert_templates/strip_whitespace.tpl.php.dump b/lib/Haanga/tests/tmp/assert_templates/strip_whitespace.tpl.php.dump
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/strip_whitespace.tpl.php.dump
rename to lib/Haanga/tests/tmp/assert_templates/strip_whitespace.tpl.php.dump
diff --git a/Haanga/tests/tmp/assert_templates/sub_set.tpl.php b/lib/Haanga/tests/tmp/assert_templates/sub_set.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/sub_set.tpl.php
rename to lib/Haanga/tests/tmp/assert_templates/sub_set.tpl.php
diff --git a/Haanga/tests/tmp/assert_templates/sub_set.tpl.php.dump b/lib/Haanga/tests/tmp/assert_templates/sub_set.tpl.php.dump
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/sub_set.tpl.php.dump
rename to lib/Haanga/tests/tmp/assert_templates/sub_set.tpl.php.dump
diff --git a/Haanga/tests/tmp/assert_templates/subtemplate.tpl.php b/lib/Haanga/tests/tmp/assert_templates/subtemplate.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/subtemplate.tpl.php
rename to lib/Haanga/tests/tmp/assert_templates/subtemplate.tpl.php
diff --git a/Haanga/tests/tmp/assert_templates/subtemplate.tpl.php.dump b/lib/Haanga/tests/tmp/assert_templates/subtemplate.tpl.php.dump
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/subtemplate.tpl.php.dump
rename to lib/Haanga/tests/tmp/assert_templates/subtemplate.tpl.php.dump
diff --git a/Haanga/tests/tmp/assert_templates/templatetag.tpl.php b/lib/Haanga/tests/tmp/assert_templates/templatetag.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/templatetag.tpl.php
rename to lib/Haanga/tests/tmp/assert_templates/templatetag.tpl.php
diff --git a/Haanga/tests/tmp/assert_templates/templatetag.tpl.php.dump b/lib/Haanga/tests/tmp/assert_templates/templatetag.tpl.php.dump
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/templatetag.tpl.php.dump
rename to lib/Haanga/tests/tmp/assert_templates/templatetag.tpl.php.dump
diff --git a/Haanga/tests/tmp/assert_templates/title.tpl.php b/lib/Haanga/tests/tmp/assert_templates/title.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/title.tpl.php
rename to lib/Haanga/tests/tmp/assert_templates/title.tpl.php
diff --git a/Haanga/tests/tmp/assert_templates/title.tpl.php.dump b/lib/Haanga/tests/tmp/assert_templates/title.tpl.php.dump
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/title.tpl.php.dump
rename to lib/Haanga/tests/tmp/assert_templates/title.tpl.php.dump
diff --git a/Haanga/tests/tmp/assert_templates/trans.tpl.php b/lib/Haanga/tests/tmp/assert_templates/trans.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/trans.tpl.php
rename to lib/Haanga/tests/tmp/assert_templates/trans.tpl.php
diff --git a/Haanga/tests/tmp/assert_templates/trans.tpl.php.dump b/lib/Haanga/tests/tmp/assert_templates/trans.tpl.php.dump
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/trans.tpl.php.dump
rename to lib/Haanga/tests/tmp/assert_templates/trans.tpl.php.dump
diff --git a/Haanga/tests/tmp/assert_templates/truncatewords.tpl.php b/lib/Haanga/tests/tmp/assert_templates/truncatewords.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/truncatewords.tpl.php
rename to lib/Haanga/tests/tmp/assert_templates/truncatewords.tpl.php
diff --git a/Haanga/tests/tmp/assert_templates/truncatewords.tpl.php.dump b/lib/Haanga/tests/tmp/assert_templates/truncatewords.tpl.php.dump
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/truncatewords.tpl.php.dump
rename to lib/Haanga/tests/tmp/assert_templates/truncatewords.tpl.php.dump
diff --git a/Haanga/tests/tmp/assert_templates/try_include.tpl.php b/lib/Haanga/tests/tmp/assert_templates/try_include.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/try_include.tpl.php
rename to lib/Haanga/tests/tmp/assert_templates/try_include.tpl.php
diff --git a/Haanga/tests/tmp/assert_templates/try_include.tpl.php.dump b/lib/Haanga/tests/tmp/assert_templates/try_include.tpl.php.dump
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/try_include.tpl.php.dump
rename to lib/Haanga/tests/tmp/assert_templates/try_include.tpl.php.dump
diff --git a/Haanga/tests/tmp/assert_templates/variable_existe.tpl.php b/lib/Haanga/tests/tmp/assert_templates/variable_existe.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/variable_existe.tpl.php
rename to lib/Haanga/tests/tmp/assert_templates/variable_existe.tpl.php
diff --git a/Haanga/tests/tmp/assert_templates/variable_existe.tpl.php.dump b/lib/Haanga/tests/tmp/assert_templates/variable_existe.tpl.php.dump
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/variable_existe.tpl.php.dump
rename to lib/Haanga/tests/tmp/assert_templates/variable_existe.tpl.php.dump
diff --git a/Haanga/tests/tmp/assert_templates/with.tpl.php b/lib/Haanga/tests/tmp/assert_templates/with.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/with.tpl.php
rename to lib/Haanga/tests/tmp/assert_templates/with.tpl.php
diff --git a/Haanga/tests/tmp/assert_templates/with.tpl.php.dump b/lib/Haanga/tests/tmp/assert_templates/with.tpl.php.dump
similarity index 100%
rename from Haanga/tests/tmp/assert_templates/with.tpl.php.dump
rename to lib/Haanga/tests/tmp/assert_templates/with.tpl.php.dump
diff --git a/Haanga/tests/tmp/err_templates/block.tpl.php b/lib/Haanga/tests/tmp/err_templates/block.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/err_templates/block.tpl.php
rename to lib/Haanga/tests/tmp/err_templates/block.tpl.php
diff --git a/Haanga/tests/tmp/err_templates/block_nonparent.tpl.php b/lib/Haanga/tests/tmp/err_templates/block_nonparent.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/err_templates/block_nonparent.tpl.php
rename to lib/Haanga/tests/tmp/err_templates/block_nonparent.tpl.php
diff --git a/Haanga/tests/tmp/err_templates/block_super.tpl.php b/lib/Haanga/tests/tmp/err_templates/block_super.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/err_templates/block_super.tpl.php
rename to lib/Haanga/tests/tmp/err_templates/block_super.tpl.php
diff --git a/Haanga/tests/tmp/err_templates/block_super_filter.tpl.php b/lib/Haanga/tests/tmp/err_templates/block_super_filter.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/err_templates/block_super_filter.tpl.php
rename to lib/Haanga/tests/tmp/err_templates/block_super_filter.tpl.php
diff --git a/Haanga/tests/tmp/err_templates/block_super_nonsubtemplate.tpl.php b/lib/Haanga/tests/tmp/err_templates/block_super_nonsubtemplate.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/err_templates/block_super_nonsubtemplate.tpl.php
rename to lib/Haanga/tests/tmp/err_templates/block_super_nonsubtemplate.tpl.php
diff --git a/Haanga/tests/tmp/err_templates/dictsort.tpl.php b/lib/Haanga/tests/tmp/err_templates/dictsort.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/err_templates/dictsort.tpl.php
rename to lib/Haanga/tests/tmp/err_templates/dictsort.tpl.php
diff --git a/Haanga/tests/tmp/err_templates/dictsort1.tpl.php b/lib/Haanga/tests/tmp/err_templates/dictsort1.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/err_templates/dictsort1.tpl.php
rename to lib/Haanga/tests/tmp/err_templates/dictsort1.tpl.php
diff --git a/Haanga/tests/tmp/err_templates/dictsort2.tpl.php b/lib/Haanga/tests/tmp/err_templates/dictsort2.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/err_templates/dictsort2.tpl.php
rename to lib/Haanga/tests/tmp/err_templates/dictsort2.tpl.php
diff --git a/Haanga/tests/tmp/err_templates/err_block.tpl.php b/lib/Haanga/tests/tmp/err_templates/err_block.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/err_templates/err_block.tpl.php
rename to lib/Haanga/tests/tmp/err_templates/err_block.tpl.php
diff --git a/Haanga/tests/tmp/err_templates/err_block_nonparent.tpl.php b/lib/Haanga/tests/tmp/err_templates/err_block_nonparent.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/err_templates/err_block_nonparent.tpl.php
rename to lib/Haanga/tests/tmp/err_templates/err_block_nonparent.tpl.php
diff --git a/Haanga/tests/tmp/err_templates/err_block_super.tpl.php b/lib/Haanga/tests/tmp/err_templates/err_block_super.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/err_templates/err_block_super.tpl.php
rename to lib/Haanga/tests/tmp/err_templates/err_block_super.tpl.php
diff --git a/Haanga/tests/tmp/err_templates/err_block_super_filter.tpl.php b/lib/Haanga/tests/tmp/err_templates/err_block_super_filter.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/err_templates/err_block_super_filter.tpl.php
rename to lib/Haanga/tests/tmp/err_templates/err_block_super_filter.tpl.php
diff --git a/Haanga/tests/tmp/err_templates/err_block_super_nonsubtemplate.tpl.php b/lib/Haanga/tests/tmp/err_templates/err_block_super_nonsubtemplate.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/err_templates/err_block_super_nonsubtemplate.tpl.php
rename to lib/Haanga/tests/tmp/err_templates/err_block_super_nonsubtemplate.tpl.php
diff --git a/Haanga/tests/tmp/err_templates/err_dictsort.tpl.php b/lib/Haanga/tests/tmp/err_templates/err_dictsort.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/err_templates/err_dictsort.tpl.php
rename to lib/Haanga/tests/tmp/err_templates/err_dictsort.tpl.php
diff --git a/Haanga/tests/tmp/err_templates/err_dictsort1.tpl.php b/lib/Haanga/tests/tmp/err_templates/err_dictsort1.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/err_templates/err_dictsort1.tpl.php
rename to lib/Haanga/tests/tmp/err_templates/err_dictsort1.tpl.php
diff --git a/Haanga/tests/tmp/err_templates/err_dictsort2.tpl.php b/lib/Haanga/tests/tmp/err_templates/err_dictsort2.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/err_templates/err_dictsort2.tpl.php
rename to lib/Haanga/tests/tmp/err_templates/err_dictsort2.tpl.php
diff --git a/Haanga/tests/tmp/err_templates/err_forloop.tpl.php b/lib/Haanga/tests/tmp/err_templates/err_forloop.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/err_templates/err_forloop.tpl.php
rename to lib/Haanga/tests/tmp/err_templates/err_forloop.tpl.php
diff --git a/Haanga/tests/tmp/err_templates/err_forloop1.tpl.php b/lib/Haanga/tests/tmp/err_templates/err_forloop1.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/err_templates/err_forloop1.tpl.php
rename to lib/Haanga/tests/tmp/err_templates/err_forloop1.tpl.php
diff --git a/Haanga/tests/tmp/err_templates/err_ifchanged.tpl.php b/lib/Haanga/tests/tmp/err_templates/err_ifchanged.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/err_templates/err_ifchanged.tpl.php
rename to lib/Haanga/tests/tmp/err_templates/err_ifchanged.tpl.php
diff --git a/Haanga/tests/tmp/err_templates/err_invalid_blockname.tpl.php b/lib/Haanga/tests/tmp/err_templates/err_invalid_blockname.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/err_templates/err_invalid_blockname.tpl.php
rename to lib/Haanga/tests/tmp/err_templates/err_invalid_blockname.tpl.php
diff --git a/Haanga/tests/tmp/err_templates/err_invalid_tryinclude.tpl.php b/lib/Haanga/tests/tmp/err_templates/err_invalid_tryinclude.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/err_templates/err_invalid_tryinclude.tpl.php
rename to lib/Haanga/tests/tmp/err_templates/err_invalid_tryinclude.tpl.php
diff --git a/Haanga/tests/tmp/err_templates/err_load1.tpl.php b/lib/Haanga/tests/tmp/err_templates/err_load1.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/err_templates/err_load1.tpl.php
rename to lib/Haanga/tests/tmp/err_templates/err_load1.tpl.php
diff --git a/Haanga/tests/tmp/err_templates/err_load2.tpl.php b/lib/Haanga/tests/tmp/err_templates/err_load2.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/err_templates/err_load2.tpl.php
rename to lib/Haanga/tests/tmp/err_templates/err_load2.tpl.php
diff --git a/Haanga/tests/tmp/err_templates/err_loop_varname.tpl.php b/lib/Haanga/tests/tmp/err_templates/err_loop_varname.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/err_templates/err_loop_varname.tpl.php
rename to lib/Haanga/tests/tmp/err_templates/err_loop_varname.tpl.php
diff --git a/Haanga/tests/tmp/err_templates/err_pluralize.tpl.php b/lib/Haanga/tests/tmp/err_templates/err_pluralize.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/err_templates/err_pluralize.tpl.php
rename to lib/Haanga/tests/tmp/err_templates/err_pluralize.tpl.php
diff --git a/Haanga/tests/tmp/err_templates/err_reverse.tpl.php b/lib/Haanga/tests/tmp/err_templates/err_reverse.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/err_templates/err_reverse.tpl.php
rename to lib/Haanga/tests/tmp/err_templates/err_reverse.tpl.php
diff --git a/Haanga/tests/tmp/err_templates/err_templatetag1.tpl.php b/lib/Haanga/tests/tmp/err_templates/err_templatetag1.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/err_templates/err_templatetag1.tpl.php
rename to lib/Haanga/tests/tmp/err_templates/err_templatetag1.tpl.php
diff --git a/Haanga/tests/tmp/err_templates/err_templatetag2.tpl.php b/lib/Haanga/tests/tmp/err_templates/err_templatetag2.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/err_templates/err_templatetag2.tpl.php
rename to lib/Haanga/tests/tmp/err_templates/err_templatetag2.tpl.php
diff --git a/Haanga/tests/tmp/err_templates/err_templatetag3.tpl.php b/lib/Haanga/tests/tmp/err_templates/err_templatetag3.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/err_templates/err_templatetag3.tpl.php
rename to lib/Haanga/tests/tmp/err_templates/err_templatetag3.tpl.php
diff --git a/Haanga/tests/tmp/err_templates/err_title.tpl.php b/lib/Haanga/tests/tmp/err_templates/err_title.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/err_templates/err_title.tpl.php
rename to lib/Haanga/tests/tmp/err_templates/err_title.tpl.php
diff --git a/Haanga/tests/tmp/err_templates/exec_notallowed.tpl.php b/lib/Haanga/tests/tmp/err_templates/exec_notallowed.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/err_templates/exec_notallowed.tpl.php
rename to lib/Haanga/tests/tmp/err_templates/exec_notallowed.tpl.php
diff --git a/Haanga/tests/tmp/err_templates/forloop.tpl.php b/lib/Haanga/tests/tmp/err_templates/forloop.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/err_templates/forloop.tpl.php
rename to lib/Haanga/tests/tmp/err_templates/forloop.tpl.php
diff --git a/Haanga/tests/tmp/err_templates/forloop1.tpl.php b/lib/Haanga/tests/tmp/err_templates/forloop1.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/err_templates/forloop1.tpl.php
rename to lib/Haanga/tests/tmp/err_templates/forloop1.tpl.php
diff --git a/Haanga/tests/tmp/err_templates/ifchanged.tpl.php b/lib/Haanga/tests/tmp/err_templates/ifchanged.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/err_templates/ifchanged.tpl.php
rename to lib/Haanga/tests/tmp/err_templates/ifchanged.tpl.php
diff --git a/Haanga/tests/tmp/err_templates/inline1.tpl.php b/lib/Haanga/tests/tmp/err_templates/inline1.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/err_templates/inline1.tpl.php
rename to lib/Haanga/tests/tmp/err_templates/inline1.tpl.php
diff --git a/Haanga/tests/tmp/err_templates/inline2.tpl.php b/lib/Haanga/tests/tmp/err_templates/inline2.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/err_templates/inline2.tpl.php
rename to lib/Haanga/tests/tmp/err_templates/inline2.tpl.php
diff --git a/Haanga/tests/tmp/err_templates/inline3.tpl.php b/lib/Haanga/tests/tmp/err_templates/inline3.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/err_templates/inline3.tpl.php
rename to lib/Haanga/tests/tmp/err_templates/inline3.tpl.php
diff --git a/Haanga/tests/tmp/err_templates/inline4.tpl.php b/lib/Haanga/tests/tmp/err_templates/inline4.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/err_templates/inline4.tpl.php
rename to lib/Haanga/tests/tmp/err_templates/inline4.tpl.php
diff --git a/Haanga/tests/tmp/err_templates/inline5.tpl.php b/lib/Haanga/tests/tmp/err_templates/inline5.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/err_templates/inline5.tpl.php
rename to lib/Haanga/tests/tmp/err_templates/inline5.tpl.php
diff --git a/Haanga/tests/tmp/err_templates/invalid_blockname.tpl.php b/lib/Haanga/tests/tmp/err_templates/invalid_blockname.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/err_templates/invalid_blockname.tpl.php
rename to lib/Haanga/tests/tmp/err_templates/invalid_blockname.tpl.php
diff --git a/Haanga/tests/tmp/err_templates/loop_varname.tpl.php b/lib/Haanga/tests/tmp/err_templates/loop_varname.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/err_templates/loop_varname.tpl.php
rename to lib/Haanga/tests/tmp/err_templates/loop_varname.tpl.php
diff --git a/Haanga/tests/tmp/err_templates/pluralize.tpl.php b/lib/Haanga/tests/tmp/err_templates/pluralize.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/err_templates/pluralize.tpl.php
rename to lib/Haanga/tests/tmp/err_templates/pluralize.tpl.php
diff --git a/Haanga/tests/tmp/err_templates/reverse.tpl.php b/lib/Haanga/tests/tmp/err_templates/reverse.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/err_templates/reverse.tpl.php
rename to lib/Haanga/tests/tmp/err_templates/reverse.tpl.php
diff --git a/Haanga/tests/tmp/err_templates/templatetag1.tpl.php b/lib/Haanga/tests/tmp/err_templates/templatetag1.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/err_templates/templatetag1.tpl.php
rename to lib/Haanga/tests/tmp/err_templates/templatetag1.tpl.php
diff --git a/Haanga/tests/tmp/err_templates/templatetag2.tpl.php b/lib/Haanga/tests/tmp/err_templates/templatetag2.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/err_templates/templatetag2.tpl.php
rename to lib/Haanga/tests/tmp/err_templates/templatetag2.tpl.php
diff --git a/Haanga/tests/tmp/err_templates/templatetag3.tpl.php b/lib/Haanga/tests/tmp/err_templates/templatetag3.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/err_templates/templatetag3.tpl.php
rename to lib/Haanga/tests/tmp/err_templates/templatetag3.tpl.php
diff --git a/Haanga/tests/tmp/err_templates/title.tpl.php b/lib/Haanga/tests/tmp/err_templates/title.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/err_templates/title.tpl.php
rename to lib/Haanga/tests/tmp/err_templates/title.tpl.php
diff --git a/Haanga/tests/tmp/err_templates/tokenizer_1.tpl.php b/lib/Haanga/tests/tmp/err_templates/tokenizer_1.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/err_templates/tokenizer_1.tpl.php
rename to lib/Haanga/tests/tmp/err_templates/tokenizer_1.tpl.php
diff --git a/Haanga/tests/tmp/err_templates/tokenizer_2.tpl.php b/lib/Haanga/tests/tmp/err_templates/tokenizer_2.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/err_templates/tokenizer_2.tpl.php
rename to lib/Haanga/tests/tmp/err_templates/tokenizer_2.tpl.php
diff --git a/Haanga/tests/tmp/err_templates/tokenizer_3.tpl.php b/lib/Haanga/tests/tmp/err_templates/tokenizer_3.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/err_templates/tokenizer_3.tpl.php
rename to lib/Haanga/tests/tmp/err_templates/tokenizer_3.tpl.php
diff --git a/Haanga/tests/tmp/err_templates/tokenizer_4.tpl.php b/lib/Haanga/tests/tmp/err_templates/tokenizer_4.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/err_templates/tokenizer_4.tpl.php
rename to lib/Haanga/tests/tmp/err_templates/tokenizer_4.tpl.php
diff --git a/Haanga/tests/tmp/err_templates/tokenizer_5.tpl.php b/lib/Haanga/tests/tmp/err_templates/tokenizer_5.tpl.php
similarity index 100%
rename from Haanga/tests/tmp/err_templates/tokenizer_5.tpl.php
rename to lib/Haanga/tests/tmp/err_templates/tokenizer_5.tpl.php
diff --git a/arc2/.gitignore b/lib/arc2/.gitignore
similarity index 100%
rename from arc2/.gitignore
rename to lib/arc2/.gitignore
diff --git a/arc2/ARC2.php b/lib/arc2/ARC2.php
similarity index 100%
rename from arc2/ARC2.php
rename to lib/arc2/ARC2.php
diff --git a/arc2/ARC2_Class.php b/lib/arc2/ARC2_Class.php
similarity index 100%
rename from arc2/ARC2_Class.php
rename to lib/arc2/ARC2_Class.php
diff --git a/arc2/ARC2_Reader.php b/lib/arc2/ARC2_Reader.php
similarity index 100%
rename from arc2/ARC2_Reader.php
rename to lib/arc2/ARC2_Reader.php
diff --git a/arc2/ARC2_Resource.php b/lib/arc2/ARC2_Resource.php
similarity index 100%
rename from arc2/ARC2_Resource.php
rename to lib/arc2/ARC2_Resource.php
diff --git a/arc2/ARC2_TestHandler.php b/lib/arc2/ARC2_TestHandler.php
similarity index 100%
rename from arc2/ARC2_TestHandler.php
rename to lib/arc2/ARC2_TestHandler.php
diff --git a/arc2/ARC2_getFormat.php b/lib/arc2/ARC2_getFormat.php
similarity index 100%
rename from arc2/ARC2_getFormat.php
rename to lib/arc2/ARC2_getFormat.php
diff --git a/arc2/ARC2_getPreferredFormat.php b/lib/arc2/ARC2_getPreferredFormat.php
similarity index 100%
rename from arc2/ARC2_getPreferredFormat.php
rename to lib/arc2/ARC2_getPreferredFormat.php
diff --git a/arc2/extractors/ARC2_DcExtractor.php b/lib/arc2/extractors/ARC2_DcExtractor.php
similarity index 100%
rename from arc2/extractors/ARC2_DcExtractor.php
rename to lib/arc2/extractors/ARC2_DcExtractor.php
diff --git a/arc2/extractors/ARC2_ErdfExtractor.php b/lib/arc2/extractors/ARC2_ErdfExtractor.php
similarity index 100%
rename from arc2/extractors/ARC2_ErdfExtractor.php
rename to lib/arc2/extractors/ARC2_ErdfExtractor.php
diff --git a/arc2/extractors/ARC2_MicroformatsExtractor.php b/lib/arc2/extractors/ARC2_MicroformatsExtractor.php
similarity index 100%
rename from arc2/extractors/ARC2_MicroformatsExtractor.php
rename to lib/arc2/extractors/ARC2_MicroformatsExtractor.php
diff --git a/arc2/extractors/ARC2_OpenidExtractor.php b/lib/arc2/extractors/ARC2_OpenidExtractor.php
similarity index 100%
rename from arc2/extractors/ARC2_OpenidExtractor.php
rename to lib/arc2/extractors/ARC2_OpenidExtractor.php
diff --git a/arc2/extractors/ARC2_PoshRdfExtractor.php b/lib/arc2/extractors/ARC2_PoshRdfExtractor.php
similarity index 100%
rename from arc2/extractors/ARC2_PoshRdfExtractor.php
rename to lib/arc2/extractors/ARC2_PoshRdfExtractor.php
diff --git a/arc2/extractors/ARC2_RDFExtractor.php b/lib/arc2/extractors/ARC2_RDFExtractor.php
similarity index 100%
rename from arc2/extractors/ARC2_RDFExtractor.php
rename to lib/arc2/extractors/ARC2_RDFExtractor.php
diff --git a/arc2/extractors/ARC2_RdfaExtractor.php b/lib/arc2/extractors/ARC2_RdfaExtractor.php
similarity index 100%
rename from arc2/extractors/ARC2_RdfaExtractor.php
rename to lib/arc2/extractors/ARC2_RdfaExtractor.php
diff --git a/arc2/extractors/ARC2_TwitterProfilePicExtractor.php b/lib/arc2/extractors/ARC2_TwitterProfilePicExtractor.php
similarity index 100%
rename from arc2/extractors/ARC2_TwitterProfilePicExtractor.php
rename to lib/arc2/extractors/ARC2_TwitterProfilePicExtractor.php
diff --git a/arc2/parsers/ARC2_AtomParser.php b/lib/arc2/parsers/ARC2_AtomParser.php
similarity index 100%
rename from arc2/parsers/ARC2_AtomParser.php
rename to lib/arc2/parsers/ARC2_AtomParser.php
diff --git a/arc2/parsers/ARC2_CBJSONParser.php b/lib/arc2/parsers/ARC2_CBJSONParser.php
similarity index 100%
rename from arc2/parsers/ARC2_CBJSONParser.php
rename to lib/arc2/parsers/ARC2_CBJSONParser.php
diff --git a/arc2/parsers/ARC2_JSONParser.php b/lib/arc2/parsers/ARC2_JSONParser.php
similarity index 100%
rename from arc2/parsers/ARC2_JSONParser.php
rename to lib/arc2/parsers/ARC2_JSONParser.php
diff --git a/arc2/parsers/ARC2_LegacyXMLParser.php b/lib/arc2/parsers/ARC2_LegacyXMLParser.php
similarity index 100%
rename from arc2/parsers/ARC2_LegacyXMLParser.php
rename to lib/arc2/parsers/ARC2_LegacyXMLParser.php
diff --git a/arc2/parsers/ARC2_RDFParser.php b/lib/arc2/parsers/ARC2_RDFParser.php
similarity index 100%
rename from arc2/parsers/ARC2_RDFParser.php
rename to lib/arc2/parsers/ARC2_RDFParser.php
diff --git a/arc2/parsers/ARC2_RDFXMLParser.php b/lib/arc2/parsers/ARC2_RDFXMLParser.php
similarity index 100%
rename from arc2/parsers/ARC2_RDFXMLParser.php
rename to lib/arc2/parsers/ARC2_RDFXMLParser.php
diff --git a/arc2/parsers/ARC2_RSSParser.php b/lib/arc2/parsers/ARC2_RSSParser.php
similarity index 100%
rename from arc2/parsers/ARC2_RSSParser.php
rename to lib/arc2/parsers/ARC2_RSSParser.php
diff --git a/arc2/parsers/ARC2_SGAJSONParser.php b/lib/arc2/parsers/ARC2_SGAJSONParser.php
similarity index 100%
rename from arc2/parsers/ARC2_SGAJSONParser.php
rename to lib/arc2/parsers/ARC2_SGAJSONParser.php
diff --git a/arc2/parsers/ARC2_SPARQLParser.php b/lib/arc2/parsers/ARC2_SPARQLParser.php
similarity index 100%
rename from arc2/parsers/ARC2_SPARQLParser.php
rename to lib/arc2/parsers/ARC2_SPARQLParser.php
diff --git a/arc2/parsers/ARC2_SPARQLPlusParser.php b/lib/arc2/parsers/ARC2_SPARQLPlusParser.php
similarity index 100%
rename from arc2/parsers/ARC2_SPARQLPlusParser.php
rename to lib/arc2/parsers/ARC2_SPARQLPlusParser.php
diff --git a/arc2/parsers/ARC2_SPARQLXMLResultParser.php b/lib/arc2/parsers/ARC2_SPARQLXMLResultParser.php
similarity index 100%
rename from arc2/parsers/ARC2_SPARQLXMLResultParser.php
rename to lib/arc2/parsers/ARC2_SPARQLXMLResultParser.php
diff --git a/arc2/parsers/ARC2_SPOGParser.php b/lib/arc2/parsers/ARC2_SPOGParser.php
similarity index 100%
rename from arc2/parsers/ARC2_SPOGParser.php
rename to lib/arc2/parsers/ARC2_SPOGParser.php
diff --git a/arc2/parsers/ARC2_SemHTMLParser.php b/lib/arc2/parsers/ARC2_SemHTMLParser.php
similarity index 100%
rename from arc2/parsers/ARC2_SemHTMLParser.php
rename to lib/arc2/parsers/ARC2_SemHTMLParser.php
diff --git a/arc2/parsers/ARC2_TurtleParser.php b/lib/arc2/parsers/ARC2_TurtleParser.php
similarity index 100%
rename from arc2/parsers/ARC2_TurtleParser.php
rename to lib/arc2/parsers/ARC2_TurtleParser.php
diff --git a/arc2/serializers/ARC2_LegacyHTMLSerializer.php b/lib/arc2/serializers/ARC2_LegacyHTMLSerializer.php
similarity index 100%
rename from arc2/serializers/ARC2_LegacyHTMLSerializer.php
rename to lib/arc2/serializers/ARC2_LegacyHTMLSerializer.php
diff --git a/arc2/serializers/ARC2_LegacyJSONSerializer.php b/lib/arc2/serializers/ARC2_LegacyJSONSerializer.php
similarity index 100%
rename from arc2/serializers/ARC2_LegacyJSONSerializer.php
rename to lib/arc2/serializers/ARC2_LegacyJSONSerializer.php
diff --git a/arc2/serializers/ARC2_LegacyXMLSerializer.php b/lib/arc2/serializers/ARC2_LegacyXMLSerializer.php
similarity index 100%
rename from arc2/serializers/ARC2_LegacyXMLSerializer.php
rename to lib/arc2/serializers/ARC2_LegacyXMLSerializer.php
diff --git a/arc2/serializers/ARC2_MicroRDFSerializer.php b/lib/arc2/serializers/ARC2_MicroRDFSerializer.php
similarity index 100%
rename from arc2/serializers/ARC2_MicroRDFSerializer.php
rename to lib/arc2/serializers/ARC2_MicroRDFSerializer.php
diff --git a/arc2/serializers/ARC2_NTriplesSerializer.php b/lib/arc2/serializers/ARC2_NTriplesSerializer.php
similarity index 100%
rename from arc2/serializers/ARC2_NTriplesSerializer.php
rename to lib/arc2/serializers/ARC2_NTriplesSerializer.php
diff --git a/arc2/serializers/ARC2_POSHRDFSerializer.php b/lib/arc2/serializers/ARC2_POSHRDFSerializer.php
similarity index 100%
rename from arc2/serializers/ARC2_POSHRDFSerializer.php
rename to lib/arc2/serializers/ARC2_POSHRDFSerializer.php
diff --git a/arc2/serializers/ARC2_RDFJSONSerializer.php b/lib/arc2/serializers/ARC2_RDFJSONSerializer.php
similarity index 100%
rename from arc2/serializers/ARC2_RDFJSONSerializer.php
rename to lib/arc2/serializers/ARC2_RDFJSONSerializer.php
diff --git a/arc2/serializers/ARC2_RDFSerializer.php b/lib/arc2/serializers/ARC2_RDFSerializer.php
similarity index 100%
rename from arc2/serializers/ARC2_RDFSerializer.php
rename to lib/arc2/serializers/ARC2_RDFSerializer.php
diff --git a/arc2/serializers/ARC2_RDFXMLSerializer.php b/lib/arc2/serializers/ARC2_RDFXMLSerializer.php
similarity index 100%
rename from arc2/serializers/ARC2_RDFXMLSerializer.php
rename to lib/arc2/serializers/ARC2_RDFXMLSerializer.php
diff --git a/arc2/serializers/ARC2_RSS10Serializer.php b/lib/arc2/serializers/ARC2_RSS10Serializer.php
similarity index 100%
rename from arc2/serializers/ARC2_RSS10Serializer.php
rename to lib/arc2/serializers/ARC2_RSS10Serializer.php
diff --git a/arc2/serializers/ARC2_TurtleSerializer.php b/lib/arc2/serializers/ARC2_TurtleSerializer.php
similarity index 100%
rename from arc2/serializers/ARC2_TurtleSerializer.php
rename to lib/arc2/serializers/ARC2_TurtleSerializer.php
diff --git a/arc2/sparqlscript/ARC2_SPARQLScriptParser.php b/lib/arc2/sparqlscript/ARC2_SPARQLScriptParser.php
similarity index 100%
rename from arc2/sparqlscript/ARC2_SPARQLScriptParser.php
rename to lib/arc2/sparqlscript/ARC2_SPARQLScriptParser.php
diff --git a/arc2/sparqlscript/ARC2_SPARQLScriptProcessor.php b/lib/arc2/sparqlscript/ARC2_SPARQLScriptProcessor.php
similarity index 100%
rename from arc2/sparqlscript/ARC2_SPARQLScriptProcessor.php
rename to lib/arc2/sparqlscript/ARC2_SPARQLScriptProcessor.php
diff --git a/arc2/store/ARC2_MemStore.php b/lib/arc2/store/ARC2_MemStore.php
similarity index 100%
rename from arc2/store/ARC2_MemStore.php
rename to lib/arc2/store/ARC2_MemStore.php
diff --git a/arc2/store/ARC2_RemoteStore.php b/lib/arc2/store/ARC2_RemoteStore.php
similarity index 100%
rename from arc2/store/ARC2_RemoteStore.php
rename to lib/arc2/store/ARC2_RemoteStore.php
diff --git a/arc2/store/ARC2_Store.php b/lib/arc2/store/ARC2_Store.php
similarity index 100%
rename from arc2/store/ARC2_Store.php
rename to lib/arc2/store/ARC2_Store.php
diff --git a/arc2/store/ARC2_StoreAskQueryHandler.php b/lib/arc2/store/ARC2_StoreAskQueryHandler.php
similarity index 100%
rename from arc2/store/ARC2_StoreAskQueryHandler.php
rename to lib/arc2/store/ARC2_StoreAskQueryHandler.php
diff --git a/arc2/store/ARC2_StoreAtomLoader.php b/lib/arc2/store/ARC2_StoreAtomLoader.php
similarity index 100%
rename from arc2/store/ARC2_StoreAtomLoader.php
rename to lib/arc2/store/ARC2_StoreAtomLoader.php
diff --git a/arc2/store/ARC2_StoreCBJSONLoader.php b/lib/arc2/store/ARC2_StoreCBJSONLoader.php
similarity index 100%
rename from arc2/store/ARC2_StoreCBJSONLoader.php
rename to lib/arc2/store/ARC2_StoreCBJSONLoader.php
diff --git a/arc2/store/ARC2_StoreConstructQueryHandler.php b/lib/arc2/store/ARC2_StoreConstructQueryHandler.php
similarity index 100%
rename from arc2/store/ARC2_StoreConstructQueryHandler.php
rename to lib/arc2/store/ARC2_StoreConstructQueryHandler.php
diff --git a/arc2/store/ARC2_StoreDeleteQueryHandler.php b/lib/arc2/store/ARC2_StoreDeleteQueryHandler.php
similarity index 100%
rename from arc2/store/ARC2_StoreDeleteQueryHandler.php
rename to lib/arc2/store/ARC2_StoreDeleteQueryHandler.php
diff --git a/arc2/store/ARC2_StoreDescribeQueryHandler.php b/lib/arc2/store/ARC2_StoreDescribeQueryHandler.php
similarity index 100%
rename from arc2/store/ARC2_StoreDescribeQueryHandler.php
rename to lib/arc2/store/ARC2_StoreDescribeQueryHandler.php
diff --git a/arc2/store/ARC2_StoreDumpQueryHandler.php b/lib/arc2/store/ARC2_StoreDumpQueryHandler.php
similarity index 100%
rename from arc2/store/ARC2_StoreDumpQueryHandler.php
rename to lib/arc2/store/ARC2_StoreDumpQueryHandler.php
diff --git a/arc2/store/ARC2_StoreDumper.php b/lib/arc2/store/ARC2_StoreDumper.php
similarity index 100%
rename from arc2/store/ARC2_StoreDumper.php
rename to lib/arc2/store/ARC2_StoreDumper.php
diff --git a/arc2/store/ARC2_StoreEndpoint.php b/lib/arc2/store/ARC2_StoreEndpoint.php
similarity index 100%
rename from arc2/store/ARC2_StoreEndpoint.php
rename to lib/arc2/store/ARC2_StoreEndpoint.php
diff --git a/arc2/store/ARC2_StoreHelper.php b/lib/arc2/store/ARC2_StoreHelper.php
similarity index 100%
rename from arc2/store/ARC2_StoreHelper.php
rename to lib/arc2/store/ARC2_StoreHelper.php
diff --git a/arc2/store/ARC2_StoreInsertQueryHandler.php b/lib/arc2/store/ARC2_StoreInsertQueryHandler.php
similarity index 100%
rename from arc2/store/ARC2_StoreInsertQueryHandler.php
rename to lib/arc2/store/ARC2_StoreInsertQueryHandler.php
diff --git a/arc2/store/ARC2_StoreLoadQueryHandler.php b/lib/arc2/store/ARC2_StoreLoadQueryHandler.php
similarity index 100%
rename from arc2/store/ARC2_StoreLoadQueryHandler.php
rename to lib/arc2/store/ARC2_StoreLoadQueryHandler.php
diff --git a/arc2/store/ARC2_StoreQueryHandler.php b/lib/arc2/store/ARC2_StoreQueryHandler.php
similarity index 100%
rename from arc2/store/ARC2_StoreQueryHandler.php
rename to lib/arc2/store/ARC2_StoreQueryHandler.php
diff --git a/arc2/store/ARC2_StoreRDFXMLLoader.php b/lib/arc2/store/ARC2_StoreRDFXMLLoader.php
similarity index 100%
rename from arc2/store/ARC2_StoreRDFXMLLoader.php
rename to lib/arc2/store/ARC2_StoreRDFXMLLoader.php
diff --git a/arc2/store/ARC2_StoreRSSLoader.php b/lib/arc2/store/ARC2_StoreRSSLoader.php
similarity index 100%
rename from arc2/store/ARC2_StoreRSSLoader.php
rename to lib/arc2/store/ARC2_StoreRSSLoader.php
diff --git a/arc2/store/ARC2_StoreSGAJSONLoader.php b/lib/arc2/store/ARC2_StoreSGAJSONLoader.php
similarity index 100%
rename from arc2/store/ARC2_StoreSGAJSONLoader.php
rename to lib/arc2/store/ARC2_StoreSGAJSONLoader.php
diff --git a/arc2/store/ARC2_StoreSPOGLoader.php b/lib/arc2/store/ARC2_StoreSPOGLoader.php
similarity index 100%
rename from arc2/store/ARC2_StoreSPOGLoader.php
rename to lib/arc2/store/ARC2_StoreSPOGLoader.php
diff --git a/arc2/store/ARC2_StoreSelectQueryHandler.php b/lib/arc2/store/ARC2_StoreSelectQueryHandler.php
similarity index 100%
rename from arc2/store/ARC2_StoreSelectQueryHandler.php
rename to lib/arc2/store/ARC2_StoreSelectQueryHandler.php
diff --git a/arc2/store/ARC2_StoreSemHTMLLoader.php b/lib/arc2/store/ARC2_StoreSemHTMLLoader.php
similarity index 100%
rename from arc2/store/ARC2_StoreSemHTMLLoader.php
rename to lib/arc2/store/ARC2_StoreSemHTMLLoader.php
diff --git a/arc2/store/ARC2_StoreTableManager.php b/lib/arc2/store/ARC2_StoreTableManager.php
similarity index 100%
rename from arc2/store/ARC2_StoreTableManager.php
rename to lib/arc2/store/ARC2_StoreTableManager.php
diff --git a/arc2/store/ARC2_StoreTurtleLoader.php b/lib/arc2/store/ARC2_StoreTurtleLoader.php
similarity index 100%
rename from arc2/store/ARC2_StoreTurtleLoader.php
rename to lib/arc2/store/ARC2_StoreTurtleLoader.php
diff --git a/models/default.model b/models/default.model
deleted file mode 100644
index 75780220a36d7eef87e8db8f84455112ce8e7364..0000000000000000000000000000000000000000
--- a/models/default.model
+++ /dev/null
@@ -1,9 +0,0 @@
-SELECT ?s1 ?p1 ?s2 ?p2 WHERE {
-	{
-		%u ?s1 ?p1
-	}UNION{
-		?s2 ?p2 %u
-	}
-}
-
-
diff --git a/models/default.model.php b/models/default.model.php
deleted file mode 100644
index 8149532ed59a4f36117ff0646b11f67c160aa245..0000000000000000000000000000000000000000
--- a/models/default.model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?
-$resource['params']['query'] = <<<QUERYSTRING
-SELECT ?s1 ?p1 ?s2 ?p2 WHERE {
-	{
-		%u ?s1 ?p1
-	}UNION{
-		?s2 ?p2 %u
-	}
-}
-QUERYSTRING;
-
-?>
-
-
diff --git a/models/foaf:Person.model b/models/foaf:Person.model
deleted file mode 100644
index 999c685ad9ac31322b2ce3539919d86acaf5ebd3..0000000000000000000000000000000000000000
--- a/models/foaf:Person.model
+++ /dev/null
@@ -1,10 +0,0 @@
-PREFIX foaf: <http://xmlns.com/foaf/0.1/> 
-SELECT ?name ?firstName ?lastName WHERE {
-	{
-	%u foaf:name ?name ;
-	   foaf:firstName ?firstName;
-	   foaf:lastName ?lastName .
-	}
-}
-
-
diff --git a/models/foaf:Person.model.php b/models/foaf:Person.model.php
deleted file mode 100644
index 2619a79cdbf702c9c7cad93200625c926f5798b4..0000000000000000000000000000000000000000
--- a/models/foaf:Person.model.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?
-$resource['params']['query'] = <<<QUERYSTRING
-SELECT * WHERE {
-	{
-		%u ?s ?p
-	}
-}
-QUERYSTRING;
-
-?>
-
-
diff --git a/views/default.view.html b/views/default.view.html
deleted file mode 100644
index 7e0bf8203d77a02b93690ddc8a88cf87da784a18..0000000000000000000000000000000000000000
--- a/views/default.view.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.0//EN"
-    "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd">
-    <html {% for i, ns in base.ns %}xmlns:{{i}}="{{ns}}" 
-    {%endfor%}version="XHTML+RDFa 1.0" xml:lang="en">
-    <head>
-    <title>Page about {{base.this}}</title>
-    <link href="{{base.baseUrl}}css/basic.css" rel="stylesheet" type="text/css" media="screen" />
-  </head>
-  <body>
-    <h1>Page about <a href='{{base.value.this}}'>{{base.curie.this}}</a></h1>
-
-  <div style="text-align: center">
-    <h2>Information from {{base.curie.this}}</h2>
-    <table about="{{base.value.this}}"> 
-    {% for row in r %}
-      {% if row.value.s1 != null %}
-      <tr>
-        <td><a href='{{row.value.s1}}'>{{row.curie.s1}}</a></td>
-        {% if row.uri.p1 == 1 %}
-        <td><a rel='{{row.curie.s1}}' href='{{row.value.p1}}'>{{row.curie.p1}}</a></td>
-        {% else %}
-        <td><span property='{{row.curie.s1}}'>{{row.value.p1}}</span></td>
-        {% endif %}
-        </tr>
-      {% endif %}
-    {% endfor %}
-    </table>
-    <br/><br/>
-    <h2>Information pointing to {{base.curie.this}}</h2>
-    <table about="{{base.value.this}}"> 
-    {% for row in r %}
-      {% if row.value.s2 != null %}
-    <tr>
-        <td><a rev='{{row.curie.p2}}' href='{{row.value.s2}}'>{{row.curie.s2}}</a></td>
-        <td><a href='{{row.value.p2}}'>{{row.curie.p2}}</a></td>
-    </tr>
-    {%endif %}
-    {% endfor %}
-    </table>
-    </div>
-  </body>
-</html>
-
diff --git a/views/foaf:Person.view.html b/views/foaf:Person.view.html
deleted file mode 100644
index 15f036aaa74fbbebc55cafc7515ac46aab3cdde7..0000000000000000000000000000000000000000
--- a/views/foaf:Person.view.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<html>
-  <head>
-    <title>{{uri}}</title>
-  </head>
-  <body>
-    This document is about <a href='{{uri}}'>{{uri}}</a> which name is
-    {% for row in r %}
-      {{row.name}}
-    {% endfor %}
-  </body>
-</html>
-
-