diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/MiniFhir.kt b/app/src/main/java/com/vitorpamplona/amethyst/model/MiniFhir.kt
similarity index 99%
rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/MiniFhir.kt
rename to app/src/main/java/com/vitorpamplona/amethyst/model/MiniFhir.kt
index 7f4b59514..6bf60d156 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/MiniFhir.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/model/MiniFhir.kt
@@ -18,7 +18,7 @@
  * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package com.vitorpamplona.amethyst.ui.note
+package com.vitorpamplona.amethyst.model
 
 import android.util.Log
 import com.fasterxml.jackson.annotation.JsonSubTypes
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt
index ca4517c3e..c4077a767 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt
@@ -112,10 +112,19 @@ import com.vitorpamplona.amethyst.commons.MediaUrlImage
 import com.vitorpamplona.amethyst.commons.MediaUrlVideo
 import com.vitorpamplona.amethyst.commons.RichTextParser
 import com.vitorpamplona.amethyst.model.AddressableNote
+import com.vitorpamplona.amethyst.model.Bundle
 import com.vitorpamplona.amethyst.model.Channel
+import com.vitorpamplona.amethyst.model.FhirElementDatabase
+import com.vitorpamplona.amethyst.model.LensSpecification
 import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.model.Patient
+import com.vitorpamplona.amethyst.model.Practitioner
 import com.vitorpamplona.amethyst.model.RelayBriefInfoCache
+import com.vitorpamplona.amethyst.model.Resource
 import com.vitorpamplona.amethyst.model.User
+import com.vitorpamplona.amethyst.model.VisionPrescription
+import com.vitorpamplona.amethyst.model.findReferenceInDb
+import com.vitorpamplona.amethyst.model.parseResourceBundleOrNull
 import com.vitorpamplona.amethyst.service.CachedGeoLocations
 import com.vitorpamplona.amethyst.ui.actions.EditPostView
 import com.vitorpamplona.amethyst.ui.actions.NewRelayListView