diff --git a/CHANGELOG.md b/CHANGELOG.md
index ac6d57c473467495e3d5f1ef9ba734b8820cf597..9504d23895d6d3c195a01b2c8e99ed7424508350 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,8 +14,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Removed
 
-- Removed data requests.
-- Usage of global context variable `c` where possible.
+- Completely removed data requests.
+- Avoided the usage of the global context variable c where possible.
 
 ### Changed
 
@@ -39,6 +39,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
     - Replaced `after_search` with `after_dataset_search`
     - Replaced `before_index` with `before_dataset_index`
 - Updated minimu version of ckanext-spatial extension to `2.0.0`.
+- Moved `fanstatic` webassets to `assets` directory.
 
 ## [2.2.0]
 
diff --git a/ckanext/odsh/fanstatic/.gitignore b/ckanext/odsh/assets/.gitignore
similarity index 100%
rename from ckanext/odsh/fanstatic/.gitignore
rename to ckanext/odsh/assets/.gitignore
diff --git a/ckanext/odsh/fanstatic/autocomplete.css b/ckanext/odsh/assets/autocomplete.css
similarity index 100%
rename from ckanext/odsh/fanstatic/autocomplete.css
rename to ckanext/odsh/assets/autocomplete.css
diff --git a/ckanext/odsh/fanstatic/autocomplete.js b/ckanext/odsh/assets/autocomplete.js
similarity index 100%
rename from ckanext/odsh/fanstatic/autocomplete.js
rename to ckanext/odsh/assets/autocomplete.js
diff --git a/ckanext/odsh/fanstatic/bootstrap-datepicker.js b/ckanext/odsh/assets/bootstrap-datepicker.js
similarity index 100%
rename from ckanext/odsh/fanstatic/bootstrap-datepicker.js
rename to ckanext/odsh/assets/bootstrap-datepicker.js
diff --git a/ckanext/odsh/fanstatic/bootstrap-multiselect.css b/ckanext/odsh/assets/bootstrap-multiselect.css
similarity index 100%
rename from ckanext/odsh/fanstatic/bootstrap-multiselect.css
rename to ckanext/odsh/assets/bootstrap-multiselect.css
diff --git a/ckanext/odsh/fanstatic/bootstrap-multiselect.js b/ckanext/odsh/assets/bootstrap-multiselect.js
similarity index 100%
rename from ckanext/odsh/fanstatic/bootstrap-multiselect.js
rename to ckanext/odsh/assets/bootstrap-multiselect.js
diff --git a/ckanext/odsh/fanstatic/common_map.js b/ckanext/odsh/assets/common_map.js
similarity index 100%
rename from ckanext/odsh/fanstatic/common_map.js
rename to ckanext/odsh/assets/common_map.js
diff --git a/ckanext/odsh/fanstatic/dataset_map.css b/ckanext/odsh/assets/dataset_map.css
similarity index 100%
rename from ckanext/odsh/fanstatic/dataset_map.css
rename to ckanext/odsh/assets/dataset_map.css
diff --git a/ckanext/odsh/fanstatic/datepicker.css b/ckanext/odsh/assets/datepicker.css
similarity index 100%
rename from ckanext/odsh/fanstatic/datepicker.css
rename to ckanext/odsh/assets/datepicker.css
diff --git a/ckanext/odsh/fanstatic/img/pencil.png b/ckanext/odsh/assets/img/pencil.png
similarity index 100%
rename from ckanext/odsh/fanstatic/img/pencil.png
rename to ckanext/odsh/assets/img/pencil.png
diff --git a/ckanext/odsh/fanstatic/leaflet.css b/ckanext/odsh/assets/leaflet.css
similarity index 100%
rename from ckanext/odsh/fanstatic/leaflet.css
rename to ckanext/odsh/assets/leaflet.css
diff --git a/ckanext/odsh/fanstatic/leaflet.draw.css b/ckanext/odsh/assets/leaflet.draw.css
similarity index 100%
rename from ckanext/odsh/fanstatic/leaflet.draw.css
rename to ckanext/odsh/assets/leaflet.draw.css
diff --git a/ckanext/odsh/fanstatic/moment.js b/ckanext/odsh/assets/moment.js
similarity index 100%
rename from ckanext/odsh/fanstatic/moment.js
rename to ckanext/odsh/assets/moment.js
diff --git a/ckanext/odsh/fanstatic/odsh.css b/ckanext/odsh/assets/odsh.css
similarity index 100%
rename from ckanext/odsh/fanstatic/odsh.css
rename to ckanext/odsh/assets/odsh.css
diff --git a/ckanext/odsh/fanstatic/odsh.js b/ckanext/odsh/assets/odsh.js
similarity index 100%
rename from ckanext/odsh/fanstatic/odsh.js
rename to ckanext/odsh/assets/odsh.js
diff --git a/ckanext/odsh/fanstatic/odsh_dataset_map.js b/ckanext/odsh/assets/odsh_dataset_map.js
similarity index 100%
rename from ckanext/odsh/fanstatic/odsh_dataset_map.js
rename to ckanext/odsh/assets/odsh_dataset_map.js
diff --git a/ckanext/odsh/fanstatic/odsh_datepicker.js b/ckanext/odsh/assets/odsh_datepicker.js
similarity index 100%
rename from ckanext/odsh/fanstatic/odsh_datepicker.js
rename to ckanext/odsh/assets/odsh_datepicker.js
diff --git a/ckanext/odsh/fanstatic/odsh_form.js b/ckanext/odsh/assets/odsh_form.js
similarity index 100%
rename from ckanext/odsh/fanstatic/odsh_form.js
rename to ckanext/odsh/assets/odsh_form.js
diff --git a/ckanext/odsh/fanstatic/odsh_guessformat.js b/ckanext/odsh/assets/odsh_guessformat.js
similarity index 100%
rename from ckanext/odsh/fanstatic/odsh_guessformat.js
rename to ckanext/odsh/assets/odsh_guessformat.js
diff --git a/ckanext/odsh/fanstatic/odsh_header.css b/ckanext/odsh/assets/odsh_header.css
similarity index 100%
rename from ckanext/odsh/fanstatic/odsh_header.css
rename to ckanext/odsh/assets/odsh_header.css
diff --git a/ckanext/odsh/fanstatic/odsh_image-upload.js b/ckanext/odsh/assets/odsh_image-upload.js
similarity index 100%
rename from ckanext/odsh/fanstatic/odsh_image-upload.js
rename to ckanext/odsh/assets/odsh_image-upload.js
diff --git a/ckanext/odsh/fanstatic/odsh_map.js b/ckanext/odsh/assets/odsh_map.js
similarity index 100%
rename from ckanext/odsh/fanstatic/odsh_map.js
rename to ckanext/odsh/assets/odsh_map.js
diff --git a/ckanext/odsh/fanstatic/odsh_popover.js b/ckanext/odsh/assets/odsh_popover.js
similarity index 100%
rename from ckanext/odsh/fanstatic/odsh_popover.js
rename to ckanext/odsh/assets/odsh_popover.js
diff --git a/ckanext/odsh/fanstatic/odsh_populate_tags.js b/ckanext/odsh/assets/odsh_populate_tags.js
similarity index 100%
rename from ckanext/odsh/fanstatic/odsh_populate_tags.js
rename to ckanext/odsh/assets/odsh_populate_tags.js
diff --git a/ckanext/odsh/fanstatic/odsh_spatial_query.js b/ckanext/odsh/assets/odsh_spatial_query.js
similarity index 100%
rename from ckanext/odsh/fanstatic/odsh_spatial_query.js
rename to ckanext/odsh/assets/odsh_spatial_query.js
diff --git a/ckanext/odsh/fanstatic/odsh_toggle_menu.js b/ckanext/odsh/assets/odsh_toggle_menu.js
similarity index 100%
rename from ckanext/odsh/fanstatic/odsh_toggle_menu.js
rename to ckanext/odsh/assets/odsh_toggle_menu.js
diff --git a/ckanext/odsh/fanstatic/odsh_validate_password.js b/ckanext/odsh/assets/odsh_validate_password.js
similarity index 100%
rename from ckanext/odsh/fanstatic/odsh_validate_password.js
rename to ckanext/odsh/assets/odsh_validate_password.js
diff --git a/ckanext/odsh/fanstatic/resource.config b/ckanext/odsh/assets/resource.config
similarity index 100%
rename from ckanext/odsh/fanstatic/resource.config
rename to ckanext/odsh/assets/resource.config
diff --git a/ckanext/odsh/fanstatic/spatial_query.css b/ckanext/odsh/assets/spatial_query.css
similarity index 100%
rename from ckanext/odsh/fanstatic/spatial_query.css
rename to ckanext/odsh/assets/spatial_query.css
diff --git a/ckanext/odsh/fanstatic/vendor/jquery-ui-autocomplete/AUTHORS.txt b/ckanext/odsh/assets/vendor/jquery-ui-autocomplete/AUTHORS.txt
similarity index 100%
rename from ckanext/odsh/fanstatic/vendor/jquery-ui-autocomplete/AUTHORS.txt
rename to ckanext/odsh/assets/vendor/jquery-ui-autocomplete/AUTHORS.txt
diff --git a/ckanext/odsh/fanstatic/vendor/jquery-ui-autocomplete/LICENSE.txt b/ckanext/odsh/assets/vendor/jquery-ui-autocomplete/LICENSE.txt
similarity index 100%
rename from ckanext/odsh/fanstatic/vendor/jquery-ui-autocomplete/LICENSE.txt
rename to ckanext/odsh/assets/vendor/jquery-ui-autocomplete/LICENSE.txt
diff --git a/ckanext/odsh/fanstatic/vendor/jquery-ui-autocomplete/jquery-ui.css b/ckanext/odsh/assets/vendor/jquery-ui-autocomplete/jquery-ui.css
similarity index 100%
rename from ckanext/odsh/fanstatic/vendor/jquery-ui-autocomplete/jquery-ui.css
rename to ckanext/odsh/assets/vendor/jquery-ui-autocomplete/jquery-ui.css
diff --git a/ckanext/odsh/fanstatic/vendor/jquery-ui-autocomplete/jquery-ui.js b/ckanext/odsh/assets/vendor/jquery-ui-autocomplete/jquery-ui.js
similarity index 100%
rename from ckanext/odsh/fanstatic/vendor/jquery-ui-autocomplete/jquery-ui.js
rename to ckanext/odsh/assets/vendor/jquery-ui-autocomplete/jquery-ui.js
diff --git a/ckanext/odsh/fanstatic/vendor/jquery-ui-autocomplete/jquery-ui.structure.css b/ckanext/odsh/assets/vendor/jquery-ui-autocomplete/jquery-ui.structure.css
similarity index 100%
rename from ckanext/odsh/fanstatic/vendor/jquery-ui-autocomplete/jquery-ui.structure.css
rename to ckanext/odsh/assets/vendor/jquery-ui-autocomplete/jquery-ui.structure.css
diff --git a/ckanext/odsh/fanstatic/vendor/jquery-ui-autocomplete/jquery-ui.theme.css b/ckanext/odsh/assets/vendor/jquery-ui-autocomplete/jquery-ui.theme.css
similarity index 100%
rename from ckanext/odsh/fanstatic/vendor/jquery-ui-autocomplete/jquery-ui.theme.css
rename to ckanext/odsh/assets/vendor/jquery-ui-autocomplete/jquery-ui.theme.css
diff --git a/ckanext/odsh/fanstatic/vendor/leaflet.draw.js b/ckanext/odsh/assets/vendor/leaflet.draw.js
similarity index 100%
rename from ckanext/odsh/fanstatic/vendor/leaflet.draw.js
rename to ckanext/odsh/assets/vendor/leaflet.draw.js
diff --git a/ckanext/odsh/fanstatic/vendor/leaflet.js b/ckanext/odsh/assets/vendor/leaflet.js
similarity index 100%
rename from ckanext/odsh/fanstatic/vendor/leaflet.js
rename to ckanext/odsh/assets/vendor/leaflet.js
diff --git a/ckanext/odsh/fanstatic/vendor/proj4-compressed.js b/ckanext/odsh/assets/vendor/proj4-compressed.js
similarity index 100%
rename from ckanext/odsh/fanstatic/vendor/proj4-compressed.js
rename to ckanext/odsh/assets/vendor/proj4-compressed.js
diff --git a/ckanext/odsh/fanstatic/vendor/proj4leaflet.js b/ckanext/odsh/assets/vendor/proj4leaflet.js
similarity index 100%
rename from ckanext/odsh/fanstatic/vendor/proj4leaflet.js
rename to ckanext/odsh/assets/vendor/proj4leaflet.js
diff --git a/ckanext/odsh/fanstatic/webassets.yml b/ckanext/odsh/assets/webassets.yml
similarity index 100%
rename from ckanext/odsh/fanstatic/webassets.yml
rename to ckanext/odsh/assets/webassets.yml
diff --git a/ckanext/odsh/i18n/ckanext-odsh.pot b/ckanext/odsh/i18n/ckanext-odsh.pot
index 3edf8b8f51ca79179e072378834def77ed4be1f1..c4181f152f696609fd752c798bad23df14beda3f 100644
--- a/ckanext/odsh/i18n/ckanext-odsh.pot
+++ b/ckanext/odsh/i18n/ckanext-odsh.pot
@@ -57,46 +57,46 @@ msgstr ""
 msgid "Invalid tag: \"%s\". Tags cannot contain line breaks."
 msgstr ""
 
