diff --git a/junk_drawer/.DS_Store b/junk_drawer/.DS_Store
new file mode 100644
index 0000000..cb9dac0
Binary files /dev/null and b/junk_drawer/.DS_Store differ
diff --git a/junk_drawer/robtemp/.DS_Store b/junk_drawer/robtemp/.DS_Store
new file mode 100644
index 0000000..5008ddf
Binary files /dev/null and b/junk_drawer/robtemp/.DS_Store differ
diff --git a/junk_drawer/robtemp/block.block.claro_breadcrumbs.yml b/junk_drawer/robtemp/block.block.claro_breadcrumbs.yml
deleted file mode 100755
index 10c12b4..0000000
--- a/junk_drawer/robtemp/block.block.claro_breadcrumbs.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: 04e5298f-1671-4c75-8371-8020feafc968
-langcode: en
-status: true
-dependencies:
-  module:
-    - system
-  theme:
-    - claro
-_core:
-  default_config_hash: NjcxOBrPOiK5-38t56DwFBDVY4yer7YSlbRWXFuHe7A
-id: claro_breadcrumbs
-theme: claro
-region: breadcrumb
-weight: 0
-provider: null
-plugin: system_breadcrumb_block
-settings:
-  id: system_breadcrumb_block
-  label: Breadcrumbs
-  label_display: '0'
-  provider: system
-visibility: {  }
diff --git a/junk_drawer/robtemp/block.block.claro_content.yml b/junk_drawer/robtemp/block.block.claro_content.yml
deleted file mode 100755
index c3f66a8..0000000
--- a/junk_drawer/robtemp/block.block.claro_content.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: 171aa20c-cba5-40b4-9692-106450a04a17
-langcode: en
-status: true
-dependencies:
-  module:
-    - system
-  theme:
-    - claro
-_core:
-  default_config_hash: a0Yyx1GeyKarZ4T_yXQBR_ZFKnXiFLtxAb6gWLd8nr0
-id: claro_content
-theme: claro
-region: content
-weight: 0
-provider: null
-plugin: system_main_block
-settings:
-  id: system_main_block
-  label: 'Main page content'
-  label_display: '0'
-  provider: system
-visibility: {  }
diff --git a/junk_drawer/robtemp/block.block.claro_help.yml b/junk_drawer/robtemp/block.block.claro_help.yml
deleted file mode 100755
index 5b0e9de..0000000
--- a/junk_drawer/robtemp/block.block.claro_help.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: e524857e-9ffb-43ca-a3a6-345843fe33dd
-langcode: en
-status: true
-dependencies:
-  module:
-    - help
-  theme:
-    - claro
-_core:
-  default_config_hash: jccFSSVqV0WCDb6NtML1VWAWTtDbZ-zn5YgTRMgMrIM
-id: claro_help
-theme: claro
-region: help
-weight: 0
-provider: null
-plugin: help_block
-settings:
-  id: help_block
-  label: Help
-  label_display: '0'
-  provider: help
-visibility: {  }
diff --git a/junk_drawer/robtemp/block.block.claro_local_actions.yml b/junk_drawer/robtemp/block.block.claro_local_actions.yml
deleted file mode 100755
index d27269f..0000000
--- a/junk_drawer/robtemp/block.block.claro_local_actions.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-uuid: 39c2ba17-b7e5-4073-b059-23b796cbd82c
-langcode: en
-status: true
-dependencies:
-  theme:
-    - claro
-_core:
-  default_config_hash: CdXfDmRgAvms7EQovxxWPdYi0GitxeRbVtScYK16ZH0
-id: claro_local_actions
-theme: claro
-region: content
-weight: -10
-provider: null
-plugin: local_actions_block
-settings:
-  id: local_actions_block
-  label: 'Primary admin actions'
-  label_display: '0'
-  provider: core
-visibility: {  }
diff --git a/junk_drawer/robtemp/block.block.claro_messages.yml b/junk_drawer/robtemp/block.block.claro_messages.yml
deleted file mode 100755
index 37155aa..0000000
--- a/junk_drawer/robtemp/block.block.claro_messages.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: 1cdb3f25-5e60-4438-ac52-67d5fa368d81
-langcode: en
-status: true
-dependencies:
-  module:
-    - system
-  theme:
-    - claro
-_core:
-  default_config_hash: '-Ac3ISpIT0PQ-whzD7_dw0SdKi6dAbRFNWdSjOiVDqg'
-id: claro_messages
-theme: claro
-region: highlighted
-weight: 0
-provider: null
-plugin: system_messages_block
-settings:
-  id: system_messages_block
-  label: 'Status messages'
-  label_display: '0'
-  provider: system
-visibility: {  }
diff --git a/junk_drawer/robtemp/block.block.claro_page_title.yml b/junk_drawer/robtemp/block.block.claro_page_title.yml
deleted file mode 100755
index f4d7a15..0000000
--- a/junk_drawer/robtemp/block.block.claro_page_title.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-uuid: defaec36-d4df-4dff-8612-dabf86b93a7a
-langcode: en
-status: true
-dependencies:
-  theme:
-    - claro
-_core:
-  default_config_hash: fNwDdW063tk_ktzSWzZVeQS9wzvLooVO280BQ9WrsIs
-id: claro_page_title
-theme: claro
-region: header
-weight: -30
-provider: null
-plugin: page_title_block
-settings:
-  id: page_title_block
-  label: 'Page title'
-  label_display: '0'
-  provider: core
-visibility: {  }
diff --git a/junk_drawer/robtemp/block.block.claro_primary_local_tasks.yml b/junk_drawer/robtemp/block.block.claro_primary_local_tasks.yml
deleted file mode 100755
index d1ab2da..0000000
--- a/junk_drawer/robtemp/block.block.claro_primary_local_tasks.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: 97185aca-ce5e-4054-80dc-811dfe907cb2
-langcode: en
-status: true
-dependencies:
-  theme:
-    - claro
-_core:
-  default_config_hash: ACjBZI5shAMiiUpsz-inLYVXDqNNXRnSzAWV3kV_8Hw
-id: claro_primary_local_tasks
-theme: claro
-region: header
-weight: 0
-provider: null
-plugin: local_tasks_block
-settings:
-  id: local_tasks_block
-  label: 'Primary tabs'
-  label_display: '0'
-  provider: core
-  primary: true
-  secondary: false
-visibility: {  }
diff --git a/junk_drawer/robtemp/block.block.claro_secondary_local_tasks.yml b/junk_drawer/robtemp/block.block.claro_secondary_local_tasks.yml
deleted file mode 100755
index 9531ec4..0000000
--- a/junk_drawer/robtemp/block.block.claro_secondary_local_tasks.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: 5c251d07-cdc3-4d5b-ac8a-8cccb9deb713
-langcode: en
-status: true
-dependencies:
-  theme:
-    - claro
-_core:
-  default_config_hash: 2L0geP-ixCbCkEpW6BVF6H7vDUZN4ea07_Y9CociQm4
-id: claro_secondary_local_tasks
-theme: claro
-region: pre_content
-weight: 0
-provider: null
-plugin: local_tasks_block
-settings:
-  id: local_tasks_block
-  label: 'Secondary tabs'
-  label_display: '0'
-  provider: core
-  primary: false
-  secondary: true
-visibility: {  }
diff --git a/junk_drawer/robtemp/block.block.olivero_breadcrumbs.yml b/junk_drawer/robtemp/block.block.olivero_breadcrumbs.yml
deleted file mode 100755
index 45d6c0e..0000000
--- a/junk_drawer/robtemp/block.block.olivero_breadcrumbs.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: cfe9b6b2-b994-43cd-8b5e-14b3526b03d3
-langcode: en
-status: true
-dependencies:
-  module:
-    - system
-  theme:
-    - olivero
-_core:
-  default_config_hash: VhBzWb7lMRtIOg9G7VSw_0uopi-7zXeHq4vXqqV1HFE
-id: olivero_breadcrumbs
-theme: olivero
-region: breadcrumb
-weight: 0
-provider: null
-plugin: system_breadcrumb_block
-settings:
-  id: system_breadcrumb_block
-  label: Breadcrumbs
-  label_display: '0'
-  provider: system
-visibility: {  }
diff --git a/junk_drawer/robtemp/block.block.olivero_content.yml b/junk_drawer/robtemp/block.block.olivero_content.yml
deleted file mode 100755
index 3b09c5e..0000000
--- a/junk_drawer/robtemp/block.block.olivero_content.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: 4317c528-2d4d-486a-83d3-dbd2848224d9
-langcode: en
-status: true
-dependencies:
-  module:
-    - system
-  theme:
-    - olivero
-_core:
-  default_config_hash: erQSEZF2XUjNmgTl0uNRBzmg18ZGXwUcw2FhApoeuHk
-id: olivero_content
-theme: olivero
-region: content
-weight: -17
-provider: null
-plugin: system_main_block
-settings:
-  id: system_main_block
-  label: 'Main page content'
-  label_display: '0'
-  provider: system
-visibility: {  }
diff --git a/junk_drawer/robtemp/block.block.olivero_help.yml b/junk_drawer/robtemp/block.block.olivero_help.yml
deleted file mode 100755
index 59635f5..0000000
--- a/junk_drawer/robtemp/block.block.olivero_help.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: b4551f41-767c-4231-8daf-7bad42cd80b2
-langcode: en
-status: true
-dependencies:
-  module:
-    - help
-  theme:
-    - olivero
-_core:
-  default_config_hash: VfPFqqxfkomud5CO8DUijw85QIl9GIxh_nIxLOYESxg
-id: olivero_help
-theme: olivero
-region: content_above
-weight: -5
-provider: null
-plugin: help_block
-settings:
-  id: help_block
-  label: Help
-  label_display: '0'
-  provider: help
-visibility: {  }
diff --git a/junk_drawer/robtemp/block.block.olivero_main_menu.yml b/junk_drawer/robtemp/block.block.olivero_main_menu.yml
deleted file mode 100755
index 692e9a2..0000000
--- a/junk_drawer/robtemp/block.block.olivero_main_menu.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-uuid: 6f733ea0-22c4-4ffa-8753-5068a94ca35b
-langcode: en
-status: true
-dependencies:
-  config:
-    - system.menu.main
-  module:
-    - system
-  theme:
-    - olivero
-_core:
-  default_config_hash: KWAiziL39uEzmOJEql_wbUP2RtqGceL3WM2CfxhMelE
-id: olivero_main_menu
-theme: olivero
-region: primary_menu
-weight: -10
-provider: null
-plugin: 'system_menu_block:main'
-settings:
-  id: 'system_menu_block:main'
-  label: 'Main navigation'
-  label_display: '0'
-  provider: system
-  level: 1
-  depth: 2
-  expand_all_items: true
-visibility: {  }
diff --git a/junk_drawer/robtemp/block.block.olivero_messages.yml b/junk_drawer/robtemp/block.block.olivero_messages.yml
deleted file mode 100755
index 96300ad..0000000
--- a/junk_drawer/robtemp/block.block.olivero_messages.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: 4669b060-18b9-4b16-976b-c4b62a9d50f1
-langcode: en
-status: true
-dependencies:
-  module:
-    - system
-  theme:
-    - olivero
-_core:
-  default_config_hash: BZ5tpW7H8X4PVGRm3MImTIHd2tN0eF7zOtp4SpRYUA0
-id: olivero_messages
-theme: olivero
-region: highlighted
-weight: -5
-provider: null
-plugin: system_messages_block
-settings:
-  id: system_messages_block
-  label: 'Status messages'
-  label_display: '0'
-  provider: system
-visibility: {  }
diff --git a/junk_drawer/robtemp/block.block.olivero_miradorblock.yml b/junk_drawer/robtemp/block.block.olivero_miradorblock.yml
deleted file mode 100755
index 683a586..0000000
--- a/junk_drawer/robtemp/block.block.olivero_miradorblock.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-uuid: 4059d97e-3f93-4339-a3c9-cdc58b4c353f
-langcode: en
-status: false
-dependencies:
-  module:
-    - context
-    - islandora
-    - islandora_mirador
-  theme:
-    - olivero
-id: olivero_miradorblock
-theme: olivero
-region: content_above
-weight: 0
-provider: null
-plugin: mirador_block
-settings:
-  id: mirador_block
-  label: 'Mirador block'
-  label_display: visible
-  provider: islandora_mirador
-  iiif_manifest_url: 'https://localhost/node/[node:nid]/manifest'
-visibility:
-  http_status_code:
-    id: http_status_code
-    negate: false
-    status_codes:
-      200: 200
-  media_source_mimetype:
-    id: media_source_mimetype
-    negate: false
-    context_mapping: {  }
-    mimetype: ''
diff --git a/junk_drawer/robtemp/block.block.olivero_page_title.yml b/junk_drawer/robtemp/block.block.olivero_page_title.yml
deleted file mode 100755
index b302923..0000000
--- a/junk_drawer/robtemp/block.block.olivero_page_title.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-uuid: ef325eb8-4ff9-4bb5-b758-3e04ebde3c9a
-langcode: en
-status: true
-dependencies:
-  theme:
-    - olivero
-_core:
-  default_config_hash: 6aOgWsNTXjqrDm98TXSAjP6qd2nCijD1xw45MrnbK-Y
-id: olivero_page_title
-theme: olivero
-region: content_above
-weight: -6
-provider: null
-plugin: page_title_block
-settings:
-  id: page_title_block
-  label: 'Page title'
-  label_display: '0'
-  provider: core
-visibility: {  }
diff --git a/junk_drawer/robtemp/block.block.olivero_powered.yml b/junk_drawer/robtemp/block.block.olivero_powered.yml
deleted file mode 100755
index a9f1237..0000000
--- a/junk_drawer/robtemp/block.block.olivero_powered.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: 8e9ee068-78e2-4dd7-919c-621dd4a35970
-langcode: en
-status: true
-dependencies:
-  module:
-    - system
-  theme:
-    - olivero
-_core:
-  default_config_hash: eYL19CLDyinGTWYQfBD1DswWzglEotE_kHnHx3AxTXM
-id: olivero_powered
-theme: olivero
-region: footer_bottom
-weight: 0
-provider: null
-plugin: system_powered_by_block
-settings:
-  id: system_powered_by_block
-  label: 'Powered by Drupal'
-  label_display: '0'
-  provider: system
-visibility: {  }
diff --git a/junk_drawer/robtemp/block.block.olivero_primary_admin_actions.yml b/junk_drawer/robtemp/block.block.olivero_primary_admin_actions.yml
deleted file mode 100755
index 14f9eda..0000000
--- a/junk_drawer/robtemp/block.block.olivero_primary_admin_actions.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-uuid: 74326bf5-d3c7-431c-ab5d-e0a88bb8392b
-langcode: en
-status: true
-dependencies:
-  theme:
-    - olivero
-_core:
-  default_config_hash: Q9_2whdOj1YIomfvsIfopROW4FT_X5pY0DjdOiOaQ5U
-id: olivero_primary_admin_actions
-theme: olivero
-region: highlighted
-weight: -6
-provider: null
-plugin: local_actions_block
-settings:
-  id: local_actions_block
-  label: 'Primary admin actions'
-  label_display: '0'
-  provider: core
-visibility: {  }
diff --git a/junk_drawer/robtemp/block.block.olivero_primary_local_tasks.yml b/junk_drawer/robtemp/block.block.olivero_primary_local_tasks.yml
deleted file mode 100755
index 815e5e2..0000000
--- a/junk_drawer/robtemp/block.block.olivero_primary_local_tasks.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: 12c1337f-1a6e-4999-b222-6719928b517d
-langcode: en
-status: true
-dependencies:
-  theme:
-    - olivero
-_core:
-  default_config_hash: nGE3EoPQQaQCuqTUtZgw0-KIzmrqdKDzdNQf2JyPUt4
-id: olivero_primary_local_tasks
-theme: olivero
-region: highlighted
-weight: -4
-provider: null
-plugin: local_tasks_block
-settings:
-  id: local_tasks_block
-  label: 'Primary tabs'
-  label_display: '0'
-  provider: core
-  primary: true
-  secondary: false
-visibility: {  }
diff --git a/junk_drawer/robtemp/block.block.olivero_publisher.yml b/junk_drawer/robtemp/block.block.olivero_publisher.yml
deleted file mode 100755
index 0ddd589..0000000
--- a/junk_drawer/robtemp/block.block.olivero_publisher.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-uuid: f726c3f2-1c46-485b-88ff-8a8f00563deb
-langcode: en
-status: true
-dependencies:
-  config:
-    - facets.facet.publisher
-  module:
-    - context
-    - facets
-    - islandora
-  theme:
-    - olivero
-id: olivero_publisher
-theme: olivero
-region: sidebar
-weight: 0
-provider: null
-plugin: 'facet_block:publisher'
-settings:
-  id: 'facet_block:publisher'
-  label: Publisher
-  label_display: visible
-  provider: facets
-  context_mapping: {  }
-  block_id: olivero_publisher
-visibility:
-  view_inclusion:
-    id: view_inclusion
-    negate: false
-    view_inclusion:
-      view-solr_search_content-page_1: view-solr_search_content-page_1
-  media_source_mimetype:
-    id: media_source_mimetype
-    negate: false
-    context_mapping: {  }
-    mimetype: ''
diff --git a/junk_drawer/robtemp/block.block.olivero_publisherswc.yml b/junk_drawer/robtemp/block.block.olivero_publisherswc.yml
deleted file mode 100755
index cf45893..0000000
--- a/junk_drawer/robtemp/block.block.olivero_publisherswc.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-uuid: 382c575f-1e11-4e41-80f7-3fec5cee2c0f
-langcode: en
-status: true
-dependencies:
-  config:
-    - facets.facet.publisher_swc
-  module:
-    - context
-    - facets
-    - islandora
-  theme:
-    - olivero
-id: olivero_publisherswc
-theme: olivero
-region: sidebar
-weight: 0
-provider: null
-plugin: 'facet_block:publisher_swc'
-settings:
-  id: 'facet_block:publisher_swc'
-  label: Publisher
-  label_display: visible
-  provider: facets
-  context_mapping: {  }
-  block_id: olivero_publisherswc
-visibility:
-  context_all:
-    id: context_all
-    negate: false
-    values: collection
-  media_source_mimetype:
-    id: media_source_mimetype
-    negate: false
-    context_mapping: {  }
-    mimetype: ''
diff --git a/junk_drawer/robtemp/block.block.olivero_secondary_local_tasks.yml b/junk_drawer/robtemp/block.block.olivero_secondary_local_tasks.yml
deleted file mode 100755
index 22c4e36..0000000
--- a/junk_drawer/robtemp/block.block.olivero_secondary_local_tasks.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: 66fea92a-8bff-4836-a6fc-7bcf9b0d18f4
-langcode: en
-status: true
-dependencies:
-  theme:
-    - olivero
-_core:
-  default_config_hash: ydSxdq7R66I8UMC460rOzlfzvlUL4VRbdwc6z9DWaUI
-id: olivero_secondary_local_tasks
-theme: olivero
-region: highlighted
-weight: -3
-provider: null
-plugin: local_tasks_block
-settings:
-  id: local_tasks_block
-  label: 'Secondary tabs'
-  label_display: '0'
-  provider: core
-  primary: false
-  secondary: true
-visibility: {  }
diff --git a/junk_drawer/robtemp/block.block.olivero_site_branding.yml b/junk_drawer/robtemp/block.block.olivero_site_branding.yml
deleted file mode 100755
index 2a80a1c..0000000
--- a/junk_drawer/robtemp/block.block.olivero_site_branding.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: 8817e701-536b-4b48-9f87-806c782fd49c
-langcode: en
-status: true
-dependencies:
-  module:
-    - system
-  theme:
-    - olivero
-_core:
-  default_config_hash: n_nlgjggHVfQt2H__zvLOKB2YtjPDbQ5tHijF9LE1aM
-id: olivero_site_branding
-theme: olivero
-region: header
-weight: -12
-provider: null
-plugin: system_branding_block
-settings:
-  id: system_branding_block
-  label: 'Site branding'
-  label_display: '0'
-  provider: system
-  use_site_logo: true
-  use_site_name: true
-  use_site_slogan: false
-visibility: {  }
diff --git a/junk_drawer/robtemp/block.block.creatorsandcontributors.yml b/junk_drawer/robtemp/block/block.block.creatorsandcontributors.yml
similarity index 100%
rename from junk_drawer/robtemp/block.block.creatorsandcontributors.yml
rename to junk_drawer/robtemp/block/block.block.creatorsandcontributors.yml
diff --git a/junk_drawer/robtemp/block.block.creatorsandcontributors_swc.yml b/junk_drawer/robtemp/block/block.block.creatorsandcontributors_swc.yml
similarity index 100%
rename from junk_drawer/robtemp/block.block.creatorsandcontributors_swc.yml
rename to junk_drawer/robtemp/block/block.block.creatorsandcontributors_swc.yml
diff --git a/junk_drawer/robtemp/block.block.memberof.yml b/junk_drawer/robtemp/block/block.block.memberof.yml
similarity index 100%
rename from junk_drawer/robtemp/block.block.memberof.yml
rename to junk_drawer/robtemp/block/block.block.memberof.yml
diff --git a/junk_drawer/robtemp/block.block.memberofswc.yml b/junk_drawer/robtemp/block/block.block.memberofswc.yml
similarity index 100%
rename from junk_drawer/robtemp/block.block.memberofswc.yml
rename to junk_drawer/robtemp/block/block.block.memberofswc.yml
diff --git a/junk_drawer/robtemp/block.block.physicalform.yml b/junk_drawer/robtemp/block/block.block.physicalform.yml
similarity index 100%
rename from junk_drawer/robtemp/block.block.physicalform.yml
rename to junk_drawer/robtemp/block/block.block.physicalform.yml
diff --git a/junk_drawer/robtemp/block.block.physicalformswc.yml b/junk_drawer/robtemp/block/block.block.physicalformswc.yml
similarity index 100%
rename from junk_drawer/robtemp/block.block.physicalformswc.yml
rename to junk_drawer/robtemp/block/block.block.physicalformswc.yml
diff --git a/junk_drawer/robtemp/block.block.resource_type_swc.yml b/junk_drawer/robtemp/block/block.block.resource_type_swc.yml
similarity index 100%
rename from junk_drawer/robtemp/block.block.resource_type_swc.yml
rename to junk_drawer/robtemp/block/block.block.resource_type_swc.yml
diff --git a/junk_drawer/robtemp/block.block.resourcetype.yml b/junk_drawer/robtemp/block/block.block.resourcetype.yml
similarity index 100%
rename from junk_drawer/robtemp/block.block.resourcetype.yml
rename to junk_drawer/robtemp/block/block.block.resourcetype.yml
diff --git a/junk_drawer/robtemp/block.block.search.yml b/junk_drawer/robtemp/block/block.block.search.yml
similarity index 100%
rename from junk_drawer/robtemp/block.block.search.yml
rename to junk_drawer/robtemp/block/block.block.search.yml
diff --git a/junk_drawer/robtemp/block.block.solrsearchcontentadvancedsearchforblock.yml b/junk_drawer/robtemp/block/block.block.solrsearchcontentadvancedsearchforblock.yml
similarity index 100%
rename from junk_drawer/robtemp/block.block.solrsearchcontentadvancedsearchforblock.yml
rename to junk_drawer/robtemp/block/block.block.solrsearchcontentadvancedsearchforblock.yml
diff --git a/junk_drawer/robtemp/block.block.solrsearchcontentadvancedsearchforpage.yml b/junk_drawer/robtemp/block/block.block.solrsearchcontentadvancedsearchforpage.yml
similarity index 100%
rename from junk_drawer/robtemp/block.block.solrsearchcontentadvancedsearchforpage.yml
rename to junk_drawer/robtemp/block/block.block.solrsearchcontentadvancedsearchforpage.yml
diff --git a/junk_drawer/robtemp/block.block.solrsearchcontentsearchresultspagerforblock.yml b/junk_drawer/robtemp/block/block.block.solrsearchcontentsearchresultspagerforblock.yml
similarity index 100%
rename from junk_drawer/robtemp/block.block.solrsearchcontentsearchresultspagerforblock.yml
rename to junk_drawer/robtemp/block/block.block.solrsearchcontentsearchresultspagerforblock.yml
diff --git a/junk_drawer/robtemp/block.block.solrsearchcontentsearchresultspagerforpage.yml b/junk_drawer/robtemp/block/block.block.solrsearchcontentsearchresultspagerforpage.yml
similarity index 100%
rename from junk_drawer/robtemp/block.block.solrsearchcontentsearchresultspagerforpage.yml
rename to junk_drawer/robtemp/block/block.block.solrsearchcontentsearchresultspagerforpage.yml
diff --git a/junk_drawer/robtemp/block.block.subject.yml b/junk_drawer/robtemp/block/block.block.subject.yml
similarity index 100%
rename from junk_drawer/robtemp/block.block.subject.yml
rename to junk_drawer/robtemp/block/block.block.subject.yml
diff --git a/junk_drawer/robtemp/block.block.subjectname.yml b/junk_drawer/robtemp/block/block.block.subjectname.yml
similarity index 100%
rename from junk_drawer/robtemp/block.block.subjectname.yml
rename to junk_drawer/robtemp/block/block.block.subjectname.yml
diff --git a/junk_drawer/robtemp/block.block.subjectnamesswc.yml b/junk_drawer/robtemp/block/block.block.subjectnamesswc.yml
similarity index 100%
rename from junk_drawer/robtemp/block.block.subjectnamesswc.yml
rename to junk_drawer/robtemp/block/block.block.subjectnamesswc.yml
diff --git a/junk_drawer/robtemp/block.block.subjectsswc.yml b/junk_drawer/robtemp/block/block.block.subjectsswc.yml
similarity index 100%
rename from junk_drawer/robtemp/block.block.subjectsswc.yml
rename to junk_drawer/robtemp/block/block.block.subjectsswc.yml
diff --git a/junk_drawer/robtemp/block.block.subjecttemporalswc.yml b/junk_drawer/robtemp/block/block.block.subjecttemporalswc.yml
similarity index 100%
rename from junk_drawer/robtemp/block.block.subjecttemporalswc.yml
rename to junk_drawer/robtemp/block/block.block.subjecttemporalswc.yml
diff --git a/junk_drawer/robtemp/block.block.temporalsubject.yml b/junk_drawer/robtemp/block/block.block.temporalsubject.yml
similarity index 100%
rename from junk_drawer/robtemp/block.block.temporalsubject.yml
rename to junk_drawer/robtemp/block/block.block.temporalsubject.yml
diff --git a/junk_drawer/robtemp/block.block.views_block__solr_search_content_block_1.yml b/junk_drawer/robtemp/block/block.block.views_block__solr_search_content_block_1.yml
similarity index 100%
rename from junk_drawer/robtemp/block.block.views_block__solr_search_content_block_1.yml
rename to junk_drawer/robtemp/block/block.block.views_block__solr_search_content_block_1.yml
diff --git a/junk_drawer/robtemp/block.block.year.yml b/junk_drawer/robtemp/block/block.block.year.yml
similarity index 100%
rename from junk_drawer/robtemp/block.block.year.yml
rename to junk_drawer/robtemp/block/block.block.year.yml
diff --git a/junk_drawer/robtemp/block.block.yearswc.yml b/junk_drawer/robtemp/block/block.block.yearswc.yml
similarity index 100%
rename from junk_drawer/robtemp/block.block.yearswc.yml
rename to junk_drawer/robtemp/block/block.block.yearswc.yml