diff --git a/src/lib/libraries/extensions/boost-small.svg b/src/lib/libraries/extensions/boost/boost-small.svg
similarity index 100%
rename from src/lib/libraries/extensions/boost-small.svg
rename to src/lib/libraries/extensions/boost/boost-small.svg
diff --git a/src/lib/libraries/extensions/boost.png b/src/lib/libraries/extensions/boost/boost.png
similarity index 100%
rename from src/lib/libraries/extensions/boost.png
rename to src/lib/libraries/extensions/boost/boost.png
diff --git a/src/lib/libraries/extensions/peripheral-connection/ev3/ev3-hub-illustration.svg b/src/lib/libraries/extensions/ev3/ev3-hub-illustration.svg
similarity index 100%
rename from src/lib/libraries/extensions/peripheral-connection/ev3/ev3-hub-illustration.svg
rename to src/lib/libraries/extensions/ev3/ev3-hub-illustration.svg
diff --git a/src/lib/libraries/extensions/peripheral-connection/ev3/ev3-small.svg b/src/lib/libraries/extensions/ev3/ev3-small.svg
similarity index 100%
rename from src/lib/libraries/extensions/peripheral-connection/ev3/ev3-small.svg
rename to src/lib/libraries/extensions/ev3/ev3-small.svg
diff --git a/src/lib/libraries/extensions/ev3.png b/src/lib/libraries/extensions/ev3/ev3.png
similarity index 100%
rename from src/lib/libraries/extensions/ev3.png
rename to src/lib/libraries/extensions/ev3/ev3.png
diff --git a/src/lib/libraries/extensions/index.jsx b/src/lib/libraries/extensions/index.jsx
index 3d1dd6658..406452785 100644
--- a/src/lib/libraries/extensions/index.jsx
+++ b/src/lib/libraries/extensions/index.jsx
@@ -1,31 +1,39 @@
 import React from 'react';
 import {FormattedMessage} from 'react-intl';
 
-import musicImage from './music.png';
-import musicInsetImage from './music-small.svg';
-import penImage from './pen.png';
-import penInsetImage from './pen-small.svg';
-import videoImage from './video-sensing.png';
-import videoInsetImage from './video-sensing-small.svg';
-import translateImage from './translate.png';
-import translateInsetImage from './translate-small.png';
-import microbitImage from './microbit.png';
-import ev3Image from './ev3.png';
-import wedoImage from './wedo.png';
-import text2speechImage from './text2speech.png';
-import text2speechInsetImage from './text2speech-small.svg';
-import makeymakeyImage from './makeymakey.png';
-import makeymakeyInsetImage from './makeymakey-small.svg';
-import boostImage from './boost.png';
-import boostInsetImage from './boost-small.svg';
+import musicIconURL from './music/music.png';
+import musicInsetIconURL from './music/music-small.svg';
 