-#: ckanext/odsh/fanstatic/moment.js:6
+#: ckanext/odsh/assets/moment.js:6
 msgid "Weeks"
 msgstr ""
 
-#: ckanext/odsh/fanstatic/odsh_image-upload.js:63
+#: ckanext/odsh/assets/odsh_image-upload.js:63
 msgid "Link"
 msgstr ""
 
-#: ckanext/odsh/fanstatic/odsh_image-upload.js:64
+#: ckanext/odsh/assets/odsh_image-upload.js:64
 msgid "Link to a URL on the internet (you can also link to an API)"
 msgstr ""
 
-#: ckanext/odsh/fanstatic/odsh_image-upload.js:71
+#: ckanext/odsh/assets/odsh_image-upload.js:71
 #: ckanext/odsh/templates/header.html:51
 msgid "Upload"
 msgstr ""
 
-#: ckanext/odsh/fanstatic/odsh_image-upload.js:75
+#: ckanext/odsh/assets/odsh_image-upload.js:75
 #: ckanext/odsh/templates/macros/form.html:357
 msgid "Remove"
 msgstr ""
 
-#: ckanext/odsh/fanstatic/odsh_image-upload.js:83
+#: ckanext/odsh/assets/odsh_image-upload.js:83
 #: ckanext/odsh/templates/macros/form.html:564
 msgid "Image"
 msgstr ""
 
