diff --git a/src/test/kotlin/net/shadowfacts/cacao/view/ButtonClickTests.kt b/src/test/kotlin/net/shadowfacts/cacao/view/button/ButtonClickTests.kt
similarity index 92%
rename from src/test/kotlin/net/shadowfacts/cacao/view/ButtonClickTests.kt
rename to src/test/kotlin/net/shadowfacts/cacao/view/button/ButtonClickTests.kt
index 797ae7f..ad4739b 100644
--- a/src/test/kotlin/net/shadowfacts/cacao/view/ButtonClickTests.kt
+++ b/src/test/kotlin/net/shadowfacts/cacao/view/button/ButtonClickTests.kt
@@ -1,11 +1,10 @@
-package net.shadowfacts.cacao.view
+package net.shadowfacts.cacao.view.button
 
 import net.shadowfacts.cacao.Window
 import net.shadowfacts.cacao.geometry.Point
-import net.shadowfacts.cacao.geometry.Rect
 import net.shadowfacts.cacao.geometry.Size
 import net.shadowfacts.cacao.util.MouseButton
-import net.shadowfacts.cacao.view.button.Button
+import net.shadowfacts.cacao.view.View
 import net.shadowfacts.kiwidsl.dsl
 import org.junit.jupiter.api.Assertions.assertFalse
 import org.junit.jupiter.api.Assertions.assertTrue
diff --git a/src/test/kotlin/net/shadowfacts/cacao/view/EnumButtonTests.kt b/src/test/kotlin/net/shadowfacts/cacao/view/button/EnumButtonTests.kt
similarity index 94%
rename from src/test/kotlin/net/shadowfacts/cacao/view/EnumButtonTests.kt
rename to src/test/kotlin/net/shadowfacts/cacao/view/button/EnumButtonTests.kt
index 9aff795..aa05945 100644
--- a/src/test/kotlin/net/shadowfacts/cacao/view/EnumButtonTests.kt
+++ b/src/test/kotlin/net/shadowfacts/cacao/view/button/EnumButtonTests.kt
@@ -1,11 +1,9 @@
-package net.shadowfacts.cacao.view
+package net.shadowfacts.cacao.view.button
 
 import net.shadowfacts.cacao.Window
 import net.shadowfacts.cacao.geometry.Point
 import net.shadowfacts.cacao.geometry.Rect
 import net.shadowfacts.cacao.util.MouseButton
-import net.shadowfacts.cacao.view.button.EnumButton
-import net.shadowfacts.kiwidsl.dsl
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.BeforeAll
 import org.junit.jupiter.api.BeforeEach