diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidResearch.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidResearch.kt
index 2a5ab14df..41e754cf6 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidResearch.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidResearch.kt
@@ -25,6 +25,26 @@ import java.io.InputStream
 import kotlin.math.absoluteValue
 
 class AndroidResearch(val type: AndroidResearchType, val capability: MatteryPlayerCapability) : INBTSerializable<CompoundTag> {
+	/**
+	 * Fired on main event bus [MinecraftForge.EVENT_BUS]
+	 */
+	data class OnResearched(val research: AndroidResearch) : Event()
+
+	/**
+	 * Fired on main event bus [MinecraftForge.EVENT_BUS]
+	 */
+	data class OnUnResearched(val research: AndroidResearch) : Event()
+
+	/**
+	 * Fired on main event bus [MinecraftForge.EVENT_BUS]
+	 */
+	data class OnRefunded(val research: AndroidResearch) : Event()
+
+	/**
+	 * Fired on main event bus [MinecraftForge.EVENT_BUS]
+	 */
+	data class GatherTooltipsEvent(val research: AndroidResearch, val tooltips: MutableList<Component>) : Event()
+
 	val ply: Player get() = capability.ply
 
 	val synchronizer = FieldSynchronizer()
@@ -51,9 +71,6 @@ class AndroidResearch(val type: AndroidResearchType, val capability: MatteryPlay
 		isResearched = false
 	}
 
-	data class OnResearched(val research: AndroidResearch) : Event()
-	data class OnUnResearched(val research: AndroidResearch) : Event()
-
 	fun onUnResearched() {
 		for (result in type.results) {
 			result.onUnResearched(this)
@@ -119,8 +136,6 @@ class AndroidResearch(val type: AndroidResearchType, val capability: MatteryPlay
 		return true
 	}
 
-	data class OnRefunded(val research: AndroidResearch) : Event()
-
 	/**
 	 * Grants all (or some) resources back consumed by [consumeResearchCost].
 	 *
@@ -256,11 +271,6 @@ class AndroidResearch(val type: AndroidResearchType, val capability: MatteryPlay
 		return false
 	}
 
-	/**
-	 * Fired on main event bus each time research lines are being gathered
-	 */
-	data class GatherTooltipsEvent(val research: AndroidResearch, val tooltips: MutableList<Component>) : Event()
-
 	/**
 	 * List of all tooltip lines for this research
 	 */