-#: ckanext/odsh/fanstatic/odsh_image-upload.js:90
+#: ckanext/odsh/assets/odsh_image-upload.js:90
 msgid "Upload a file on your computer"
 msgstr ""
 
-#: ckanext/odsh/fanstatic/odsh_image-upload.js:115
-#: ckanext/odsh/fanstatic/odsh_image-upload.js:186
+#: ckanext/odsh/assets/odsh_image-upload.js:115
+#: ckanext/odsh/assets/odsh_image-upload.js:186
 #: ckanext/odsh/templates/organization/snippets/organization_form.html:19
 #: ckanext/odsh/templates/package/snippets/resource_form.html:31
 msgid "URL"
 msgstr ""
 
-#: ckanext/odsh/fanstatic/odsh_image-upload.js:125
-#: ckanext/odsh/fanstatic/odsh_image-upload.js:221
+#: ckanext/odsh/assets/odsh_image-upload.js:125
+#: ckanext/odsh/assets/odsh_image-upload.js:221
 msgid "File"
 msgstr ""
 
diff --git a/ckanext/odsh/i18n/de/LC_MESSAGES/ckanext-odsh.po b/ckanext/odsh/i18n/de/LC_MESSAGES/ckanext-odsh.po
index 26dd4becc2b40013cd50883d03e24a74c471cc25..18998a94ef81b08ba06c6d584ef3e60d7cc764d6 100644
--- a/ckanext/odsh/i18n/de/LC_MESSAGES/ckanext-odsh.po
+++ b/ckanext/odsh/i18n/de/LC_MESSAGES/ckanext-odsh.po
@@ -65,48 +65,48 @@ msgstr ""
 msgid "Invalid tag: \"%s\". Tags cannot contain line breaks."
 msgstr "Ungültiges Tag: \"%s\". Tags können keine Zeilenumbrüche enthalten."
 
