diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/Reviewer.kt b/AnkiDroid/src/main/java/com/ichi2/anki/Reviewer.kt
index c7db05ac20c2..7170d49b7a3e 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/Reviewer.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/Reviewer.kt
@@ -62,6 +62,13 @@ import com.ichi2.anki.Whiteboard.Companion.createInstance
 import com.ichi2.anki.Whiteboard.OnPaintColorChangeListener
 import com.ichi2.anki.cardviewer.Gesture
 import com.ichi2.anki.cardviewer.ViewerCommand
+import com.ichi2.anki.multimedia.audio.AudioRecordingController
+import com.ichi2.anki.multimedia.audio.AudioRecordingController.Companion.generateTempAudioFile
+import com.ichi2.anki.multimedia.audio.AudioRecordingController.Companion.isAudioRecordingSaved
+import com.ichi2.anki.multimedia.audio.AudioRecordingController.Companion.isRecording
+import com.ichi2.anki.multimedia.audio.AudioRecordingController.Companion.setEditorStatus
+import com.ichi2.anki.multimedia.audio.AudioRecordingController.Companion.tempAudioPath
+import com.ichi2.anki.multimedia.audio.AudioRecordingController.RecordingState
 import com.ichi2.anki.noteeditor.NoteEditorLauncher
 import com.ichi2.anki.pages.AnkiServer.Companion.ANKIDROID_JS_PREFIX
 import com.ichi2.anki.pages.AnkiServer.Companion.ANKI_PREFIX
@@ -87,13 +94,6 @@ import com.ichi2.anki.ui.internationalization.toSentenceCase
 import com.ichi2.anki.utils.navBarNeedsScrim
 import com.ichi2.anki.utils.remainingTime
 import com.ichi2.annotations.NeedsTest
-import com.ichi2.audio.AudioRecordingController
-import com.ichi2.audio.AudioRecordingController.Companion.generateTempAudioFile
-import com.ichi2.audio.AudioRecordingController.Companion.isAudioRecordingSaved
-import com.ichi2.audio.AudioRecordingController.Companion.isRecording
-import com.ichi2.audio.AudioRecordingController.Companion.setEditorStatus
-import com.ichi2.audio.AudioRecordingController.Companion.tempAudioPath
-import com.ichi2.audio.AudioRecordingController.RecordingState
 import com.ichi2.libanki.Card
 import com.ichi2.libanki.CardId
 import com.ichi2.libanki.Collection
diff --git a/AnkiDroid/src/main/java/com/ichi2/audio/AudioRecordingController.kt b/AnkiDroid/src/main/java/com/ichi2/anki/multimedia/audio/AudioRecordingController.kt
similarity index 99%
rename from AnkiDroid/src/main/java/com/ichi2/audio/AudioRecordingController.kt
rename to AnkiDroid/src/main/java/com/ichi2/anki/multimedia/audio/AudioRecordingController.kt
index 183ccaa3e132..75f1f2309467 100644
--- a/AnkiDroid/src/main/java/com/ichi2/audio/AudioRecordingController.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/multimedia/audio/AudioRecordingController.kt
@@ -13,7 +13,7 @@
  *  You should have received a copy of the GNU General Public License along with
  *  this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.ichi2.audio
+package com.ichi2.anki.multimedia.audio
 
 import android.app.Activity
 import android.app.Application
@@ -36,6 +36,8 @@ import com.google.android.material.button.MaterialButton
 import com.google.android.material.imageview.ShapeableImageView
 import com.google.android.material.progressindicator.LinearProgressIndicator
 import com.ichi2.anki.R
+import com.ichi2.anki.multimedia.audio.AudioRecordingController.RecordingState.AppendToRecording
+import com.ichi2.anki.multimedia.audio.AudioRecordingController.RecordingState.ImmediatePlayback
 import com.ichi2.anki.multimediacard.AudioRecorder
 import com.ichi2.anki.multimediacard.fields.FieldControllerBase
 import com.ichi2.anki.multimediacard.fields.IFieldController
@@ -46,8 +48,6 @@ import com.ichi2.anki.ui.setOnHoldListener
 import com.ichi2.anki.utils.elapsed
 import com.ichi2.anki.utils.formatAsString
 import com.ichi2.annotations.NeedsTest
-import com.ichi2.audio.AudioRecordingController.RecordingState.AppendToRecording
-import com.ichi2.audio.AudioRecordingController.RecordingState.ImmediatePlayback
 import com.ichi2.compat.Compat
 import com.ichi2.compat.CompatHelper.Companion.compat
 import com.ichi2.ui.FixedTextView
@@ -712,7 +712,7 @@ class AudioRecordingController :
         }
 
         fun setEditorStatus(inEditField: Boolean) {
-            this.inEditField = inEditField
+            Companion.inEditField = inEditField
         }
 
         /** File of the temporary mic record  */
diff --git a/AnkiDroid/src/main/java/com/ichi2/audio/AudioTimer.kt b/AnkiDroid/src/main/java/com/ichi2/anki/multimedia/audio/AudioTimer.kt
similarity index 98%
rename from AnkiDroid/src/main/java/com/ichi2/audio/AudioTimer.kt
rename to AnkiDroid/src/main/java/com/ichi2/anki/multimedia/audio/AudioTimer.kt
index 82abaeb14bde..16049a6708e9 100644
--- a/AnkiDroid/src/main/java/com/ichi2/audio/AudioTimer.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/multimedia/audio/AudioTimer.kt
@@ -13,7 +13,7 @@
  *  You should have received a copy of the GNU General Public License along with
  *  this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.ichi2.audio
+package com.ichi2.anki.multimedia.audio
 
 import android.os.Handler
 import android.os.Looper
