diff --git a/Images/bots/Mariam.png b/Images/AAMasters/AAMariam-Trading-Bot/Mariam.png
similarity index 100%
rename from Images/bots/Mariam.png
rename to Images/AAMasters/AAMariam-Trading-Bot/Mariam.png
diff --git a/Images/AAMasters/AAMasters.png b/Images/AAMasters/AAMasters.png
new file mode 100644
index 000000000..2949bda39
Binary files /dev/null and b/Images/AAMasters/AAMasters.png differ
diff --git a/Images/bots/Olivia.png b/Images/AAMasters/AAOlivia-Indicator-Bot/Olivia.png
similarity index 100%
rename from Images/bots/Olivia.png
rename to Images/AAMasters/AAOlivia-Indicator-Bot/Olivia.png
diff --git a/Images/bots/Tom.png b/Images/AAMasters/AATom-Indicator-Bot/Tom.png
similarity index 100%
rename from Images/bots/Tom.png
rename to Images/AAMasters/AATom-Indicator-Bot/Tom.png
diff --git a/Images/AAMasters/Plotters-Candles-Volumes/Candles.png b/Images/AAMasters/Plotters-Candles-Volumes/Candles.png
new file mode 100644
index 000000000..f1e093cd5
Binary files /dev/null and b/Images/AAMasters/Plotters-Candles-Volumes/Candles.png differ
diff --git a/Images/AAMasters/Plotters-Candles-Volumes/Volumes.png b/Images/AAMasters/Plotters-Candles-Volumes/Volumes.png
new file mode 100644
index 000000000..aaea183a6
Binary files /dev/null and b/Images/AAMasters/Plotters-Candles-Volumes/Volumes.png differ
diff --git a/Images/AAMasters/Plotters-Stairs-Patterns/CandleStairs.png b/Images/AAMasters/Plotters-Stairs-Patterns/CandleStairs.png
new file mode 100644
index 000000000..a21beb7a0
Binary files /dev/null and b/Images/AAMasters/Plotters-Stairs-Patterns/CandleStairs.png differ
diff --git a/Images/AAMasters/Plotters-Stairs-Patterns/VolumeStairs.png b/Images/AAMasters/Plotters-Stairs-Patterns/VolumeStairs.png
new file mode 100644
index 000000000..363096eee
Binary files /dev/null and b/Images/AAMasters/Plotters-Stairs-Patterns/VolumeStairs.png differ
diff --git a/Images/AAMasters/Plotters-Trading/Competition.png b/Images/AAMasters/Plotters-Trading/Competition.png
new file mode 100644
index 000000000..a4ee16263
Binary files /dev/null and b/Images/AAMasters/Plotters-Trading/Competition.png differ
diff --git a/Images/AAMasters/Plotters-Trading/History.png b/Images/AAMasters/Plotters-Trading/History.png
new file mode 100644
index 000000000..a6809adfd
Binary files /dev/null and b/Images/AAMasters/Plotters-Trading/History.png differ
diff --git a/Images/AAMasters/Plotters-Trading/Live.png b/Images/AAMasters/Plotters-Trading/Live.png
new file mode 100644
index 000000000..71f565286
Binary files /dev/null and b/Images/AAMasters/Plotters-Trading/Live.png differ
diff --git a/Images/AASpartans/AAKing-Trading-Bot/King.png b/Images/AASpartans/AAKing-Trading-Bot/King.png
new file mode 100644
index 000000000..c9622fcc1
Binary files /dev/null and b/Images/AASpartans/AAKing-Trading-Bot/King.png differ
diff --git a/Images/AASpartans/AASpartans.png b/Images/AASpartans/AASpartans.png
new file mode 100644
index 000000000..d1c7106fa
Binary files /dev/null and b/Images/AASpartans/AASpartans.png differ
diff --git a/Images/AAVikings/AAGauss-Indicator-Bot/Gauss.png b/Images/AAVikings/AAGauss-Indicator-Bot/Gauss.png
new file mode 100644
index 000000000..b0c7df225
Binary files /dev/null and b/Images/AAVikings/AAGauss-Indicator-Bot/Gauss.png differ
diff --git a/Images/AAVikings/AAVikings.png b/Images/AAVikings/AAVikings.png
new file mode 100644
index 000000000..315b1b4f1
Binary files /dev/null and b/Images/AAVikings/AAVikings.png differ
diff --git a/Images/AAVikings/Plotters-Linear-Regression-Curve/LRC.png b/Images/AAVikings/Plotters-Linear-Regression-Curve/LRC.png
new file mode 100644
index 000000000..a2cefe275
Binary files /dev/null and b/Images/AAVikings/Plotters-Linear-Regression-Curve/LRC.png differ
diff --git a/server.js b/server.js
index 29ab0100b..d62c6d8fb 100644
--- a/server.js
+++ b/server.js
@@ -412,7 +412,27 @@ function onBrowserRequest(request, response) {
         case "Images": // This means the Scripts folder.
             {
 
-                respondWithImage('./Images/' + requestParameters[2], response);
+                let path = './Images/' + requestParameters[2];
+
+                if (requestParameters[3] !== undefined) {
+
+                    path = path + "/" + requestParameters[3];
+
+                }
+
+                if (requestParameters[4] !== undefined) {
+
+                    path = path + "/" + requestParameters[4];
+
+                }
+
+                if (requestParameters[5] !== undefined) {
+
+                    path = path + "/" + requestParameters[5];
+
+                }
+
+                respondWithImage(path, response);
 
             }
             break; 
@@ -875,7 +895,7 @@ function onBrowserRequest(request, response) {
                             if (CONSOLE_LOG === true) { console.log("[INFO] server -> onBrowserRequest -> onFileRead -> addImages -> Entering function."); }
 
                             const htmlLine = '' + '\n' +
-                                '    <img id="@id@" width="0" height="0" src="https://raw.githubusercontent.com/@devTeam@/@repo@/master/@image@">'
+                                '    <img id="@id@" width="0" height="0" src="Images/@devTeam@/@repo@/@image@">'
 
                             let devTeams = ecosystemObject.devTeams;
 
@@ -893,7 +913,7 @@ function onBrowserRequest(request, response) {
 
                                     let stringToInsert;
                                     stringToInsert = htmlLineCopy.replace('@devTeam@', devTeam.codeName);
-                                    stringToInsert = stringToInsert.replace('@repo@', devTeam.codeName + "-Dev-Team");
+                                    stringToInsert = stringToInsert.replace('@repo@/', "");
                                     stringToInsert = stringToInsert.replace('@image@', devTeam.codeName + ".png");
                                     stringToInsert = stringToInsert.replace('@id@', devTeam.codeName + ".png");