-#: ckanext/odsh/fanstatic/moment.js:6
+#: ckanext/odsh/assets/moment.js:6
 msgid "Weeks"
 msgstr "Wochen"
 
-#: ckanext/odsh/fanstatic/odsh_image-upload.js:63
+#: ckanext/odsh/assets/odsh_image-upload.js:63
 msgid "Link"
 msgstr "Link"
 
-#: ckanext/odsh/fanstatic/odsh_image-upload.js:64
+#: ckanext/odsh/assets/odsh_image-upload.js:64
 msgid "Link to a URL on the internet (you can also link to an API)"
 msgstr ""
 "Link zu einer URL im Internet (Sie können auch einen Link zu einer API "
 "erstellen)"
 
-#: ckanext/odsh/fanstatic/odsh_image-upload.js:71
+#: ckanext/odsh/assets/odsh_image-upload.js:71
 #: ckanext/odsh/templates/header.html:51
 msgid "Upload"
 msgstr "Upload"
 
-#: ckanext/odsh/fanstatic/odsh_image-upload.js:75
+#: ckanext/odsh/assets/odsh_image-upload.js:75
 #: ckanext/odsh/templates/macros/form.html:357
 msgid "Remove"
 msgstr "Entfernen"
 
-#: ckanext/odsh/fanstatic/odsh_image-upload.js:83
+#: ckanext/odsh/assets/odsh_image-upload.js:83
 #: ckanext/odsh/templates/macros/form.html:564
 msgid "Image"
 msgstr "Bild"
 
