diff --git a/content/docs/0.9.9/site/SQLPP.html b/content/docs/0.9.9/SQLPP.html
similarity index 100%
rename from content/docs/0.9.9/site/SQLPP.html
rename to content/docs/0.9.9/SQLPP.html
diff --git a/content/docs/0.9.9/site/api.html b/content/docs/0.9.9/api.html
similarity index 100%
rename from content/docs/0.9.9/site/api.html
rename to content/docs/0.9.9/api.html
diff --git a/content/docs/0.9.9/site/aql/externaldata.html b/content/docs/0.9.9/aql/externaldata.html
similarity index 100%
rename from content/docs/0.9.9/site/aql/externaldata.html
rename to content/docs/0.9.9/aql/externaldata.html
diff --git a/content/docs/0.9.9/site/aql/js-sdk.html b/content/docs/0.9.9/aql/js-sdk.html
similarity index 100%
rename from content/docs/0.9.9/site/aql/js-sdk.html
rename to content/docs/0.9.9/aql/js-sdk.html
diff --git a/content/docs/0.9.9/site/aql/manual.html b/content/docs/0.9.9/aql/manual.html
similarity index 100%
rename from content/docs/0.9.9/site/aql/manual.html
rename to content/docs/0.9.9/aql/manual.html
diff --git a/content/docs/0.9.9/site/aql/primer.html b/content/docs/0.9.9/aql/primer.html
similarity index 100%
rename from content/docs/0.9.9/site/aql/primer.html
rename to content/docs/0.9.9/aql/primer.html
diff --git a/content/docs/0.9.9/site/css/apache-maven-fluido-1.7.min.css b/content/docs/0.9.9/css/apache-maven-fluido-1.7.min.css
similarity index 100%
rename from content/docs/0.9.9/site/css/apache-maven-fluido-1.7.min.css
rename to content/docs/0.9.9/css/apache-maven-fluido-1.7.min.css
diff --git a/content/docs/0.9.9/site/css/print.css b/content/docs/0.9.9/css/print.css
similarity index 100%
rename from content/docs/0.9.9/site/css/print.css
rename to content/docs/0.9.9/css/print.css
diff --git a/content/docs/0.9.9/site/css/site.css b/content/docs/0.9.9/css/site.css
similarity index 100%
rename from content/docs/0.9.9/site/css/site.css
rename to content/docs/0.9.9/css/site.css
diff --git a/content/docs/0.9.9/site/csv.html b/content/docs/0.9.9/csv.html
similarity index 100%
rename from content/docs/0.9.9/site/csv.html
rename to content/docs/0.9.9/csv.html
diff --git a/content/docs/0.9.9/site/dashboard.html b/content/docs/0.9.9/dashboard.html
similarity index 100%
rename from content/docs/0.9.9/site/dashboard.html
rename to content/docs/0.9.9/dashboard.html
diff --git a/content/docs/0.9.9/site/data/SJ.sqlpp b/content/docs/0.9.9/data/SJ.sqlpp
similarity index 100%
rename from content/docs/0.9.9/site/data/SJ.sqlpp
rename to content/docs/0.9.9/data/SJ.sqlpp
diff --git a/content/docs/0.9.9/site/data/chm.adm b/content/docs/0.9.9/data/chm.adm
similarity index 100%
rename from content/docs/0.9.9/site/data/chm.adm
rename to content/docs/0.9.9/data/chm.adm
diff --git a/content/docs/0.9.9/site/data/chu.adm b/content/docs/0.9.9/data/chu.adm
similarity index 100%
rename from content/docs/0.9.9/site/data/chu.adm
rename to content/docs/0.9.9/data/chu.adm
diff --git a/content/docs/0.9.9/site/data/fbm.adm b/content/docs/0.9.9/data/fbm.adm
similarity index 100%
rename from content/docs/0.9.9/site/data/fbm.adm
rename to content/docs/0.9.9/data/fbm.adm
diff --git a/content/docs/0.9.9/site/data/fbu.adm b/content/docs/0.9.9/data/fbu.adm
similarity index 100%
rename from content/docs/0.9.9/site/data/fbu.adm
rename to content/docs/0.9.9/data/fbu.adm
diff --git a/content/docs/0.9.9/site/data/gbm.adm b/content/docs/0.9.9/data/gbm.adm
similarity index 100%
rename from content/docs/0.9.9/site/data/gbm.adm
rename to content/docs/0.9.9/data/gbm.adm
diff --git a/content/docs/0.9.9/site/data/gbu.adm b/content/docs/0.9.9/data/gbu.adm
similarity index 100%
rename from content/docs/0.9.9/site/data/gbu.adm
rename to content/docs/0.9.9/data/gbu.adm
diff --git a/content/docs/0.9.9/site/data/lineitem.tbl b/content/docs/0.9.9/data/lineitem.tbl
similarity index 100%
rename from content/docs/0.9.9/site/data/lineitem.tbl
rename to content/docs/0.9.9/data/lineitem.tbl
diff --git a/content/docs/0.9.9/site/data/twm.adm b/content/docs/0.9.9/data/twm.adm
similarity index 100%
rename from content/docs/0.9.9/site/data/twm.adm
rename to content/docs/0.9.9/data/twm.adm
diff --git a/content/docs/0.9.9/site/data/twu.adm b/content/docs/0.9.9/data/twu.adm
similarity index 100%
rename from content/docs/0.9.9/site/data/twu.adm
rename to content/docs/0.9.9/data/twu.adm
diff --git a/content/docs/0.9.9/site/fonts/glyphicons-halflings-regular.eot b/content/docs/0.9.9/fonts/glyphicons-halflings-regular.eot
similarity index 100%
rename from content/docs/0.9.9/site/fonts/glyphicons-halflings-regular.eot
rename to content/docs/0.9.9/fonts/glyphicons-halflings-regular.eot
Binary files differ
diff --git a/content/docs/0.9.9/site/fonts/glyphicons-halflings-regular.svg b/content/docs/0.9.9/fonts/glyphicons-halflings-regular.svg
similarity index 100%
rename from content/docs/0.9.9/site/fonts/glyphicons-halflings-regular.svg
rename to content/docs/0.9.9/fonts/glyphicons-halflings-regular.svg
diff --git a/content/docs/0.9.9/site/fonts/glyphicons-halflings-regular.ttf b/content/docs/0.9.9/fonts/glyphicons-halflings-regular.ttf
similarity index 100%
rename from content/docs/0.9.9/site/fonts/glyphicons-halflings-regular.ttf
rename to content/docs/0.9.9/fonts/glyphicons-halflings-regular.ttf
Binary files differ
diff --git a/content/docs/0.9.9/site/fonts/glyphicons-halflings-regular.woff b/content/docs/0.9.9/fonts/glyphicons-halflings-regular.woff
similarity index 100%
rename from content/docs/0.9.9/site/fonts/glyphicons-halflings-regular.woff
rename to content/docs/0.9.9/fonts/glyphicons-halflings-regular.woff
Binary files differ
diff --git a/content/docs/0.9.9/site/geo/functions.html b/content/docs/0.9.9/geo/functions.html
similarity index 100%
rename from content/docs/0.9.9/site/geo/functions.html
rename to content/docs/0.9.9/geo/functions.html
diff --git a/content/docs/0.9.9/site/geo/quickstart.html b/content/docs/0.9.9/geo/quickstart.html
similarity index 100%
rename from content/docs/0.9.9/site/geo/quickstart.html
rename to content/docs/0.9.9/geo/quickstart.html
diff --git a/content/docs/0.9.9/site/images/AsterixCluster.png b/content/docs/0.9.9/images/AsterixCluster.png
similarity index 100%
rename from content/docs/0.9.9/site/images/AsterixCluster.png
rename to content/docs/0.9.9/images/AsterixCluster.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/accessories-text-editor.png b/content/docs/0.9.9/images/accessories-text-editor.png
similarity index 100%
rename from content/docs/0.9.9/site/images/accessories-text-editor.png
rename to content/docs/0.9.9/images/accessories-text-editor.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/add.gif b/content/docs/0.9.9/images/add.gif
similarity index 100%
rename from content/docs/0.9.9/site/images/add.gif
rename to content/docs/0.9.9/images/add.gif
Binary files differ
diff --git a/content/docs/0.9.9/site/images/apache-maven-project-2.png b/content/docs/0.9.9/images/apache-maven-project-2.png
similarity index 100%
rename from content/docs/0.9.9/site/images/apache-maven-project-2.png
rename to content/docs/0.9.9/images/apache-maven-project-2.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/application-certificate.png b/content/docs/0.9.9/images/application-certificate.png
similarity index 100%
rename from content/docs/0.9.9/site/images/application-certificate.png
rename to content/docs/0.9.9/images/application-certificate.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/asf_logo_wide.png b/content/docs/0.9.9/images/asf_logo_wide.png
similarity index 100%
rename from content/docs/0.9.9/site/images/asf_logo_wide.png
rename to content/docs/0.9.9/images/asf_logo_wide.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/asterix_webui.png b/content/docs/0.9.9/images/asterix_webui.png
similarity index 100%
rename from content/docs/0.9.9/site/images/asterix_webui.png
rename to content/docs/0.9.9/images/asterix_webui.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/asterixdb_interface.png b/content/docs/0.9.9/images/asterixdb_interface.png
similarity index 100%
rename from content/docs/0.9.9/site/images/asterixdb_interface.png
rename to content/docs/0.9.9/images/asterixdb_interface.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/asterixlogo.png b/content/docs/0.9.9/images/asterixlogo.png
similarity index 100%
rename from content/docs/0.9.9/site/images/asterixlogo.png
rename to content/docs/0.9.9/images/asterixlogo.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/contact-new.png b/content/docs/0.9.9/images/contact-new.png
similarity index 100%
rename from content/docs/0.9.9/site/images/contact-new.png
rename to content/docs/0.9.9/images/contact-new.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/dashboard_screenshots/autocomplete.png b/content/docs/0.9.9/images/dashboard_screenshots/autocomplete.png
similarity index 100%
rename from content/docs/0.9.9/site/images/dashboard_screenshots/autocomplete.png
rename to content/docs/0.9.9/images/dashboard_screenshots/autocomplete.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/dashboard_screenshots/csv_header_sample_output.png b/content/docs/0.9.9/images/dashboard_screenshots/csv_header_sample_output.png
similarity index 100%
rename from content/docs/0.9.9/site/images/dashboard_screenshots/csv_header_sample_output.png
rename to content/docs/0.9.9/images/dashboard_screenshots/csv_header_sample_output.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/dashboard_screenshots/input_component.png b/content/docs/0.9.9/images/dashboard_screenshots/input_component.png
similarity index 100%
rename from content/docs/0.9.9/site/images/dashboard_screenshots/input_component.png
rename to content/docs/0.9.9/images/dashboard_screenshots/input_component.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/dashboard_screenshots/metadata_inspector.png b/content/docs/0.9.9/images/dashboard_screenshots/metadata_inspector.png
similarity index 100%
rename from content/docs/0.9.9/site/images/dashboard_screenshots/metadata_inspector.png
rename to content/docs/0.9.9/images/dashboard_screenshots/metadata_inspector.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/dashboard_screenshots/plan_explorer.png b/content/docs/0.9.9/images/dashboard_screenshots/plan_explorer.png
similarity index 100%
rename from content/docs/0.9.9/site/images/dashboard_screenshots/plan_explorer.png
rename to content/docs/0.9.9/images/dashboard_screenshots/plan_explorer.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/AdapterName.png b/content/docs/0.9.9/images/diagrams/AdapterName.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/AdapterName.png
rename to content/docs/0.9.9/images/diagrams/AdapterName.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/AggregateFunctionCall.png b/content/docs/0.9.9/images/diagrams/AggregateFunctionCall.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/AggregateFunctionCall.png
rename to content/docs/0.9.9/images/diagrams/AggregateFunctionCall.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/ArrayConstructor.png b/content/docs/0.9.9/images/diagrams/ArrayConstructor.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/ArrayConstructor.png
rename to content/docs/0.9.9/images/diagrams/ArrayConstructor.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/ArrayIndexElement.png b/content/docs/0.9.9/images/diagrams/ArrayIndexElement.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/ArrayIndexElement.png
rename to content/docs/0.9.9/images/diagrams/ArrayIndexElement.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/ArrayTypeDef.png b/content/docs/0.9.9/images/diagrams/ArrayTypeDef.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/ArrayTypeDef.png
rename to content/docs/0.9.9/images/diagrams/ArrayTypeDef.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/CaseExpr.png b/content/docs/0.9.9/images/diagrams/CaseExpr.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/CaseExpr.png
rename to content/docs/0.9.9/images/diagrams/CaseExpr.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/Configuration.png b/content/docs/0.9.9/images/diagrams/Configuration.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/Configuration.png
rename to content/docs/0.9.9/images/diagrams/Configuration.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/Constructor.png b/content/docs/0.9.9/images/diagrams/Constructor.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/Constructor.png
rename to content/docs/0.9.9/images/diagrams/Constructor.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/CreateDataset.png b/content/docs/0.9.9/images/diagrams/CreateDataset.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/CreateDataset.png
rename to content/docs/0.9.9/images/diagrams/CreateDataset.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/CreateDataverse.png b/content/docs/0.9.9/images/diagrams/CreateDataverse.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/CreateDataverse.png
rename to content/docs/0.9.9/images/diagrams/CreateDataverse.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/CreateExternalDataset.png b/content/docs/0.9.9/images/diagrams/CreateExternalDataset.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/CreateExternalDataset.png
rename to content/docs/0.9.9/images/diagrams/CreateExternalDataset.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/CreateFunction.png b/content/docs/0.9.9/images/diagrams/CreateFunction.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/CreateFunction.png
rename to content/docs/0.9.9/images/diagrams/CreateFunction.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/CreateIndex.png b/content/docs/0.9.9/images/diagrams/CreateIndex.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/CreateIndex.png
rename to content/docs/0.9.9/images/diagrams/CreateIndex.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/CreateInternalDataset.png b/content/docs/0.9.9/images/diagrams/CreateInternalDataset.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/CreateInternalDataset.png
rename to content/docs/0.9.9/images/diagrams/CreateInternalDataset.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/CreatePrimaryKeyIndex.png b/content/docs/0.9.9/images/diagrams/CreatePrimaryKeyIndex.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/CreatePrimaryKeyIndex.png
rename to content/docs/0.9.9/images/diagrams/CreatePrimaryKeyIndex.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/CreateSecondaryIndex.png b/content/docs/0.9.9/images/diagrams/CreateSecondaryIndex.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/CreateSecondaryIndex.png
rename to content/docs/0.9.9/images/diagrams/CreateSecondaryIndex.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/CreateStmnt.png b/content/docs/0.9.9/images/diagrams/CreateStmnt.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/CreateStmnt.png
rename to content/docs/0.9.9/images/diagrams/CreateStmnt.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/CreateSynonym.png b/content/docs/0.9.9/images/diagrams/CreateSynonym.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/CreateSynonym.png
rename to content/docs/0.9.9/images/diagrams/CreateSynonym.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/CreateType.png b/content/docs/0.9.9/images/diagrams/CreateType.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/CreateType.png
rename to content/docs/0.9.9/images/diagrams/CreateType.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/CreateView.png b/content/docs/0.9.9/images/diagrams/CreateView.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/CreateView.png
rename to content/docs/0.9.9/images/diagrams/CreateView.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/DatasetFieldDef.png b/content/docs/0.9.9/images/diagrams/DatasetFieldDef.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/DatasetFieldDef.png
rename to content/docs/0.9.9/images/diagrams/DatasetFieldDef.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/DatasetTypeDef.png b/content/docs/0.9.9/images/diagrams/DatasetTypeDef.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/DatasetTypeDef.png
rename to content/docs/0.9.9/images/diagrams/DatasetTypeDef.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/DataverseName.png b/content/docs/0.9.9/images/diagrams/DataverseName.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/DataverseName.png
rename to content/docs/0.9.9/images/diagrams/DataverseName.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/DeleteStmnt.png b/content/docs/0.9.9/images/diagrams/DeleteStmnt.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/DeleteStmnt.png
rename to content/docs/0.9.9/images/diagrams/DeleteStmnt.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/DoubleQualifiedName.png b/content/docs/0.9.9/images/diagrams/DoubleQualifiedName.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/DoubleQualifiedName.png
rename to content/docs/0.9.9/images/diagrams/DoubleQualifiedName.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/DropStmnt.png b/content/docs/0.9.9/images/diagrams/DropStmnt.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/DropStmnt.png
rename to content/docs/0.9.9/images/diagrams/DropStmnt.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/Expr.png b/content/docs/0.9.9/images/diagrams/Expr.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/Expr.png
rename to content/docs/0.9.9/images/diagrams/Expr.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/ExternalFunctionDef.png b/content/docs/0.9.9/images/diagrams/ExternalFunctionDef.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/ExternalFunctionDef.png
rename to content/docs/0.9.9/images/diagrams/ExternalFunctionDef.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/FromClause.png b/content/docs/0.9.9/images/diagrams/FromClause.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/FromClause.png
rename to content/docs/0.9.9/images/diagrams/FromClause.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/FromTerm.png b/content/docs/0.9.9/images/diagrams/FromTerm.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/FromTerm.png
rename to content/docs/0.9.9/images/diagrams/FromTerm.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/FunctionCall.png b/content/docs/0.9.9/images/diagrams/FunctionCall.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/FunctionCall.png
rename to content/docs/0.9.9/images/diagrams/FunctionCall.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/FunctionDeclaration.png b/content/docs/0.9.9/images/diagrams/FunctionDeclaration.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/FunctionDeclaration.png
rename to content/docs/0.9.9/images/diagrams/FunctionDeclaration.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/FunctionParameters.png b/content/docs/0.9.9/images/diagrams/FunctionParameters.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/FunctionParameters.png
rename to content/docs/0.9.9/images/diagrams/FunctionParameters.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/FunctionSignature.png b/content/docs/0.9.9/images/diagrams/FunctionSignature.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/FunctionSignature.png
rename to content/docs/0.9.9/images/diagrams/FunctionSignature.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/GroupAsClause.png b/content/docs/0.9.9/images/diagrams/GroupAsClause.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/GroupAsClause.png
rename to content/docs/0.9.9/images/diagrams/GroupAsClause.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/GroupByClause.png b/content/docs/0.9.9/images/diagrams/GroupByClause.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/GroupByClause.png
rename to content/docs/0.9.9/images/diagrams/GroupByClause.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/GroupingElement.png b/content/docs/0.9.9/images/diagrams/GroupingElement.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/GroupingElement.png
rename to content/docs/0.9.9/images/diagrams/GroupingElement.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/HavingClause.png b/content/docs/0.9.9/images/diagrams/HavingClause.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/HavingClause.png
rename to content/docs/0.9.9/images/diagrams/HavingClause.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/IndexField.png b/content/docs/0.9.9/images/diagrams/IndexField.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/IndexField.png
rename to content/docs/0.9.9/images/diagrams/IndexField.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/IndexType.png b/content/docs/0.9.9/images/diagrams/IndexType.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/IndexType.png
rename to content/docs/0.9.9/images/diagrams/IndexType.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/IndexedElement.png b/content/docs/0.9.9/images/diagrams/IndexedElement.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/IndexedElement.png
rename to content/docs/0.9.9/images/diagrams/IndexedElement.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/InsertStmnt.png b/content/docs/0.9.9/images/diagrams/InsertStmnt.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/InsertStmnt.png
rename to content/docs/0.9.9/images/diagrams/InsertStmnt.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/JoinStep.png b/content/docs/0.9.9/images/diagrams/JoinStep.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/JoinStep.png
rename to content/docs/0.9.9/images/diagrams/JoinStep.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/KeyValuePair.png b/content/docs/0.9.9/images/diagrams/KeyValuePair.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/KeyValuePair.png
rename to content/docs/0.9.9/images/diagrams/KeyValuePair.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/LetClause.png b/content/docs/0.9.9/images/diagrams/LetClause.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/LetClause.png
rename to content/docs/0.9.9/images/diagrams/LetClause.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/LimitClause.png b/content/docs/0.9.9/images/diagrams/LimitClause.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/LimitClause.png
rename to content/docs/0.9.9/images/diagrams/LimitClause.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/Literal.png b/content/docs/0.9.9/images/diagrams/Literal.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/Literal.png
rename to content/docs/0.9.9/images/diagrams/Literal.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/LoadStmnt.png b/content/docs/0.9.9/images/diagrams/LoadStmnt.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/LoadStmnt.png
rename to content/docs/0.9.9/images/diagrams/LoadStmnt.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/MultisetConstructor.png b/content/docs/0.9.9/images/diagrams/MultisetConstructor.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/MultisetConstructor.png
rename to content/docs/0.9.9/images/diagrams/MultisetConstructor.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/MultisetTypeDef.png b/content/docs/0.9.9/images/diagrams/MultisetTypeDef.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/MultisetTypeDef.png
rename to content/docs/0.9.9/images/diagrams/MultisetTypeDef.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/NamedExpr.png b/content/docs/0.9.9/images/diagrams/NamedExpr.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/NamedExpr.png
rename to content/docs/0.9.9/images/diagrams/NamedExpr.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/NestedField.png b/content/docs/0.9.9/images/diagrams/NestedField.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/NestedField.png
rename to content/docs/0.9.9/images/diagrams/NestedField.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/ObjectConstructor.png b/content/docs/0.9.9/images/diagrams/ObjectConstructor.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/ObjectConstructor.png
rename to content/docs/0.9.9/images/diagrams/ObjectConstructor.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/ObjectField.png b/content/docs/0.9.9/images/diagrams/ObjectField.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/ObjectField.png
rename to content/docs/0.9.9/images/diagrams/ObjectField.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/ObjectTypeDef.png b/content/docs/0.9.9/images/diagrams/ObjectTypeDef.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/ObjectTypeDef.png
rename to content/docs/0.9.9/images/diagrams/ObjectTypeDef.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/OffsetClause.png b/content/docs/0.9.9/images/diagrams/OffsetClause.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/OffsetClause.png
rename to content/docs/0.9.9/images/diagrams/OffsetClause.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/OperatorExpr.png b/content/docs/0.9.9/images/diagrams/OperatorExpr.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/OperatorExpr.png
rename to content/docs/0.9.9/images/diagrams/OperatorExpr.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/OrderbyClause.png b/content/docs/0.9.9/images/diagrams/OrderbyClause.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/OrderbyClause.png
rename to content/docs/0.9.9/images/diagrams/OrderbyClause.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/OrdinaryFunctionCall.png b/content/docs/0.9.9/images/diagrams/OrdinaryFunctionCall.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/OrdinaryFunctionCall.png
rename to content/docs/0.9.9/images/diagrams/OrdinaryFunctionCall.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/OrdinaryGroupingSet.png b/content/docs/0.9.9/images/diagrams/OrdinaryGroupingSet.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/OrdinaryGroupingSet.png
rename to content/docs/0.9.9/images/diagrams/OrdinaryGroupingSet.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/ParenthesizedArrayConstructor.png b/content/docs/0.9.9/images/diagrams/ParenthesizedArrayConstructor.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/ParenthesizedArrayConstructor.png
rename to content/docs/0.9.9/images/diagrams/ParenthesizedArrayConstructor.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/ParenthesizedExpr.png b/content/docs/0.9.9/images/diagrams/ParenthesizedExpr.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/ParenthesizedExpr.png
rename to content/docs/0.9.9/images/diagrams/ParenthesizedExpr.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/PathExpr.png b/content/docs/0.9.9/images/diagrams/PathExpr.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/PathExpr.png
rename to content/docs/0.9.9/images/diagrams/PathExpr.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/PrimaryExpr.png b/content/docs/0.9.9/images/diagrams/PrimaryExpr.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/PrimaryExpr.png
rename to content/docs/0.9.9/images/diagrams/PrimaryExpr.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/PrimaryKey.png b/content/docs/0.9.9/images/diagrams/PrimaryKey.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/PrimaryKey.png
rename to content/docs/0.9.9/images/diagrams/PrimaryKey.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/Projection.png b/content/docs/0.9.9/images/diagrams/Projection.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/Projection.png
rename to content/docs/0.9.9/images/diagrams/Projection.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/Properties.png b/content/docs/0.9.9/images/diagrams/Properties.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/Properties.png
rename to content/docs/0.9.9/images/diagrams/Properties.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/QualifiedName.png b/content/docs/0.9.9/images/diagrams/QualifiedName.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/QualifiedName.png
rename to content/docs/0.9.9/images/diagrams/QualifiedName.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/QuantifiedExpr.png b/content/docs/0.9.9/images/diagrams/QuantifiedExpr.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/QuantifiedExpr.png
rename to content/docs/0.9.9/images/diagrams/QuantifiedExpr.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/Query.png b/content/docs/0.9.9/images/diagrams/Query.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/Query.png
rename to content/docs/0.9.9/images/diagrams/Query.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/QueryBlock.png b/content/docs/0.9.9/images/diagrams/QueryBlock.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/QueryBlock.png
rename to content/docs/0.9.9/images/diagrams/QueryBlock.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/SearchedCaseExpr.png b/content/docs/0.9.9/images/diagrams/SearchedCaseExpr.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/SearchedCaseExpr.png
rename to content/docs/0.9.9/images/diagrams/SearchedCaseExpr.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/SelectClause.png b/content/docs/0.9.9/images/diagrams/SelectClause.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/SelectClause.png
rename to content/docs/0.9.9/images/diagrams/SelectClause.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/Selection.png b/content/docs/0.9.9/images/diagrams/Selection.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/Selection.png
rename to content/docs/0.9.9/images/diagrams/Selection.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/SetStmnt.png b/content/docs/0.9.9/images/diagrams/SetStmnt.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/SetStmnt.png
rename to content/docs/0.9.9/images/diagrams/SetStmnt.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/SimpleCaseExpr.png b/content/docs/0.9.9/images/diagrams/SimpleCaseExpr.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/SimpleCaseExpr.png
rename to content/docs/0.9.9/images/diagrams/SimpleCaseExpr.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/SingleStmnt.png b/content/docs/0.9.9/images/diagrams/SingleStmnt.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/SingleStmnt.png
rename to content/docs/0.9.9/images/diagrams/SingleStmnt.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/Stmnt.png b/content/docs/0.9.9/images/diagrams/Stmnt.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/Stmnt.png
rename to content/docs/0.9.9/images/diagrams/Stmnt.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/StreamGenerator.png b/content/docs/0.9.9/images/diagrams/StreamGenerator.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/StreamGenerator.png
rename to content/docs/0.9.9/images/diagrams/StreamGenerator.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/Subquery.png b/content/docs/0.9.9/images/diagrams/Subquery.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/Subquery.png
rename to content/docs/0.9.9/images/diagrams/Subquery.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/TypeExpr.png b/content/docs/0.9.9/images/diagrams/TypeExpr.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/TypeExpr.png
rename to content/docs/0.9.9/images/diagrams/TypeExpr.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/TypeReference.png b/content/docs/0.9.9/images/diagrams/TypeReference.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/TypeReference.png
rename to content/docs/0.9.9/images/diagrams/TypeReference.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/UnionOption.png b/content/docs/0.9.9/images/diagrams/UnionOption.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/UnionOption.png
rename to content/docs/0.9.9/images/diagrams/UnionOption.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/UnnestStep.png b/content/docs/0.9.9/images/diagrams/UnnestStep.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/UnnestStep.png
rename to content/docs/0.9.9/images/diagrams/UnnestStep.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/UpsertStmnt.png b/content/docs/0.9.9/images/diagrams/UpsertStmnt.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/UpsertStmnt.png
rename to content/docs/0.9.9/images/diagrams/UpsertStmnt.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/UseStmnt.png b/content/docs/0.9.9/images/diagrams/UseStmnt.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/UseStmnt.png
rename to content/docs/0.9.9/images/diagrams/UseStmnt.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/WhereClause.png b/content/docs/0.9.9/images/diagrams/WhereClause.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/WhereClause.png
rename to content/docs/0.9.9/images/diagrams/WhereClause.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/WindowDefinition.png b/content/docs/0.9.9/images/diagrams/WindowDefinition.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/WindowDefinition.png
rename to content/docs/0.9.9/images/diagrams/WindowDefinition.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/WindowFrameClause.png b/content/docs/0.9.9/images/diagrams/WindowFrameClause.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/WindowFrameClause.png
rename to content/docs/0.9.9/images/diagrams/WindowFrameClause.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/WindowFrameExclusion.png b/content/docs/0.9.9/images/diagrams/WindowFrameExclusion.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/WindowFrameExclusion.png
rename to content/docs/0.9.9/images/diagrams/WindowFrameExclusion.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/WindowFrameExtent.png b/content/docs/0.9.9/images/diagrams/WindowFrameExtent.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/WindowFrameExtent.png
rename to content/docs/0.9.9/images/diagrams/WindowFrameExtent.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/WindowFunctionArguments.png b/content/docs/0.9.9/images/diagrams/WindowFunctionArguments.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/WindowFunctionArguments.png
rename to content/docs/0.9.9/images/diagrams/WindowFunctionArguments.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/WindowFunctionCall.png b/content/docs/0.9.9/images/diagrams/WindowFunctionCall.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/WindowFunctionCall.png
rename to content/docs/0.9.9/images/diagrams/WindowFunctionCall.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/WindowFunctionOptions.png b/content/docs/0.9.9/images/diagrams/WindowFunctionOptions.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/WindowFunctionOptions.png
rename to content/docs/0.9.9/images/diagrams/WindowFunctionOptions.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/WindowFunctionType.png b/content/docs/0.9.9/images/diagrams/WindowFunctionType.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/WindowFunctionType.png
rename to content/docs/0.9.9/images/diagrams/WindowFunctionType.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/WindowOrderClause.png b/content/docs/0.9.9/images/diagrams/WindowOrderClause.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/WindowOrderClause.png
rename to content/docs/0.9.9/images/diagrams/WindowOrderClause.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/WindowPartitionClause.png b/content/docs/0.9.9/images/diagrams/WindowPartitionClause.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/WindowPartitionClause.png
rename to content/docs/0.9.9/images/diagrams/WindowPartitionClause.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/WithClause.png b/content/docs/0.9.9/images/diagrams/WithClause.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/WithClause.png
rename to content/docs/0.9.9/images/diagrams/WithClause.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/diagrams/rr-1.62.png b/content/docs/0.9.9/images/diagrams/rr-1.62.png
similarity index 100%
rename from content/docs/0.9.9/site/images/diagrams/rr-1.62.png
rename to content/docs/0.9.9/images/diagrams/rr-1.62.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/document-properties.png b/content/docs/0.9.9/images/document-properties.png
similarity index 100%
rename from content/docs/0.9.9/site/images/document-properties.png
rename to content/docs/0.9.9/images/document-properties.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/drive-harddisk.png b/content/docs/0.9.9/images/drive-harddisk.png
similarity index 100%
rename from content/docs/0.9.9/site/images/drive-harddisk.png
rename to content/docs/0.9.9/images/drive-harddisk.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/egg-logo.png b/content/docs/0.9.9/images/egg-logo.png
similarity index 100%
rename from content/docs/0.9.9/site/images/egg-logo.png
rename to content/docs/0.9.9/images/egg-logo.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/fix.gif b/content/docs/0.9.9/images/fix.gif
similarity index 100%
rename from content/docs/0.9.9/site/images/fix.gif
rename to content/docs/0.9.9/images/fix.gif
Binary files differ
diff --git a/content/docs/0.9.9/site/images/hyrax_ts.png b/content/docs/0.9.9/images/hyrax_ts.png
similarity index 100%
rename from content/docs/0.9.9/site/images/hyrax_ts.png
rename to content/docs/0.9.9/images/hyrax_ts.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/icon_error_sml.gif b/content/docs/0.9.9/images/icon_error_sml.gif
similarity index 100%
rename from content/docs/0.9.9/site/images/icon_error_sml.gif
rename to content/docs/0.9.9/images/icon_error_sml.gif
Binary files differ
diff --git a/content/docs/0.9.9/site/images/icon_help_sml.gif b/content/docs/0.9.9/images/icon_help_sml.gif
similarity index 100%
rename from content/docs/0.9.9/site/images/icon_help_sml.gif
rename to content/docs/0.9.9/images/icon_help_sml.gif
Binary files differ
diff --git a/content/docs/0.9.9/site/images/icon_info_sml.gif b/content/docs/0.9.9/images/icon_info_sml.gif
similarity index 100%
rename from content/docs/0.9.9/site/images/icon_info_sml.gif
rename to content/docs/0.9.9/images/icon_info_sml.gif
Binary files differ
diff --git a/content/docs/0.9.9/site/images/icon_success_sml.gif b/content/docs/0.9.9/images/icon_success_sml.gif
similarity index 100%
rename from content/docs/0.9.9/site/images/icon_success_sml.gif
rename to content/docs/0.9.9/images/icon_success_sml.gif
Binary files differ
diff --git a/content/docs/0.9.9/site/images/icon_warning_sml.gif b/content/docs/0.9.9/images/icon_warning_sml.gif
similarity index 100%
rename from content/docs/0.9.9/site/images/icon_warning_sml.gif
rename to content/docs/0.9.9/images/icon_warning_sml.gif
Binary files differ
diff --git a/content/docs/0.9.9/site/images/image-x-generic.png b/content/docs/0.9.9/images/image-x-generic.png
similarity index 100%
rename from content/docs/0.9.9/site/images/image-x-generic.png
rename to content/docs/0.9.9/images/image-x-generic.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/internet-web-browser.png b/content/docs/0.9.9/images/internet-web-browser.png
similarity index 100%
rename from content/docs/0.9.9/site/images/internet-web-browser.png
rename to content/docs/0.9.9/images/internet-web-browser.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/linestring.png b/content/docs/0.9.9/images/linestring.png
similarity index 100%
rename from content/docs/0.9.9/site/images/linestring.png
rename to content/docs/0.9.9/images/linestring.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/linestring.svg b/content/docs/0.9.9/images/linestring.svg
similarity index 100%
rename from content/docs/0.9.9/site/images/linestring.svg
rename to content/docs/0.9.9/images/linestring.svg
diff --git a/content/docs/0.9.9/site/images/logos/build-by-maven-black.png b/content/docs/0.9.9/images/logos/build-by-maven-black.png
similarity index 100%
rename from content/docs/0.9.9/site/images/logos/build-by-maven-black.png
rename to content/docs/0.9.9/images/logos/build-by-maven-black.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/logos/build-by-maven-white.png b/content/docs/0.9.9/images/logos/build-by-maven-white.png
similarity index 100%
rename from content/docs/0.9.9/site/images/logos/build-by-maven-white.png
rename to content/docs/0.9.9/images/logos/build-by-maven-white.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/logos/maven-feather.png b/content/docs/0.9.9/images/logos/maven-feather.png
similarity index 100%
rename from content/docs/0.9.9/site/images/logos/maven-feather.png
rename to content/docs/0.9.9/images/logos/maven-feather.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/ncservice.png b/content/docs/0.9.9/images/ncservice.png
similarity index 100%
rename from content/docs/0.9.9/site/images/ncservice.png
rename to content/docs/0.9.9/images/ncservice.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/network-server.png b/content/docs/0.9.9/images/network-server.png
similarity index 100%
rename from content/docs/0.9.9/site/images/network-server.png
rename to content/docs/0.9.9/images/network-server.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/package-x-generic.png b/content/docs/0.9.9/images/package-x-generic.png
similarity index 100%
rename from content/docs/0.9.9/site/images/package-x-generic.png
rename to content/docs/0.9.9/images/package-x-generic.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/profiles/pre-release.png b/content/docs/0.9.9/images/profiles/pre-release.png
similarity index 100%
rename from content/docs/0.9.9/site/images/profiles/pre-release.png
rename to content/docs/0.9.9/images/profiles/pre-release.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/profiles/retired.png b/content/docs/0.9.9/images/profiles/retired.png
similarity index 100%
rename from content/docs/0.9.9/site/images/profiles/retired.png
rename to content/docs/0.9.9/images/profiles/retired.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/profiles/sandbox.png b/content/docs/0.9.9/images/profiles/sandbox.png
similarity index 100%
rename from content/docs/0.9.9/site/images/profiles/sandbox.png
rename to content/docs/0.9.9/images/profiles/sandbox.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/remove.gif b/content/docs/0.9.9/images/remove.gif
similarity index 100%
rename from content/docs/0.9.9/site/images/remove.gif
rename to content/docs/0.9.9/images/remove.gif
Binary files differ
diff --git a/content/docs/0.9.9/site/images/rss.png b/content/docs/0.9.9/images/rss.png
similarity index 100%
rename from content/docs/0.9.9/site/images/rss.png
rename to content/docs/0.9.9/images/rss.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/running_inst.png b/content/docs/0.9.9/images/running_inst.png
similarity index 100%
rename from content/docs/0.9.9/site/images/running_inst.png
rename to content/docs/0.9.9/images/running_inst.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/update.gif b/content/docs/0.9.9/images/update.gif
similarity index 100%
rename from content/docs/0.9.9/site/images/update.gif
rename to content/docs/0.9.9/images/update.gif
Binary files differ
diff --git a/content/docs/0.9.9/site/images/window-new.png b/content/docs/0.9.9/images/window-new.png
similarity index 100%
rename from content/docs/0.9.9/site/images/window-new.png
rename to content/docs/0.9.9/images/window-new.png
Binary files differ
diff --git a/content/docs/0.9.9/site/images/yarn_clust.png b/content/docs/0.9.9/images/yarn_clust.png
similarity index 100%
rename from content/docs/0.9.9/site/images/yarn_clust.png
rename to content/docs/0.9.9/images/yarn_clust.png
Binary files differ
diff --git a/content/docs/0.9.9/site/img/glyphicons-halflings-white.png b/content/docs/0.9.9/img/glyphicons-halflings-white.png
similarity index 100%
rename from content/docs/0.9.9/site/img/glyphicons-halflings-white.png
rename to content/docs/0.9.9/img/glyphicons-halflings-white.png
Binary files differ
diff --git a/content/docs/0.9.9/site/img/glyphicons-halflings.png b/content/docs/0.9.9/img/glyphicons-halflings.png
similarity index 100%
rename from content/docs/0.9.9/site/img/glyphicons-halflings.png
rename to content/docs/0.9.9/img/glyphicons-halflings.png
Binary files differ
diff --git a/content/docs/0.9.9/site/index.html b/content/docs/0.9.9/index.html
similarity index 100%
rename from content/docs/0.9.9/site/index.html
rename to content/docs/0.9.9/index.html
diff --git a/content/docs/0.9.9/site/js/apache-maven-fluido-1.7.min.js b/content/docs/0.9.9/js/apache-maven-fluido-1.7.min.js
similarity index 100%
rename from content/docs/0.9.9/site/js/apache-maven-fluido-1.7.min.js
rename to content/docs/0.9.9/js/apache-maven-fluido-1.7.min.js
diff --git a/content/docs/0.9.9/site/ncservice.html b/content/docs/0.9.9/ncservice.html
similarity index 100%
rename from content/docs/0.9.9/site/ncservice.html
rename to content/docs/0.9.9/ncservice.html
diff --git a/content/docs/0.9.9/site/overview.html b/content/docs/0.9.9/overview.html
similarity index 100%
rename from content/docs/0.9.9/site/overview.html
rename to content/docs/0.9.9/overview.html
diff --git a/content/docs/0.9.9/site/sqlpp/arrayindex.html b/content/docs/0.9.9/sqlpp/arrayindex.html
similarity index 100%
rename from content/docs/0.9.9/site/sqlpp/arrayindex.html
rename to content/docs/0.9.9/sqlpp/arrayindex.html
diff --git a/content/docs/0.9.9/site/sqlpp/filters.html b/content/docs/0.9.9/sqlpp/filters.html
similarity index 100%
rename from content/docs/0.9.9/site/sqlpp/filters.html
rename to content/docs/0.9.9/sqlpp/filters.html
diff --git a/content/docs/0.9.9/site/sqlpp/fulltext.html b/content/docs/0.9.9/sqlpp/fulltext.html
similarity index 100%
rename from content/docs/0.9.9/site/sqlpp/fulltext.html
rename to content/docs/0.9.9/sqlpp/fulltext.html
diff --git a/content/docs/0.9.9/site/sqlpp/parquet.html b/content/docs/0.9.9/sqlpp/parquet.html
similarity index 100%
rename from content/docs/0.9.9/site/sqlpp/parquet.html
rename to content/docs/0.9.9/sqlpp/parquet.html
diff --git a/content/docs/0.9.9/site/sqlpp/primer-sqlpp.html b/content/docs/0.9.9/sqlpp/primer-sqlpp.html
similarity index 100%
rename from content/docs/0.9.9/site/sqlpp/primer-sqlpp.html
rename to content/docs/0.9.9/sqlpp/primer-sqlpp.html
diff --git a/content/docs/0.9.9/site/sqlpp/similarity.html b/content/docs/0.9.9/sqlpp/similarity.html
similarity index 100%
rename from content/docs/0.9.9/site/sqlpp/similarity.html
rename to content/docs/0.9.9/sqlpp/similarity.html
diff --git a/content/download.html b/content/download.html
index 3ff833b..fb80436 100644
--- a/content/download.html
+++ b/content/download.html
@@ -168,7 +168,7 @@
 
 
 <div class="col-md-6">
-    <p><a class="btn btn-md btn-success" href="http://www.apache.org/dyn/closer.lua/asterixdb/asterixdb-jdbc-0.9.9/asterix-jdbc-driver-0.9.9-dist.jar" role="button">Download AsterixDB JDBC Driver 0.9.9 <i class="fa fa-download fa-lg"></i> </a></p>
+    <p><a class="btn btn-md btn-success" href="http://www.apache.org/dyn/closer.lua/asterixdb/asterixdb-jdbc-0.9.8.2/asterix-jdbc-driver-0.9.8.2-dist.jar" role="button">Download AsterixDB JDBC Driver 0.9.9 <i class="fa fa-download fa-lg"></i> </a></p>
     <p><a class="btn btn-md btn-success" href="http://www.apache.org/dyn/closer.lua/asterixdb/asterixdb-jdbc-0.9.8.2/asterixdb_jdbc.taco" role="button">Download AsterixDB Tableau Connector 0.9.9 <i class="fa fa-download fa-lg"></i> </a></p>
   </div>