-import microbitPeripheralImage from './peripheral-connection/microbit/microbit-illustration.svg';
-import microbitMenuImage from './peripheral-connection/microbit/microbit-small.svg';
-import ev3PeripheralImage from './peripheral-connection/ev3/ev3-hub-illustration.svg';
-import ev3MenuImage from './peripheral-connection/ev3/ev3-small.svg';
-import wedoPeripheralImage from './peripheral-connection/wedo/wedo-illustration.svg';
-import wedoMenuImage from './peripheral-connection/wedo/wedo-small.svg';
-import wedoButtonImage from './peripheral-connection/wedo/wedo-button-illustration.svg';
+import penIconURL from './pen/pen.png';
+import penInsetIconURL from './pen/pen-small.svg';
+
+import videoSensingIconURL from './videoSensing/video-sensing.png';
+import videoSensingInsetIconURL from './videoSensing/video-sensing-small.svg';
+
+import text2speechIconURL from './text2speech/text2speech.png';
+import text2speechInsetIconURL from './text2speech/text2speech-small.svg';
+
+import translateIconURL from './translate/translate.png';
+import translateInsetIconURL from './translate/translate-small.png';
+
+import makeymakeyIconURL from './makeymakey/makeymakey.png';
+import makeymakeyInsetIconURL from './makeymakey/makeymakey-small.svg';
+
+import microbitIconURL from './microbit/microbit.png';
+import microbitInsetIconURL from './microbit/microbit-small.svg';
+import microbitPeripheralImage from './microbit/microbit-illustration.svg';
+
+import ev3IconURL from './ev3/ev3.png';
+import ev3InsetIconURL from './ev3/ev3-small.svg';
+import ev3PeripheralImage from './ev3/ev3-hub-illustration.svg';
+
+import wedo2IconURL from './wedo2/wedo.png';
+import wedo2InsetIconURL from './wedo2/wedo-small.svg';
+import wedo2PeripheralImage from './wedo2/wedo-illustration.svg';
+import wedo2ButtonImage from './wedo2/wedo-button-illustration.svg';
+
+import boostIconURL from './boost/boost.png';
+import boostInsetIconURL from './boost/boost-small.svg';
 
 export default [
     {
@@ -37,8 +45,8 @@ export default [
             />
         ),
         extensionId: 'music',
-        iconURL: musicImage,
-        insetIconURL: musicInsetImage,
+        iconURL: musicIconURL,
+        insetIconURL: musicInsetIconURL,
         description: (
             <FormattedMessage
                 defaultMessage="Play instruments and drums."
@@ -57,8 +65,8 @@ export default [
             />
         ),
         extensionId: 'pen',
-        iconURL: penImage,
-        insetIconURL: penInsetImage,
+        iconURL: penIconURL,
+        insetIconURL: penInsetIconURL,
         description: (
             <FormattedMessage
                 defaultMessage="Draw with your sprites."
@@ -77,8 +85,8 @@ export default [
             />
         ),
         extensionId: 'videoSensing',
-        iconURL: videoImage,
-        insetIconURL: videoInsetImage,
+        iconURL: videoSensingIconURL,
+        insetIconURL: videoSensingInsetIconURL,
         description: (
             <FormattedMessage
                 defaultMessage="Sense motion with the camera."
@@ -98,8 +106,8 @@ export default [
         ),
         extensionId: 'text2speech',
         collaborator: 'Amazon Web Services',
-        iconURL: text2speechImage,
-        insetIconURL: text2speechInsetImage,
+        iconURL: text2speechIconURL,
+        insetIconURL: text2speechInsetIconURL,
         description: (
             <FormattedMessage
                 defaultMessage="Make your projects talk."
@@ -120,8 +128,8 @@ export default [
         ),
         extensionId: 'translate',
         collaborator: 'Google',
-        iconURL: translateImage,
-        insetIconURL: translateInsetImage,
+        iconURL: translateIconURL,
+        insetIconURL: translateInsetIconURL,
         description: (
             <FormattedMessage
                 defaultMessage="Translate text into many languages."
@@ -136,8 +144,8 @@ export default [
         name: 'Makey Makey',
         extensionId: 'makeymakey',
         collaborator: 'JoyLabz',
-        iconURL: makeymakeyImage,
-        insetIconURL: makeymakeyInsetImage,
+        iconURL: makeymakeyIconURL,
+        insetIconURL: makeymakeyInsetIconURL,
         description: (
             <FormattedMessage
                 defaultMessage="Make anything into a key."
@@ -151,8 +159,8 @@ export default [
         name: 'micro:bit',
         extensionId: 'microbit',
         collaborator: 'micro:bit',
-        iconURL: microbitImage,
-        insetIconURL: microbitMenuImage,
+        iconURL: microbitIconURL,
+        insetIconURL: microbitInsetIconURL,
         description: (
             <FormattedMessage
                 defaultMessage="Connect your projects with the world."
@@ -167,7 +175,7 @@ export default [
         launchPeripheralConnectionFlow: true,
         useAutoScan: false,
         peripheralImage: microbitPeripheralImage,
-        smallPeripheralImage: microbitMenuImage,
+        smallPeripheralImage: microbitInsetIconURL,
         connectingMessage: (
             <FormattedMessage
                 defaultMessage="Connecting"
@@ -181,8 +189,8 @@ export default [
         name: 'LEGO MINDSTORMS EV3',
         extensionId: 'ev3',
         collaborator: 'LEGO',
-        iconURL: ev3Image,
-        insetIconURL: ev3MenuImage,
+        iconURL: ev3IconURL,
+        insetIconURL: ev3InsetIconURL,
         description: (
             <FormattedMessage
                 defaultMessage="Build interactive robots and more."
@@ -197,7 +205,7 @@ export default [
         launchPeripheralConnectionFlow: true,
         useAutoScan: false,
         peripheralImage: ev3PeripheralImage,
-        smallPeripheralImage: ev3MenuImage,
+        smallPeripheralImage: ev3InsetIconURL,
         connectingMessage: (
             <FormattedMessage
                 defaultMessage="Connecting. Make sure the pin on your EV3 is set to 1234."
@@ -211,8 +219,8 @@ export default [
         name: 'LEGO Education WeDo 2.0',
         extensionId: 'wedo2',
         collaborator: 'LEGO',
-        iconURL: wedoImage,
-        insetIconURL: wedoMenuImage,
+        iconURL: wedo2IconURL,
+        insetIconURL: wedo2InsetIconURL,
         description: (
             <FormattedMessage
                 defaultMessage="Build with motors and sensors."
@@ -226,9 +234,9 @@ export default [
         internetConnectionRequired: true,
         launchPeripheralConnectionFlow: true,
         useAutoScan: true,
-        peripheralImage: wedoPeripheralImage,
-        smallPeripheralImage: wedoMenuImage,
-        peripheralButtonImage: wedoButtonImage,
+        peripheralImage: wedo2PeripheralImage,
+        smallPeripheralImage: wedo2InsetIconURL,
+        peripheralButtonImage: wedo2ButtonImage,
         connectingMessage: (
             <FormattedMessage
                 defaultMessage="Connecting"
@@ -242,8 +250,8 @@ export default [
         name: 'LEGO BOOST',
         extensionId: 'boost',
         collaborator: 'LEGO',
-        iconURL: boostImage,
-        insetIconURL: boostInsetImage,
+        iconURL: boostIconURL,
+        insetIconURL: boostInsetIconURL,
         description: (
             <FormattedMessage
                 defaultMessage="Bring robotic creations to life."
diff --git a/src/lib/libraries/extensions/makeymakey-small.svg b/src/lib/libraries/extensions/makeymakey/makeymakey-small.svg
similarity index 100%
rename from src/lib/libraries/extensions/makeymakey-small.svg
rename to src/lib/libraries/extensions/makeymakey/makeymakey-small.svg
diff --git a/src/lib/libraries/extensions/makeymakey.png b/src/lib/libraries/extensions/makeymakey/makeymakey.png
similarity index 100%
rename from src/lib/libraries/extensions/makeymakey.png
rename to src/lib/libraries/extensions/makeymakey/makeymakey.png
diff --git a/src/lib/libraries/extensions/peripheral-connection/microbit/microbit-illustration.svg b/src/lib/libraries/extensions/microbit/microbit-illustration.svg
similarity index 100%
rename from src/lib/libraries/extensions/peripheral-connection/microbit/microbit-illustration.svg
rename to src/lib/libraries/extensions/microbit/microbit-illustration.svg
diff --git a/src/lib/libraries/extensions/peripheral-connection/microbit/microbit-small.svg b/src/lib/libraries/extensions/microbit/microbit-small.svg
similarity index 100%
rename from src/lib/libraries/extensions/peripheral-connection/microbit/microbit-small.svg
rename to src/lib/libraries/extensions/microbit/microbit-small.svg
diff --git a/src/lib/libraries/extensions/microbit.png b/src/lib/libraries/extensions/microbit/microbit.png
similarity index 100%
rename from src/lib/libraries/extensions/microbit.png
rename to src/lib/libraries/extensions/microbit/microbit.png
diff --git a/src/lib/libraries/extensions/music-small.svg b/src/lib/libraries/extensions/music/music-small.svg
similarity index 100%
rename from src/lib/libraries/extensions/music-small.svg
rename to src/lib/libraries/extensions/music/music-small.svg
diff --git a/src/lib/libraries/extensions/music.png b/src/lib/libraries/extensions/music/music.png
similarity index 100%
rename from src/lib/libraries/extensions/music.png
rename to src/lib/libraries/extensions/music/music.png
diff --git a/src/lib/libraries/extensions/pen-small.svg b/src/lib/libraries/extensions/pen/pen-small.svg
similarity index 100%
rename from src/lib/libraries/extensions/pen-small.svg
rename to src/lib/libraries/extensions/pen/pen-small.svg
diff --git a/src/lib/libraries/extensions/pen.png b/src/lib/libraries/extensions/pen/pen.png
similarity index 100%
rename from src/lib/libraries/extensions/pen.png
rename to src/lib/libraries/extensions/pen/pen.png
diff --git a/src/lib/libraries/extensions/text2speech-small.svg b/src/lib/libraries/extensions/text2speech/text2speech-small.svg
similarity index 100%
rename from src/lib/libraries/extensions/text2speech-small.svg
rename to src/lib/libraries/extensions/text2speech/text2speech-small.svg
diff --git a/src/lib/libraries/extensions/text2speech.png b/src/lib/libraries/extensions/text2speech/text2speech.png
similarity index 100%
rename from src/lib/libraries/extensions/text2speech.png
rename to src/lib/libraries/extensions/text2speech/text2speech.png
diff --git a/src/lib/libraries/extensions/translate-small.png b/src/lib/libraries/extensions/translate/translate-small.png
similarity index 100%
rename from src/lib/libraries/extensions/translate-small.png
rename to src/lib/libraries/extensions/translate/translate-small.png
diff --git a/src/lib/libraries/extensions/translate.png b/src/lib/libraries/extensions/translate/translate.png
similarity index 100%
rename from src/lib/libraries/extensions/translate.png
rename to src/lib/libraries/extensions/translate/translate.png
diff --git a/src/lib/libraries/extensions/video-sensing-small.svg b/src/lib/libraries/extensions/videoSensing/video-sensing-small.svg
similarity index 100%
rename from src/lib/libraries/extensions/video-sensing-small.svg
rename to src/lib/libraries/extensions/videoSensing/video-sensing-small.svg
diff --git a/src/lib/libraries/extensions/video-sensing.png b/src/lib/libraries/extensions/videoSensing/video-sensing.png
similarity index 100%
rename from src/lib/libraries/extensions/video-sensing.png
rename to src/lib/libraries/extensions/videoSensing/video-sensing.png
diff --git a/src/lib/libraries/extensions/peripheral-connection/wedo/wedo-button-illustration.svg b/src/lib/libraries/extensions/wedo2/wedo-button-illustration.svg
similarity index 100%
rename from src/lib/libraries/extensions/peripheral-connection/wedo/wedo-button-illustration.svg
rename to src/lib/libraries/extensions/wedo2/wedo-button-illustration.svg
diff --git a/src/lib/libraries/extensions/peripheral-connection/wedo/wedo-illustration.svg b/src/lib/libraries/extensions/wedo2/wedo-illustration.svg
similarity index 100%
rename from src/lib/libraries/extensions/peripheral-connection/wedo/wedo-illustration.svg
rename to src/lib/libraries/extensions/wedo2/wedo-illustration.svg
diff --git a/src/lib/libraries/extensions/peripheral-connection/wedo/wedo-small.svg b/src/lib/libraries/extensions/wedo2/wedo-small.svg
similarity index 100%
rename from src/lib/libraries/extensions/peripheral-connection/wedo/wedo-small.svg
rename to src/lib/libraries/extensions/wedo2/wedo-small.svg
diff --git a/src/lib/libraries/extensions/wedo.png b/src/lib/libraries/extensions/wedo2/wedo.png
similarity index 100%
rename from src/lib/libraries/extensions/wedo.png
rename to src/lib/libraries/extensions/wedo2/wedo.png