-#: ckanext/odsh/fanstatic/odsh_image-upload.js:90
+#: ckanext/odsh/assets/odsh_image-upload.js:90
 msgid "Upload a file on your computer"
 msgstr "Hochladen einer Datei auf Ihren Computer"
 
-#: ckanext/odsh/fanstatic/odsh_image-upload.js:115
-#: ckanext/odsh/fanstatic/odsh_image-upload.js:186
+#: ckanext/odsh/assets/odsh_image-upload.js:115
+#: ckanext/odsh/assets/odsh_image-upload.js:186
 #: ckanext/odsh/templates/organization/snippets/organization_form.html:19
 #: ckanext/odsh/templates/package/snippets/resource_form.html:31
 msgid "URL"
 msgstr "URL"
 
-#: ckanext/odsh/fanstatic/odsh_image-upload.js:125
-#: ckanext/odsh/fanstatic/odsh_image-upload.js:221
+#: ckanext/odsh/assets/odsh_image-upload.js:125
+#: ckanext/odsh/assets/odsh_image-upload.js:221
 msgid "File"
 msgstr "Datei"
 
diff --git a/ckanext/odsh/plugin.py b/ckanext/odsh/plugin.py
index 2ee20198e28dbb00f0bc48a200dfe4da6620f703..2d12bc5a2a8da372f445d0bcedb761540626e0dc 100644
--- a/ckanext/odsh/plugin.py
+++ b/ckanext/odsh/plugin.py
@@ -112,7 +112,7 @@ class OdshPlugin(plugins.SingletonPlugin, DefaultTranslation, DefaultDatasetForm
     def update_config(self, config_):
         toolkit.add_template_directory(config_, 'templates')
         toolkit.add_public_directory(config_, 'public')
-        toolkit.add_resource('fanstatic', 'ckanext-odsh')
+        toolkit.add_resource('assets', 'ckanext-odsh')
 
     def after_map(self, map):
         return map