diff --git a/AnkiDroid/src/main/java/com/ichi2/audio/AudioWaveform.kt b/AnkiDroid/src/main/java/com/ichi2/anki/multimedia/audio/AudioWaveform.kt
similarity index 99%
rename from AnkiDroid/src/main/java/com/ichi2/audio/AudioWaveform.kt
rename to AnkiDroid/src/main/java/com/ichi2/anki/multimedia/audio/AudioWaveform.kt
index 483aa4c1a620..bbb6a9b32c44 100644
--- a/AnkiDroid/src/main/java/com/ichi2/audio/AudioWaveform.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/multimedia/audio/AudioWaveform.kt
@@ -13,7 +13,7 @@
  *  You should have received a copy of the GNU General Public License along with
  *  this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.ichi2.audio
+package com.ichi2.anki.multimedia.audio
 
 import android.content.Context
 import android.graphics.Canvas
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/activity/MultimediaEditFieldActivity.kt b/AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/activity/MultimediaEditFieldActivity.kt
index 1bccad78bb24..3df609f5b94a 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/activity/MultimediaEditFieldActivity.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/activity/MultimediaEditFieldActivity.kt
@@ -36,6 +36,10 @@ import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleOwner
 import com.ichi2.anki.AnkiActivity
 import com.ichi2.anki.R
+import com.ichi2.anki.multimedia.audio.AudioRecordingController
+import com.ichi2.anki.multimedia.audio.AudioRecordingController.Companion.isAudioRecordingSaved
+import com.ichi2.anki.multimedia.audio.AudioRecordingController.Companion.isRecording
+import com.ichi2.anki.multimedia.audio.AudioRecordingController.Companion.setEditorStatus
 import com.ichi2.anki.multimediacard.IMultimediaEditableNote
 import com.ichi2.anki.multimediacard.fields.AudioRecordingField
 import com.ichi2.anki.multimediacard.fields.BasicImageFieldController
@@ -48,10 +52,6 @@ import com.ichi2.anki.multimediacard.fields.ImageField
 import com.ichi2.anki.multimediacard.fields.MediaClipField
 import com.ichi2.anki.multimediacard.fields.TextField
 import com.ichi2.anki.showThemedToast
-import com.ichi2.audio.AudioRecordingController
-import com.ichi2.audio.AudioRecordingController.Companion.isAudioRecordingSaved
-import com.ichi2.audio.AudioRecordingController.Companion.isRecording
-import com.ichi2.audio.AudioRecordingController.Companion.setEditorStatus
 import com.ichi2.compat.CompatHelper.Companion.getSerializableCompat
 import com.ichi2.utils.KotlinCleanup
 import com.ichi2.utils.Permissions
diff --git a/AnkiDroid/src/main/res/layout/activity_audio_recording.xml b/AnkiDroid/src/main/res/layout/activity_audio_recording.xml
index 1643e9116e04..b16eea51cc97 100644
--- a/AnkiDroid/src/main/res/layout/activity_audio_recording.xml
+++ b/AnkiDroid/src/main/res/layout/activity_audio_recording.xml
@@ -22,7 +22,7 @@
     android:layout_height="wrap_content"
     android:orientation="vertical"
     android:keepScreenOn="true"
-    tools:context="com.ichi2.audio.AudioRecordingController">
+    tools:context=".multimedia.audio.AudioRecordingController">
 
     <TextView
         android:id="@+id/audio_time_track"
@@ -39,7 +39,7 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-        <com.ichi2.audio.AudioWaveform
+        <com.ichi2.anki.multimedia.audio.AudioWaveform
             android:id="@+id/audio_waveform_view"
             android:layout_width="match_parent"
             android:layout_height="300px"
diff --git a/AnkiDroid/src/main/res/layout/activity_audio_recording_reviewer.xml b/AnkiDroid/src/main/res/layout/activity_audio_recording_reviewer.xml
index 55917f76ad91..21922f6766f2 100644
--- a/AnkiDroid/src/main/res/layout/activity_audio_recording_reviewer.xml
+++ b/AnkiDroid/src/main/res/layout/activity_audio_recording_reviewer.xml
@@ -23,7 +23,7 @@
     android:layout_height="wrap_content"
     android:orientation="vertical"
     android:keepScreenOn="true"
-    tools:context="com.ichi2.audio.AudioRecordingController">
+    tools:context=".multimedia.audio.AudioRecordingController">
 
     <RelativeLayout
         android:id="@+id/record_buttons_layout"
@@ -36,7 +36,7 @@
         android:background="@drawable/bg_rounded_drop_shadow"
         android:orientation="horizontal">
 
-        <com.ichi2.audio.AudioWaveform
+        <com.ichi2.anki.multimedia.audio.AudioWaveform
             android:id="@+id/audio_waveform_view"
             android:layout_height="40dp"
             android:layout_width="match_parent"
diff --git a/AnkiDroid/src/test/java/com/ichi2/audio/AudioRecordingControllerTest.kt b/AnkiDroid/src/test/java/com/ichi2/audio/AudioRecordingControllerTest.kt
index b7f1d48b6fd8..ae82a62594fb 100644
--- a/AnkiDroid/src/test/java/com/ichi2/audio/AudioRecordingControllerTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/audio/AudioRecordingControllerTest.kt
@@ -22,8 +22,9 @@ import com.google.android.material.button.MaterialButton
 import com.ichi2.anki.R
 import com.ichi2.anki.Reviewer
 import com.ichi2.anki.RobolectricTest
+import com.ichi2.anki.multimedia.audio.AudioRecordingController
+import com.ichi2.anki.multimedia.audio.AudioRecordingController.RecordingState
 import com.ichi2.anki.utils.formatAsString
-import com.ichi2.audio.AudioRecordingController.RecordingState
 import com.ichi2.themes.Themes
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.equalTo