diff --git a/src/ca/mcgill/cs/jetuml/gui/Media.java b/src/ca/mcgill/cs/jetuml/gui/tips/Media.java
similarity index 91%
rename from src/ca/mcgill/cs/jetuml/gui/Media.java
rename to src/ca/mcgill/cs/jetuml/gui/tips/Media.java
index 5588fdcf5..9e0eabd16 100644
--- a/src/ca/mcgill/cs/jetuml/gui/Media.java
+++ b/src/ca/mcgill/cs/jetuml/gui/tips/Media.java
@@ -1,4 +1,4 @@
-package ca.mcgill.cs.jetuml.gui;
+package ca.mcgill.cs.jetuml.gui.tips;
 
 import java.util.Optional;
 
diff --git a/src/ca/mcgill/cs/jetuml/gui/TipElement.java b/src/ca/mcgill/cs/jetuml/gui/tips/TipElement.java
similarity index 90%
rename from src/ca/mcgill/cs/jetuml/gui/TipElement.java
rename to src/ca/mcgill/cs/jetuml/gui/tips/TipElement.java
index a3c5a0691..caa38a2ac 100644
--- a/src/ca/mcgill/cs/jetuml/gui/TipElement.java
+++ b/src/ca/mcgill/cs/jetuml/gui/tips/TipElement.java
@@ -1,4 +1,4 @@
-package ca.mcgill.cs.jetuml.gui;
+package ca.mcgill.cs.jetuml.gui.tips;
 
 /**
  * Tip element represented as a Media/content pair.
diff --git a/src/ca/mcgill/cs/jetuml/gui/TipLoader.java b/src/ca/mcgill/cs/jetuml/gui/tips/TipLoader.java
similarity index 92%
rename from src/ca/mcgill/cs/jetuml/gui/TipLoader.java
rename to src/ca/mcgill/cs/jetuml/gui/tips/TipLoader.java
index 127841afd..e26dfcae1 100644
--- a/src/ca/mcgill/cs/jetuml/gui/TipLoader.java
+++ b/src/ca/mcgill/cs/jetuml/gui/tips/TipLoader.java
@@ -1,4 +1,4 @@
-package ca.mcgill.cs.jetuml.gui;
+package ca.mcgill.cs.jetuml.gui.tips;
 
 import static ca.mcgill.cs.jetuml.application.ApplicationResources.RESOURCES;
 
@@ -58,7 +58,7 @@ public String getTitle()
 		 */
 		public List<TipElement> getElements()
 		{
-			return new ArrayList<TipElement>(aElements);
+			return new ArrayList<>(aElements);
 		}
 		
 		/**
diff --git a/test/ca/mcgill/cs/jetuml/gui/TestMedia.java b/test/ca/mcgill/cs/jetuml/gui/tips/TestMedia.java
similarity index 87%
rename from test/ca/mcgill/cs/jetuml/gui/TestMedia.java
rename to test/ca/mcgill/cs/jetuml/gui/tips/TestMedia.java
index 116a3f3c9..6442ab118 100644
--- a/test/ca/mcgill/cs/jetuml/gui/TestMedia.java
+++ b/test/ca/mcgill/cs/jetuml/gui/tips/TestMedia.java
@@ -1,12 +1,11 @@
-package ca.mcgill.cs.jetuml.gui;
+package ca.mcgill.cs.jetuml.gui.tips;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import org.junit.jupiter.api.Test;
-
 import java.util.Optional;
-import ca.mcgill.cs.jetuml.gui.Media;
+
+import org.junit.jupiter.api.Test;
 
 public class TestMedia 
 {
diff --git a/test/ca/mcgill/cs/jetuml/gui/TestTipLoader.java b/test/ca/mcgill/cs/jetuml/gui/tips/TestTipLoader.java
similarity index 95%
rename from test/ca/mcgill/cs/jetuml/gui/TestTipLoader.java
rename to test/ca/mcgill/cs/jetuml/gui/tips/TestTipLoader.java
index 5ccdf7082..9142a7421 100644
--- a/test/ca/mcgill/cs/jetuml/gui/TestTipLoader.java
+++ b/test/ca/mcgill/cs/jetuml/gui/tips/TestTipLoader.java
@@ -1,16 +1,15 @@
-package ca.mcgill.cs.jetuml.gui;
+package ca.mcgill.cs.jetuml.gui.tips;
 
 import static ca.mcgill.cs.jetuml.application.ApplicationResources.RESOURCES;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.lang.reflect.Method;
 import java.util.List;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.fail;
-
+import org.json.JSONObject;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
-import org.json.JSONObject;
 
 public class TestTipLoader 
 {