diff --git a/src/components/InteractiveObjects/CharacterObject.js b/src/components/InteractiveObjects/CharacterObject/CharacterObject.js
similarity index 100%
rename from src/components/InteractiveObjects/CharacterObject.js
rename to src/components/InteractiveObjects/CharacterObject/CharacterObject.js
diff --git a/src/components/InteractiveObjects/CharacterObject.vue b/src/components/InteractiveObjects/CharacterObject/CharacterObject.vue
similarity index 100%
rename from src/components/InteractiveObjects/CharacterObject.vue
rename to src/components/InteractiveObjects/CharacterObject/CharacterObject.vue
diff --git a/src/components/InteractiveObjects/ClassicPuzzle.js b/src/components/InteractiveObjects/ClassicPuzzle/ClassicPuzzle.js
similarity index 100%
rename from src/components/InteractiveObjects/ClassicPuzzle.js
rename to src/components/InteractiveObjects/ClassicPuzzle/ClassicPuzzle.js
diff --git a/src/components/InteractiveObjects/ClassicPuzzle.vue b/src/components/InteractiveObjects/ClassicPuzzle/ClassicPuzzle.vue
similarity index 100%
rename from src/components/InteractiveObjects/ClassicPuzzle.vue
rename to src/components/InteractiveObjects/ClassicPuzzle/ClassicPuzzle.vue
diff --git a/src/components/InteractiveObjects/GenericObject.js b/src/components/InteractiveObjects/GenericObject/GenericObject.js
similarity index 100%
rename from src/components/InteractiveObjects/GenericObject.js
rename to src/components/InteractiveObjects/GenericObject/GenericObject.js
diff --git a/src/components/InteractiveObjects/GenericObject.vue b/src/components/InteractiveObjects/GenericObject/GenericObject.vue
similarity index 100%
rename from src/components/InteractiveObjects/GenericObject.vue
rename to src/components/InteractiveObjects/GenericObject/GenericObject.vue
diff --git a/src/components/InteractiveObjects/ImageObject.js b/src/components/InteractiveObjects/ImageObject/ImageObject.js
similarity index 89%
rename from src/components/InteractiveObjects/ImageObject.js
rename to src/components/InteractiveObjects/ImageObject/ImageObject.js
index 7c529d9..61cd49e 100644
--- a/src/components/InteractiveObjects/ImageObject.js
+++ b/src/components/InteractiveObjects/ImageObject/ImageObject.js
@@ -3,6 +3,10 @@ import { MeshStandardMaterial, MeshBasicMaterial, PlaneGeometry, Mesh, DoubleSid
 class ImageObject {
     constructor(engine, obj) {
         return new Promise(async(resolve, reject)=>{
+            if (obj.$go){
+                obj.path = engine.assetPath;
+                obj.value = obj.$go.asset.name;
+            }
             var t = await engine.loadTexture(obj.value, obj.path)
             var mp = {
                 map: t,
diff --git a/src/components/InteractiveObjects/ImageObject/ImageObject.vue b/src/components/InteractiveObjects/ImageObject/ImageObject.vue
new file mode 100644
index 0000000..6bf33f8
--- /dev/null
+++ b/src/components/InteractiveObjects/ImageObject/ImageObject.vue
@@ -0,0 +1,34 @@
+<template>
+    <div v-if="modelValue.go">
+        <v-img :src="`/asset/thumb/${modelValue.go}.webp`" />
+        <div class="text-caption text-center">{{ modelValue.title }}</div>
+    </div>
+    <asset-selector @select="assignTexture" :type="['Texture']">
+        <template v-slot:activator="props">
+            <v-btn v-bind="props" prepend-icon="mdi-video-box" color="deep-orange-darken-4" block>{{ l.chooseImage }}</v-btn>
+        </template>
+    </asset-selector>
+</template>
+
+<script>
+
+export default {
+    data(){
+        return {
+            active: false
+        }
+    },
+    mounted(){
+        this.active = true;
+    },
+    props:{
+        modelValue: Object
+    },
+    methods:{
+        assignTexture(e){
+            this.modelValue.go = e.id;
+            this.modelValue.title = e.name;
+        }
+    }
+}
+</script>
\ No newline at end of file
diff --git a/src/components/InteractiveObjects/InteractiveObject.js b/src/components/InteractiveObjects/InteractiveObject.js
index 452bd4d..b9b4874 100644
--- a/src/components/InteractiveObjects/InteractiveObject.js
+++ b/src/components/InteractiveObjects/InteractiveObject.js
@@ -1,24 +1,24 @@
 import { Group, MeshStandardMaterial, Mesh, SphereGeometry, Vector3 } from "three";
 import { EventManager } from '@/lib/EventManager';
 
-import { GenericObject } from "./GenericObject";
-import { TextObject } from "./TextObject";
-import { ImageObject } from "./ImageObject";
+import { GenericObject } from "./GenericObject/GenericObject";
+import { TextObject } from "./TextObject/TextObject";
+import { ImageObject } from "./ImageObject/ImageObject";
 import { GltfObject } from "./GltfObject";
-import { CharacterObject } from "./CharacterObject";
-import { VideoPlayer } from "./VideoPlayer";
-import { PuzzleGame1 } from "./PuzzleGame1";
-import { PuzzleGame2 } from "./PuzzleGame2";
+import { CharacterObject } from "./CharacterObject/CharacterObject";
+import { VideoPlayer } from "./VideoPlayer/VideoPlayer";
+import { PuzzleGame1 } from "./PuzzleGame1/PuzzleGame1";
+import { PuzzleGame2 } from "./PuzzleGame2/PuzzleGame2";
 // import { Game3 } from "./games/Game3";
 import { PuzzleGame4 } from "./PuzzleGame4";
-import { ClassicPuzzle } from "./ClassicPuzzle";
-import { PairMatchingGame } from "./PairMatchingGame";
-import { SingleQuestion } from "./SingleQuestion";
+import { ClassicPuzzle } from "./ClassicPuzzle/ClassicPuzzle";
+import { PairMatchingGame } from "./PairMatchingGame/PairMatchingGame";
+import { SingleQuestion } from "./SingleQuestion/SingleQuestion";
 // import { Game5 } from "./games/Game5";
 // import { Game6 } from "./games/Game6";
 import { MazeQuizGame } from "./MazeQuizGame/MazeQuizGame";
-import { Particles } from "./Particles";
-import { SceneSwitcher } from "./SceneSwitcher";
+import { Particles } from "./Particles/Particles";
+import { SceneSwitcher } from "./SceneSwitcher/SceneSwitcher";
 import { GameEngine  } from "@/lib/GameEngine";
 
 const InteractiveObjectsImports = { 
@@ -174,6 +174,8 @@ const InteractiveObjectTypes = [
     'VideoPlayer', 
     'Particles', 
     'SceneSwitcher',
+    'TextObject',
+    'ImageObject'
 ];
 
 export { InteractiveObject, InteractiveObjectTypes, InteractiveObjectsImports }
\ No newline at end of file
diff --git a/src/components/InteractiveObjects/MazeQuizGame/MazeQuizGame.vue b/src/components/InteractiveObjects/MazeQuizGame/MazeQuizGame.vue
index 17845bd..346fb3c 100644
--- a/src/components/InteractiveObjects/MazeQuizGame/MazeQuizGame.vue
+++ b/src/components/InteractiveObjects/MazeQuizGame/MazeQuizGame.vue
@@ -47,7 +47,7 @@
 </template>
 
 <script>
-import SceneSwitcher from '../SceneSwitcher.vue';
+import SceneSwitcher from '../SceneSwitcher/SceneSwitcher.vue';
 
 export default {
     props:['modelValue'],
diff --git a/src/components/InteractiveObjects/PairMatchingGame.js b/src/components/InteractiveObjects/PairMatchingGame/PairMatchingGame.js
similarity index 100%
rename from src/components/InteractiveObjects/PairMatchingGame.js
rename to src/components/InteractiveObjects/PairMatchingGame/PairMatchingGame.js
diff --git a/src/components/InteractiveObjects/PairMatchingGame.vue b/src/components/InteractiveObjects/PairMatchingGame/PairMatchingGame.vue
similarity index 100%
rename from src/components/InteractiveObjects/PairMatchingGame.vue
rename to src/components/InteractiveObjects/PairMatchingGame/PairMatchingGame.vue
diff --git a/src/components/InteractiveObjects/Particles.js b/src/components/InteractiveObjects/Particles/Particles.js
similarity index 100%
rename from src/components/InteractiveObjects/Particles.js
rename to src/components/InteractiveObjects/Particles/Particles.js
diff --git a/src/components/InteractiveObjects/Particles.vue b/src/components/InteractiveObjects/Particles/Particles.vue
similarity index 100%
rename from src/components/InteractiveObjects/Particles.vue
rename to src/components/InteractiveObjects/Particles/Particles.vue
diff --git a/src/components/InteractiveObjects/PuzzleGame1.js b/src/components/InteractiveObjects/PuzzleGame1/PuzzleGame1.js
similarity index 100%
rename from src/components/InteractiveObjects/PuzzleGame1.js
rename to src/components/InteractiveObjects/PuzzleGame1/PuzzleGame1.js
diff --git a/src/components/InteractiveObjects/PuzzleGame1.vue b/src/components/InteractiveObjects/PuzzleGame1/PuzzleGame1.vue
similarity index 100%
rename from src/components/InteractiveObjects/PuzzleGame1.vue
rename to src/components/InteractiveObjects/PuzzleGame1/PuzzleGame1.vue
diff --git a/src/components/InteractiveObjects/PuzzleGame2.js b/src/components/InteractiveObjects/PuzzleGame2/PuzzleGame2.js
similarity index 100%
rename from src/components/InteractiveObjects/PuzzleGame2.js
rename to src/components/InteractiveObjects/PuzzleGame2/PuzzleGame2.js
diff --git a/src/components/InteractiveObjects/PuzzleGame2.vue b/src/components/InteractiveObjects/PuzzleGame2/PuzzleGame2.vue
similarity index 100%
rename from src/components/InteractiveObjects/PuzzleGame2.vue
rename to src/components/InteractiveObjects/PuzzleGame2/PuzzleGame2.vue
diff --git a/src/components/InteractiveObjects/SceneSwitcher.js b/src/components/InteractiveObjects/SceneSwitcher/SceneSwitcher.js
similarity index 100%
rename from src/components/InteractiveObjects/SceneSwitcher.js
rename to src/components/InteractiveObjects/SceneSwitcher/SceneSwitcher.js
diff --git a/src/components/InteractiveObjects/SceneSwitcher.vue b/src/components/InteractiveObjects/SceneSwitcher/SceneSwitcher.vue
similarity index 95%
rename from src/components/InteractiveObjects/SceneSwitcher.vue
rename to src/components/InteractiveObjects/SceneSwitcher/SceneSwitcher.vue
index 56b2a5b..ef76ef6 100644
--- a/src/components/InteractiveObjects/SceneSwitcher.vue
+++ b/src/components/InteractiveObjects/SceneSwitcher/SceneSwitcher.vue
@@ -11,7 +11,7 @@
 <script>
 
 import { computed } from 'vue';
-import OffsetLine from '../SceneDesigner/OffsetLine.vue';
+import OffsetLine from '../../SceneDesigner/OffsetLine.vue';
 
 export default {
     components:{ OffsetLine },
diff --git a/src/components/InteractiveObjects/SingleQuestion.js b/src/components/InteractiveObjects/SingleQuestion/SingleQuestion.js
similarity index 95%
rename from src/components/InteractiveObjects/SingleQuestion.js
rename to src/components/InteractiveObjects/SingleQuestion/SingleQuestion.js
index c5b659a..801e31d 100644
--- a/src/components/InteractiveObjects/SingleQuestion.js
+++ b/src/components/InteractiveObjects/SingleQuestion/SingleQuestion.js
@@ -1,6 +1,6 @@
 import { Group, Color } from 'three';
 import { EventManager } from '@/lib/EventManager';
-import { TextObject } from './TextObject';
+import { TextObject } from '../TextObject/TextObject';
 import Utils from '#/app/Utils';
 
 class SingleQuestion extends EventManager {
diff --git a/src/components/InteractiveObjects/SingleQuestion.vue b/src/components/InteractiveObjects/SingleQuestion/SingleQuestion.vue
similarity index 100%
rename from src/components/InteractiveObjects/SingleQuestion.vue
rename to src/components/InteractiveObjects/SingleQuestion/SingleQuestion.vue
diff --git a/src/components/InteractiveObjects/TextObject.js b/src/components/InteractiveObjects/TextObject/TextObject.js
similarity index 100%
rename from src/components/InteractiveObjects/TextObject.js
rename to src/components/InteractiveObjects/TextObject/TextObject.js
diff --git a/src/components/InteractiveObjects/TextObject/TextObject.vue b/src/components/InteractiveObjects/TextObject/TextObject.vue
new file mode 100644
index 0000000..56adea7
--- /dev/null
+++ b/src/components/InteractiveObjects/TextObject/TextObject.vue
@@ -0,0 +1,26 @@
+<template>
+    <div>
+        <v-textarea :label="l.text" v-model="modelValue.text" class="mt-3"></v-textarea>
+        <v-number-input density="compact" :precision="null" :label="l.maxWidth" :step="0.1" v-model="modelValue.maxWidth"></v-number-input>
+    </div>
+</template>
+
+<script>
+
+export default {
+    data(){
+        return {
+            active: false
+        }
+    },
+    mounted(){
+        this.modelValue.maxWidth ??= 1;
+        this.active = true;
+    },
+    props:{
+        modelValue: Object
+    },
+    methods:{
+    }
+}
+</script>
\ No newline at end of file
diff --git a/src/components/InteractiveObjects/VideoPlayer.js b/src/components/InteractiveObjects/VideoPlayer/VideoPlayer.js
similarity index 100%
rename from src/components/InteractiveObjects/VideoPlayer.js
rename to src/components/InteractiveObjects/VideoPlayer/VideoPlayer.js
diff --git a/src/components/InteractiveObjects/VideoPlayer.vue b/src/components/InteractiveObjects/VideoPlayer/VideoPlayer.vue
similarity index 100%
rename from src/components/InteractiveObjects/VideoPlayer.vue
rename to src/components/InteractiveObjects/VideoPlayer/VideoPlayer.vue
diff --git a/src/components/SceneDesigner/GameObject.vue b/src/components/SceneDesigner/GameObject.vue
index e455711..9828b6c 100644
--- a/src/components/SceneDesigner/GameObject.vue
+++ b/src/components/SceneDesigner/GameObject.vue
@@ -46,23 +46,25 @@
 <script>
 import SvgIcon from './SvgIcon.vue';
 
-import VideoPlayer from '../InteractiveObjects/VideoPlayer.vue';
-import PuzzleGame1 from '../InteractiveObjects/PuzzleGame1.vue';
-import PuzzleGame2 from '../InteractiveObjects/PuzzleGame2.vue';
+import VideoPlayer from '../InteractiveObjects/VideoPlayer/VideoPlayer.vue';
+import TextObject from '../InteractiveObjects/TextObject/TextObject.vue';
+import ImageObject from '../InteractiveObjects/ImageObject/ImageObject.vue';
+import PuzzleGame1 from '../InteractiveObjects/PuzzleGame1/PuzzleGame1.vue';
+import PuzzleGame2 from '../InteractiveObjects/PuzzleGame2/PuzzleGame2.vue';
 import MazeQuizGame from '../InteractiveObjects/MazeQuizGame/MazeQuizGame.vue';
-import ClassicPuzzle from '../InteractiveObjects/ClassicPuzzle.vue';
-import PairMatchingGame from '../InteractiveObjects/PairMatchingGame.vue';
-import SingleQuestion from '../InteractiveObjects/SingleQuestion.vue';
-import Particles from '../InteractiveObjects/Particles.vue';
-import GenericObject from '../InteractiveObjects/GenericObject.vue';
-import CharacterObject from '../InteractiveObjects/CharacterObject.vue';
-import SceneSwitcher from '../InteractiveObjects/SceneSwitcher.vue';
+import ClassicPuzzle from '../InteractiveObjects/ClassicPuzzle/ClassicPuzzle.vue';
+import PairMatchingGame from '../InteractiveObjects/PairMatchingGame/PairMatchingGame.vue';
+import SingleQuestion from '../InteractiveObjects/SingleQuestion/SingleQuestion.vue';
+import Particles from '../InteractiveObjects/Particles/Particles.vue';
+import GenericObject from '../InteractiveObjects/GenericObject/GenericObject.vue';
+import CharacterObject from '../InteractiveObjects/CharacterObject/CharacterObject.vue';
+import SceneSwitcher from '../InteractiveObjects/SceneSwitcher/SceneSwitcher.vue';
 import OffsetLine from './OffsetLine.vue';
 
 import { InteractiveObjectTypes } from '../InteractiveObjects/InteractiveObject';
 
 const components = { 
-    SvgIcon, OffsetLine, GenericObject, CharacterObject, VideoPlayer, SceneSwitcher,
+    SvgIcon, OffsetLine, GenericObject, CharacterObject, VideoPlayer, TextObject, ImageObject, SceneSwitcher,
     PuzzleGame1, PuzzleGame2, MazeQuizGame, Particles, ClassicPuzzle, PairMatchingGame, SingleQuestion
 };
 
diff --git a/src/lib/Dashboard.js b/src/lib/Dashboard.js
index affdfb3..8424b74 100644
--- a/src/lib/Dashboard.js
+++ b/src/lib/Dashboard.js
@@ -6,7 +6,7 @@ import {
 import { Text } from "troika-three-text";
 import { EventManager } from "./EventManager";
 import Utils from "#/app/Utils";
-import { TextObject } from "@/components/InteractiveObjects/TextObject";
+import { TextObject } from "@/components/InteractiveObjects/TextObject/TextObject";
 class DashBoard extends EventManager {
 	#points = 0;
 	constructor(engine) {
diff --git a/src/lib/GameManager.js b/src/lib/GameManager.js
index 1b2ddbf..718c0b4 100644
--- a/src/lib/GameManager.js
+++ b/src/lib/GameManager.js
@@ -1,5 +1,5 @@
 import { InteractiveObject } from "@/components/InteractiveObjects/InteractiveObject";
-import { VideoPlayer } from '@/components/InteractiveObjects/VideoPlayer';
+import { VideoPlayer } from '@/components/InteractiveObjects/VideoPlayer/VideoPlayer';
 import { Hero } from "./Hero";
 import { api } from "./Api";
 import { EventManager } from "./EventManager";
diff --git a/src/plugins/lang.js b/src/plugins/lang.js
index a99535f..e08e08f 100644
--- a/src/plugins/lang.js
+++ b/src/plugins/lang.js
@@ -71,7 +71,9 @@ const lang = {
         selectIntroduction: 'Select introduction video',
         selectAmbientSound: 'Select ambient music',
         width: 'Width',
+        maxWidth: 'Max width',
         height: 'Height',
+        text: 'Text',
         question: 'Question',
         addQuestion: 'Add question',
         manageQuestions: 'Manage questions',
@@ -137,6 +139,8 @@ const lang = {
             PairMatchingGame: 'Pair Matching Game',
             SingleQuestion: 'Single Question',
             VideoPlayer: 'Video Player',
+            TextObject: 'Text',
+            ImageObject: 'Image',
             Particles: 'Particles',
             SceneSwitcher: 'Scene Switcher',
         },
@@ -234,7 +238,9 @@ const lang = {
         selectIntroduction: 'Избери въвеждащо видео',
         selectAmbientSound: 'Избери фонова музика',
         width: 'Ширина',
+        maxWidth: 'Максимална ширина',
         height: 'Височина',
+        text: 'Текст',
         question: 'Въпрос',
         addQuestion: 'Добавяне на въпрос',
         manageQuestions: 'Въвеждане на въпросите',
@@ -300,6 +306,8 @@ const lang = {
             PairMatchingGame: 'Игра за съпоставяне на двойки',
             SingleQuestion: 'Единичен въпрос',
             VideoPlayer: 'Видео обект',
+            TextObject: 'Текст',
+            ImageObject: 'Изображение',
             Particles: 'Частици',
             SceneSwitcher: 'Превключвател на сцени',
         },