diff --git a/Assets/ETSI.ARF.meta b/Assets/ETSI.ARF.meta
deleted file mode 100644
index 39393399cb183a406c3314c279a0238d6393de1d..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: a1d6d8755812e254dbe089251c2bddc5
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/ETSI.ARF/ARF World Storage API.meta b/Assets/ETSI.ARF/ARF World Storage API.meta
deleted file mode 100644
index 60d119b803a736e720bc53e5d66ff2b272a92e3e..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API.meta	
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: e4474d3a0bcb9c44d9fd67da1ebb77c9
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Editor.meta b/Assets/ETSI.ARF/ARF World Storage API/Editor.meta
deleted file mode 100644
index 6994f74f0a97610f55751022a1e9ad5d0e74b9a7..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/Editor.meta	
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 5fec767e3d1954e4e8af5dc2b3d4dd5d
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Editor/Graph.meta b/Assets/ETSI.ARF/ARF World Storage API/Editor/Graph.meta
deleted file mode 100644
index 4a78fd53b5e2354ed1159de1379e3445b641c58a..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/Editor/Graph.meta	
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 452c5e5fd6387ad4984356aa2f11d245
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Editor/Graph/ARFEdgeLink.cs b/Assets/ETSI.ARF/ARF World Storage API/Editor/Graph/ARFEdgeLink.cs
deleted file mode 100644
index 3a9e71e2a83e1a1aed745c8d0892f9808dc77683..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/Editor/Graph/ARFEdgeLink.cs	
+++ /dev/null
@@ -1,84 +0,0 @@
-//
-// ARF - Augmented Reality Framework (ETSI ISG ARF)
-//
-// Copyright 2024 ETSI
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// Last change: July 2022
-//
-
-using UnityEditor;
-using UnityEditor.Experimental.GraphView;
-using UnityEngine;
-using UnityEngine.UIElements;
-
-using ETSI.ARF.WorldStorage.Editor.Windows;
-using ETSI.ARF.OpenAPI.WorldStorage;
-
-namespace ETSI.ARF.WorldStorage.Editor.Graph
-{
-    public class ARFEdgeLink : Edge
-    {
-        public WorldLink worldLink;
-        public string GUID;
-
-        public Image savedIcon;
-
-        public ARFEdgeLink()
-        {
-            var doubleClickManipulator = new Clickable(Clicked);
-            doubleClickManipulator.activators.Clear();
-            doubleClickManipulator.activators.Add(new ManipulatorActivationFilter { button = MouseButton.LeftMouse, clickCount = 2 });
-            this.AddManipulator(doubleClickManipulator);
-        }
-        public void Clicked()
-        {
-            Debug.Log(worldLink.ToJson());
-            GraphEditorWindow.ShowWindow(this);
-        }
-        public void MarkUnsaved()
-        {
-            if (savedIcon == null)
-            {
-                //the icon to add if the node does not correspond to an element in the server
-                Texture2D warningImage = (Texture2D)AssetDatabase.LoadAssetAtPath("Assets/ETSI.ARF/ARF World Storage API/Images/cloud.png", typeof(Texture2D));
-                savedIcon = new Image
-                {
-                    image = warningImage
-                };
-                savedIcon.style.width = 18;
-                savedIcon.style.height = 18;
-                savedIcon.style.minWidth = 18;
-                savedIcon.style.minHeight = 18;
-                savedIcon.style.flexGrow = 1;
-                savedIcon.style.alignSelf = Align.Center;
-
-            }
-            if (!edgeControl.Contains(savedIcon))
-            {
-                edgeControl.Add(savedIcon);
-            }
-            tooltip = "This element is not synchronized with the World Storage";
-        }
-
-        public void MarkSaved()
-        {
-            if (edgeControl.Contains(savedIcon))
-            {
-                edgeControl.Remove(savedIcon);
-                tooltip = "";
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Editor/Graph/ARFEdgeLink.cs.meta b/Assets/ETSI.ARF/ARF World Storage API/Editor/Graph/ARFEdgeLink.cs.meta
deleted file mode 100644
index 723d9ee5a57433d64e93157394dddc87a891f90e..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/Editor/Graph/ARFEdgeLink.cs.meta	
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 81a94cf483be20040aa4fe8d9f93d5c5
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Editor/Graph/ARFGraphView.cs b/Assets/ETSI.ARF/ARF World Storage API/Editor/Graph/ARFGraphView.cs
deleted file mode 100644
index 1f8f333ec94f6feb24e75477c19af9242c7f178e..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/Editor/Graph/ARFGraphView.cs	
+++ /dev/null
@@ -1,684 +0,0 @@
-//
-// ARF - Augmented Reality Framework (ETSI ISG ARF)
-//
-// Copyright 2024 ETSI
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// Last change: June 2024
-//
-
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-
-using UnityEngine;
-using UnityEngine.UIElements;
-using UnityEditor.Experimental.GraphView;
-using UnityEditor;
-
-using ETSI.ARF.WorldStorage.Editor.Graph;
-using ETSI.ARF.WorldStorage.Editor.Windows;
-
-using ETSI.ARF.WorldStorage.REST;
-using ETSI.ARF.OpenAPI.WorldStorage;
-
-namespace ETSI.ARF.WorldStorage.UI
-{
-    public class ARFGraphView : GraphView
-    {
-        public WorldStorageServer worldStorageServer;
-        public WorldStorageUser worldStorageUser;
-
-        public ARFGraphView()
-        {
-            SetupZoom(ContentZoomer.DefaultMinScale, ContentZoomer.DefaultMaxScale);
-
-            //deleSection
-            deleteSelection += DeleteFunc;
-
-
-            this.AddManipulator(new ContentDragger());
-            this.AddManipulator(new SelectionDragger());
-            this.AddManipulator(new RectangleSelector());
-
-        }
-
-        //method called when an element is deleted from the graphview
-        public void DeleteFunc(string operationName, AskUser askUser)
-        {
-            //build the message to list all the deleted elements
-            String message = "Are you sure you want to delete ";
-            if (selection.Count > 1)
-            {
-                message += selection.Count + " elements ?";
-            }
-            else
-            {
-                message += "this element ?";
-            }
-
-            //remove from the graph all the deleted elements
-            if (EditorUtility.DisplayDialog("Deleting elements", message, "Yes", "No"))
-            {
-                if (SaveInfo.instance.elemsToRemove == null)
-                {
-                    SaveInfo.instance.elemsToRemove = new Dictionary<string, Type>();
-                }
-                foreach (GraphElement elt in selection.ToArray())
-                {
-                    ARFNodeWorldAnchor nodeAnchor = elt as ARFNodeWorldAnchor;
-                    if (nodeAnchor != null)
-                    {
-                        nodeAnchor.DisconnectAllPorts(this);
-                        if (SaveInfo.instance.nodePositions.ContainsKey(nodeAnchor.GUID))
-                        {
-                            SaveInfo.instance.elemsToRemove.Add(nodeAnchor.GUID, typeof(WorldAnchor));
-                        }
-                        RemoveElement(elt);
-                        continue;
-                    }
-                    ARFNodeTrackable nodeTrackable = elt as ARFNodeTrackable;
-                    if (nodeTrackable != null)
-                    {
-                        nodeTrackable.DisconnectAllPorts(this);
-                        if (SaveInfo.instance.nodePositions.ContainsKey(nodeTrackable.GUID))
-                        {
-                            SaveInfo.instance.elemsToRemove.Add(nodeTrackable.GUID, typeof(Trackable));
-                        }
-                        RemoveElement(elt);
-                        continue;
-                    }
-                    ARFEdgeLink edgeLink = elt as ARFEdgeLink;
-                    if (edgeLink != null)
-                    {
-                        edgeLink.input.Disconnect(edgeLink);
-                        edgeLink.output.Disconnect(edgeLink);
-                        if (SaveInfo.instance.linkIds.Contains(edgeLink.GUID))
-                        {
-                            SaveInfo.instance.elemsToRemove.Add(edgeLink.GUID, typeof(WorldLink));
-                        }
-                        RemoveElement(elt);
-                        continue;
-                    }
-                }
-            }
-
-            GraphEditorWindow.ResetWindow();
-        }
-
-        public override void BuildContextualMenu(UnityEngine.UIElements.ContextualMenuPopulateEvent evt)
-        {
-            Vector2 localMousePos = evt.localMousePosition;
-            Vector2 actualGraphPosition = viewTransform.matrix.inverse.MultiplyPoint(localMousePos);
-
-            if (!(evt.target is ARFNode || evt.target is Group || evt.target is ARFEdgeLink))
-            {
-                evt.menu.AppendSeparator();
-                evt.menu.AppendAction("Save graph", delegate
-                {
-                    if (ServerAndLocalDifferent())
-                    {
-                        SaveInServer();
-                    }
-                }, (DropdownMenuAction a) => DropdownMenuAction.Status.Normal);
-                evt.menu.AppendAction("Reload graph", delegate
-                {
-                    if (ServerAndLocalDifferent() && EditorUtility.DisplayDialog("Saving node positions", "The World Graph has been modified. \nWould you like to push the modifications to the server ?", "Yes", "No"))
-                    {
-                        SaveInServer();
-                    }
-                    Reload();
-                    SaveInfo.instance.toReFrame = true;
-                }, (DropdownMenuAction a) => DropdownMenuAction.Status.Normal);
-                evt.menu.AppendAction("Create Trackable", delegate
-                {
-                    //generate the Trackables's attributes
-                    EncodingInformationStructure trackableEncodingInformation = new EncodingInformationStructure()
-                    {
-                        DataFormat = EncodingInformationStructureDataFormat.OTHER,
-                        Version = "0"
-                    };
-
-                    Transform3D localCRS = new Transform3D();
-                    for (int i = 0; i < 15; i++)
-                    {
-                        localCRS.Add(0);
-                    }
-                    localCRS.Add(1);
-
-                    Size trackableSize = new Size();
-                    for (int i = 0; i < 3; i++)
-                    {
-                        trackableSize.Add(0);
-                    }
-
-                    string name = "DefaultTrackable";
-
-                    //trying to add number after default name
-                    var defaultNodes = nodes.ToList().Where(node => node.title.StartsWith("DefaultTrackable"));
-                    if (defaultNodes.Any())
-                    {
-                        for (int i = 0; i < defaultNodes.Count(); i++)
-                        {
-                            Debug.Log($"{i} : " + defaultNodes.ElementAt(i).title);
-                            if (!(defaultNodes.Where(node => node.title.EndsWith((i + 1).ToString() + ")")).Any()))
-                            {
-                                name = name + " (" + (i + 1).ToString() + ")";
-                                break;
-                            }
-                        }
-                    }
-
-                    Trackable trackable = new Trackable(name)
-                    {
-                        UUID = Guid.NewGuid(),
-                        CreatorUUID = Guid.Parse(worldStorageUser.UUID),
-                        TrackableType = TrackableType.OTHER,
-                        TrackableEncodingInformation = trackableEncodingInformation,
-                        TrackablePayload = new byte[64],
-                        LocalCRS = localCRS,
-                        Unit = UnitSystem.CM,
-                        TrackableSize = trackableSize
-                    };
-
-                    selection.Clear();
-                    var node = CreateTrackableNode(trackable, actualGraphPosition.x, actualGraphPosition.y);
-                    node.MarkUnsaved();
-                    GraphEditorWindow.ShowWindow((ARFNodeTrackable)node);
-
-                }, (DropdownMenuAction a) => DropdownMenuAction.Status.Normal);
-                evt.menu.AppendAction("Create World Anchor", delegate
-                {
-                    //generate the worldAnchor attributes
-                    Transform3D localCRS = new Transform3D();
-                    for (int i = 0; i < 15; i++)
-                    {
-                        localCRS.Add(0);
-                    }
-                    localCRS.Add(1);
-
-                    Size worldAnchorSize = new Size();
-                    for (int i = 0; i < 3; i++)
-                    {
-                        worldAnchorSize.Add(0);
-                    }
-
-                    string name = "DefaultWorldAnchor";
-
-                    //trying to add number after default name
-                    var defaultNodes = nodes.ToList().Where(node => node.title.StartsWith("DefaultWorldAnchor"));
-                    if (defaultNodes.Any())
-                    {
-                        for (int i = 0; i < defaultNodes.Count(); i++)
-                        {
-                            if (!(defaultNodes.Where(node => node.title.EndsWith((i + 1).ToString() + ")")).Any()))
-                            {
-                                name = name + " (" + (i + 1).ToString() + ")";
-                                break;
-                            }
-                        }
-                    }
-
-                    WorldAnchor anchor = new WorldAnchor(name)
-                    {
-                        UUID = Guid.NewGuid(),
-                        CreatorUUID = Guid.Parse(worldStorageUser.UUID),
-                        LocalCRS = localCRS,
-                        Unit = UnitSystem.CM,
-                        WorldAnchorSize = worldAnchorSize
-                    };
-
-                    selection.Clear();
-                    var node = CreateAnchorNode(anchor, actualGraphPosition.x, actualGraphPosition.y);
-                    node.MarkUnsaved();
-                    GraphEditorWindow.ShowWindow((ARFNodeWorldAnchor)node);
-
-                }, (DropdownMenuAction a) => DropdownMenuAction.Status.Normal);
-            }
-            evt.menu.AppendSeparator();
-            if (evt.target is ARFNode || evt.target is Group || evt.target is ARFEdgeLink)
-            {
-                evt.menu.AppendSeparator();
-                evt.menu.AppendAction("Delete", delegate
-                {
-                    DeleteSelectionCallback(AskUser.AskUser);
-                }, (DropdownMenuAction a) => canDeleteSelection ? DropdownMenuAction.Status.Normal : DropdownMenuAction.Status.Disabled);
-                evt.menu.AppendSeparator();
-            }
-        }
-
-        public bool ServerAndLocalDifferent()
-        {
-            if ((SaveInfo.instance.elemsToRemove.Count != 0) || (SaveInfo.instance.elemsToUpdate.Count != 0))
-            {
-                return true;
-            }
-            foreach (ARFNode node in nodes)
-            {
-                float nodeX = node.GetPosition().x;
-                float nodeY = node.GetPosition().y;
-                if (!SaveInfo.instance.nodePositions.ContainsKey(node.GUID))
-                {
-                    return true;
-                }
-                else
-                {
-                    float dataX = SaveInfo.instance.nodePositions[node.GUID].x;
-                    float dataY = SaveInfo.instance.nodePositions[node.GUID].y;
-                    if ((nodeX != dataX) || (nodeY != dataY))
-                    {
-                        return true;
-                    }
-                }
-            }
-            foreach (ARFEdgeLink edge in edges)
-            {
-                if (!SaveInfo.instance.linkIds.Contains(edge.GUID))
-                {
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        public override List<Port> GetCompatiblePorts(Port startPort, NodeAdapter nodeAdapter)
-        {
-            var cPorts = new List<Port>();
-            ports.ForEach(funcCall: port =>
-           {
-               if (startPort != port && startPort.node != port.node) cPorts.Add(port);
-           });
-            return cPorts;
-        }
-
-        public void PaintWorldStorage()
-        {
-
-            List<WorldAnchor> worldAnchors = WorldAnchorRequest.GetWorldAnchorsSync(worldStorageServer);
-            foreach (WorldAnchor worldAnchor in worldAnchors)
-            {
-                var waNode = new ARFNodeWorldAnchor(worldAnchor);
-
-                Rect posTemp = new(26, 93, 160, 77);
-                SaveInfo.instance.nodePositions.TryGetValue(worldAnchor.UUID.ToString(), out posTemp);
-                waNode.SetPosition(posTemp);
-
-                AddElement(waNode);
-            }
-
-            List<Trackable> trackables = TrackableRequest.GetTrackablesSync(worldStorageServer);
-            foreach (Trackable trackable in trackables)
-            {
-                var tracknode = new ARFNodeTrackable(trackable);
-
-                Rect posTemp = new(26, 93, 160, 77);
-                SaveInfo.instance.nodePositions.TryGetValue(trackable.UUID.ToString(), out posTemp);
-                tracknode.SetPosition(posTemp);
-
-                AddElement(tracknode);
-            }
-            List<WorldLink> worldLinks = WorldLinkRequest.GetWorldLinksSync(worldStorageServer);
-            foreach (WorldLink worldLink in worldLinks)
-            {
-                Debug.Log("ports");
-                var portPair = GetPortsFromWorldLink(worldLink);
-                Debug.Log("edge " + (portPair.Key == null)+   "  " + (portPair.Value == null));
-                ARFEdgeLink edge = portPair.Key.ConnectTo<ARFEdgeLink>(portPair.Value);
-                edge.worldLink = worldLink;
-                edge.GUID = worldLink.UUID.ToString();
-
-                AddElement(edge);
-            }
-        }
-
-        internal ARFNodeTrackable CreateTrackableNode(Trackable track, float posX, float posY)
-        {
-            var tracknode = new ARFNodeTrackable(track);
-            Rect pos = new Rect(RoundToNearestHalf(posX), RoundToNearestHalf(posY), 160, 77);
-            tracknode.SetPosition(pos);
-
-            AddElement(tracknode);
-            return tracknode;
-        }
-
-        internal ARFNodeWorldAnchor CreateAnchorNode(WorldAnchor wa, float posX, float posY)
-        {
-            var waNode = new ARFNodeWorldAnchor(wa);
-
-            Rect pos = new Rect(RoundToNearestHalf(posX), RoundToNearestHalf(posY), 160, 77);
-            waNode.SetPosition(pos);
-
-            AddElement(waNode);
-            return waNode;
-        }
-
-        internal ARFEdgeLink CreateLink(WorldLink worldLink)
-        {
-            var portPair = GetPortsFromWorldLink(worldLink);
-            ARFEdgeLink edge = portPair.Key.ConnectTo<ARFEdgeLink>(portPair.Value);
-            edge.worldLink = worldLink;
-            Debug.Log(worldLink.UUID.ToString());
-            edge.GUID = worldLink.UUID.ToString();
-
-            AddElement(edge);
-            return edge;
-        }
-
-        public void Reload()
-        {
-            GraphEditorWindow.ResetWindow();
-            DeleteElements(graphElements);
-            SaveInfo.instance.InitNodePos(worldStorageServer, worldStorageUser);
-            PaintWorldStorage();
-            FrameAllElements();
-        }
-
-        public Dictionary<string, Rect> GetNodePositions()
-        {
-            Dictionary<string, Rect> ret = new Dictionary<string, Rect>();
-            foreach (ARFNode elem in nodes)
-            {
-                ret.Add(elem.GUID, elem.GetPosition());
-            }
-            return ret;
-        }
-
-        private KeyValuePair<Port, Port> GetPortsFromWorldLink(WorldLink worldLink)
-        {
-            var ret = new KeyValuePair<Port, Port>();
-
-            //To
-            Guid idTo = worldLink.UUIDTo;
-            Port portIn = null;
-            switch (worldLink.TypeTo)
-            {
-                case TypeWorldStorage.TRACKABLE:
-                    foreach (GraphElement node in this.graphElements)
-                    {
-                        ARFNodeTrackable nodeTrackable = node as ARFNodeTrackable;
-                        if ((nodeTrackable != null) && (nodeTrackable.trackable.UUID == idTo))
-                        {
-                            portIn = nodeTrackable.portIn;
-                            break;
-                        }
-                    }
-                    break;
-                case TypeWorldStorage.ANCHOR:
-                    foreach (GraphElement node in this.graphElements)
-                    {
-                        ARFNodeWorldAnchor nodeAnchor = node as ARFNodeWorldAnchor;
-                        if ((nodeAnchor != null) && nodeAnchor.worldAnchor.UUID == idTo)
-                        {
-                            portIn = nodeAnchor.portIn;
-                            break;
-                        }
-                    }
-                    break;
-                default:
-                    Debug.Log("what are you doing here...");
-                    break;
-            }
-
-            //From
-            Guid idFrom = worldLink.UUIDFrom;
-            Port portOut = null;
-            switch (worldLink.TypeFrom)
-            {
-                case TypeWorldStorage.TRACKABLE:
-                    foreach (GraphElement node in this.graphElements)
-                    {
-                        ARFNodeTrackable nodeTrackable = node as ARFNodeTrackable;
-                        if ((nodeTrackable != null) && (nodeTrackable.trackable.UUID == idFrom))
-                        {
-                            portOut = nodeTrackable.portOut;
-                            break;
-                        }
-                    }
-                    break;
-                case TypeWorldStorage.ANCHOR:
-                    foreach (GraphElement node in this.graphElements)
-                    {
-                        ARFNodeWorldAnchor nodeAnchor = node as ARFNodeWorldAnchor;
-                        if ((nodeAnchor != null) && nodeAnchor.worldAnchor.UUID == idFrom)
-                        {
-                            portOut = nodeAnchor.portOut;
-                            break;
-                        }
-                    }
-                    break;
-                default:
-                    Debug.Log("what are you doing here...");
-                    break;
-            }
-
-            if ((portOut != null) && (portIn != null))
-            {
-                ret = new KeyValuePair<Port, Port>(portOut, portIn);
-            }
-
-            return ret;
-        }
-
-        //
-        // R�sum�:
-        //     Calculate the rectangle size and position to fit all elements in graph.
-        //
-        // Param�tres�:
-        //   container:
-        //     This should be the view container.
-        //
-        // Retourne�:
-        //     The calculated rectangle.
-        public override Rect CalculateRectToFitAll(VisualElement container)
-        {
-            Rect rectToFit = container.layout;
-            bool reachedFirstChild = false;
-            graphElements.ForEach(delegate (GraphElement ge)
-            {
-                if (!(ge is ARFEdgeLink) && !(ge is Port))
-                {
-                    if (!reachedFirstChild)
-                    {
-                        rectToFit = ge.ChangeCoordinatesTo(contentViewContainer, ge.contentRect);
-                        reachedFirstChild = true;
-                    }
-                    else
-                    {
-                        rectToFit = RectUtils.Encompass(rectToFit, ge.ChangeCoordinatesTo(contentViewContainer, ge.contentRect));
-                    }
-                }
-            });
-            return rectToFit;
-        }
-
-        //k_FrameBorder is private readOnly graphView attribute, had to redeclare it to access it
-        private readonly int k_FrameBorder = 30;
-        public void FrameAllElements()
-        {
-            Vector3 frameTranslation = Vector3.zero;
-            Vector3 frameScaling = Vector3.one;
-            var rectToFit = CalculateRectToFitAll(contentViewContainer);
-            CalculateFrameTransform(rectToFit, layout, k_FrameBorder, out frameTranslation, out frameScaling);
-            Matrix4x4.TRS(frameTranslation, Quaternion.identity, frameScaling);
-            UpdateViewTransform(frameTranslation, frameScaling);
-        }
-
-        //method to predict the position of a node (the float that will be saved in the PositionInfo singleton)
-        public static float RoundToNearestHalf(float a)
-        {
-            return a = Mathf.Round(a * 2f) * 0.5f;
-        }
-
-        //Save all modified/deleted/added elements to the server
-        public void SaveInServer()
-        {
-            //DELETE ELEMENTS FROM THE SERVER
-            foreach (KeyValuePair<String, Type> elemToRemove in SaveInfo.instance.elemsToRemove)
-            {
-                string typeName = elemToRemove.Value.Name;
-                switch (typeName)
-                {
-                    case nameof(Trackable):
-                        TrackableRequest.DeleteTrackableAsync(worldStorageServer, Guid.Parse(elemToRemove.Key), (response) => { });
-                        break;
-                    case nameof(WorldAnchor):
-                        Debug.Log("delete worldanchor");
-                        WorldAnchorRequest.DeleteWorldAnchorAsync(worldStorageServer, Guid.Parse(elemToRemove.Key), (response) => { });
-                        break;
-                    case nameof(WorldLink):
-                        WorldLinkRequest.DeleteWorldLinkAsync(worldStorageServer, Guid.Parse(elemToRemove.Key), (response) => { });
-                        break;
-                    default:
-                        Debug.Log("oops");
-                        break;
-                }
-            }
-
-            // UPDATE AND ADD ELEMENTS
-            foreach (ARFNode node in nodes)
-            {
-                if (!SaveInfo.instance.nodePositions.ContainsKey(node.GUID))
-                {
-                    // POST TRACKABLE
-                    if (node is ARFNodeTrackable aRFNodeTrackable)
-                    {
-                        var posX = new Collection<String>();
-                        posX.Add(aRFNodeTrackable.GetPosition().x.ToString());
-                        var posY = new Collection<String>();
-                        posY.Add(aRFNodeTrackable.GetPosition().y.ToString());
-                        Trackable trackable = aRFNodeTrackable.trackable;
-                        trackable.KeyvalueTags["unityAuthoringPosX"] = posX;
-                        trackable.KeyvalueTags["unityAuthoringPosY"] = posY;
-                        TrackableRequest.CreateTrackableAsync(worldStorageServer, trackable, (response) =>
-                        {
-                            //change the uuid in its edges, if there is a new edge to be added in the world storage it needs to have the correct uuid
-                            String uuid = response.result;
-
-                            uuid = uuid.Replace("\"", "");
-                            foreach (ARFEdgeLink edge in aRFNodeTrackable.portIn.connections)
-                            {
-                                edge.worldLink.UUIDTo = Guid.Parse(uuid);
-                            }
-                            foreach (ARFEdgeLink edge in aRFNodeTrackable.portOut.connections)
-                            {
-                                edge.worldLink.UUIDFrom = Guid.Parse(uuid);
-                            }
-                            aRFNodeTrackable.trackable.UUID = Guid.Parse(uuid);
-                            aRFNodeTrackable.GUID = uuid;
-                            aRFNodeTrackable.title = trackable.Name;
-                        });
-                    }
-
-                    // POST WORLDANCHOR
-                    if (node is ARFNodeWorldAnchor aRFNodeWorldAnchor)
-                    {
-                        var posX = new Collection<String>();
-                        posX.Add(aRFNodeWorldAnchor.GetPosition().x.ToString());
-                        var posY = new Collection<String>();
-                        posY.Add(aRFNodeWorldAnchor.GetPosition().y.ToString());
-                        WorldAnchor worldAnchor = aRFNodeWorldAnchor.worldAnchor;
-                        worldAnchor.KeyvalueTags["unityAuthoringPosX"] = posX;
-                        worldAnchor.KeyvalueTags["unityAuthoringPosY"] = posY;
-
-                        WorldAnchorRequest.CreateWorldAnchorAsync(worldStorageServer, worldAnchor, (response) =>
-                        {
-
-                            String uuid = response.result;
-                            //change the uuid in its edges, if there is a new edge to be added in the world storage it needs to have the correct uuid
-                            uuid = uuid.Replace("\"", "");
-                            foreach (ARFEdgeLink edge in aRFNodeWorldAnchor.portIn.connections)
-                            {
-                                edge.worldLink.UUIDTo = Guid.Parse(uuid);
-                            }
-                            foreach (ARFEdgeLink edge in aRFNodeWorldAnchor.portOut.connections)
-                            {
-                                edge.worldLink.UUIDFrom = Guid.Parse(uuid);
-                            }
-                            aRFNodeWorldAnchor.worldAnchor.UUID = Guid.Parse(uuid);
-                            aRFNodeWorldAnchor.GUID = uuid;
-                            aRFNodeWorldAnchor.title = worldAnchor.Name;
-                        });
-                    }
-                }
-                else
-                {
-                    float xLocal = node.GetPosition().x;
-                    float yLocal = node.GetPosition().y;
-                    float xServer = SaveInfo.instance.nodePositions[node.GUID].x; ;
-                    float yServer = SaveInfo.instance.nodePositions[node.GUID].y;
-                    if (((xLocal != xServer) || (yLocal != yServer)) || SaveInfo.instance.elemsToUpdate.Contains(node.GUID))
-                    {
-                        if (node is ARFNodeTrackable aRFNodeTrackable)
-                        {
-                            var posX = new Collection<String>();
-                            posX.Add(aRFNodeTrackable.GetPosition().x.ToString());
-                            var posY = new Collection<String>();
-                            posY.Add(aRFNodeTrackable.GetPosition().y.ToString());
-                            Trackable trackable = aRFNodeTrackable.trackable;
-                            trackable.KeyvalueTags["unityAuthoringPosX"] = posX;
-                            trackable.KeyvalueTags["unityAuthoringPosY"] = posY;
-                            TrackableRequest.UpdateTrackableAsync(worldStorageServer, trackable, (response) =>
-                            {
-                                aRFNodeTrackable.title = trackable.Name;
-                            });
-                        }
-                        if (node is ARFNodeWorldAnchor aRFNodeWorldAnchor)
-                        {
-                            var posX = new Collection<String>();
-                            posX.Add(aRFNodeWorldAnchor.GetPosition().x.ToString());
-                            var posY = new Collection<String>();
-                            posY.Add(aRFNodeWorldAnchor.GetPosition().y.ToString());
-                            WorldAnchor worldAnchor = aRFNodeWorldAnchor.worldAnchor;
-                            worldAnchor.KeyvalueTags["unityAuthoringPosX"] = posX;
-                            worldAnchor.KeyvalueTags["unityAuthoringPosY"] = posY;
-                            WorldAnchorRequest.UpdateWorldAnchorAsync(worldStorageServer, worldAnchor, (response) =>
-                            {
-                                aRFNodeWorldAnchor.title = worldAnchor.Name;
-                            });
-                        }
-                    }
-                }
-                node.MarkSaved();
-            }
-            foreach (ARFEdgeLink edge in edges)
-            {
-                if (edge is ARFEdgeLink aRFEdgeLink)
-                {
-                    if (!SaveInfo.instance.linkIds.Contains(aRFEdgeLink.GUID))
-                    {
-                        WorldLink worldLink = aRFEdgeLink.worldLink;
-                        WorldLinkRequest.CreateWorldLinkAsync(worldStorageServer, worldLink, (response) =>
-                        {
-                            string uuid = response.result;
-                            uuid = uuid.Replace("\"", "");
-
-                            aRFEdgeLink.worldLink.UUID = Guid.Parse(uuid);
-                            aRFEdgeLink.GUID = uuid;
-                        });
-                    }
-                    else if (SaveInfo.instance.elemsToUpdate.Contains(aRFEdgeLink.GUID))
-                    {
-                        WorldLink worldLink = aRFEdgeLink.worldLink;
-                        WorldLinkRequest.UpdateWorldLinkAsync(worldStorageServer, worldLink, (response) => { });
-                    }
-                    aRFEdgeLink.MarkSaved();
-                }
-            }
-            SaveInfo.instance.InitNodePos(worldStorageServer, worldStorageUser);
-
-            GraphEditorWindow.ResetWindow();
-        }
-    }
-}
\ No newline at end of file
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Editor/Graph/ARFGraphView.cs.meta b/Assets/ETSI.ARF/ARF World Storage API/Editor/Graph/ARFGraphView.cs.meta
deleted file mode 100644
index e0b1d231cdd3c54559c58031ebf545ca75692d27..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/Editor/Graph/ARFGraphView.cs.meta	
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 000c7511b9bdea24cb6c962ca1ae26ca
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Editor/Graph/ARFNode.cs b/Assets/ETSI.ARF/ARF World Storage API/Editor/Graph/ARFNode.cs
deleted file mode 100644
index e4a884495678343c879d257be5557be385b72c0d..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/Editor/Graph/ARFNode.cs	
+++ /dev/null
@@ -1,140 +0,0 @@
-//
-// ARF - Augmented Reality Framework (ETSI ISG ARF)
-//
-// Copyright 2024 ETSI
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// Last change: July 2022
-//
-
-#define USING_OPENAPI_GENERATOR // alt. is Swagger
-
-using System;
-
-using UnityEditor;
-using UnityEngine.UIElements;
-using UnityEditor.Experimental.GraphView;
-using UnityEngine;
-
-using ETSI.ARF.WorldStorage.Editor.Graph;
-using ETSI.ARF.OpenAPI.WorldStorage;
-
-namespace ETSI.ARF.WorldStorage.UI
-{
-    public abstract class ARFNode : Node
-    {
-        public string GUID;
-        public bool entryPoint = false;
-        public ARFPort portOut;
-        public ARFPort portIn;
-        public GUID id;
-
-        public Image savedIcon;
-
-        public ARFNode()
-        {
-        }
-        public override Port InstantiatePort(Orientation orientation, Direction direction, Port.Capacity capacity, Type type)
-        {
-            switch (direction)
-            {
-                case Direction.Input:
-                    portIn = ARFPort.CreateARF<ARFEdgeLink>(orientation, direction, capacity, type);
-                    return portIn;
-                case Direction.Output:
-                    portOut = ARFPort.CreateARF<ARFEdgeLink>(orientation, direction, capacity, type);
-                    return portOut;
-                default:
-                    return null;
-            }
-        }
-
-        public void DisconnectAllPorts(ARFGraphView graphView)
-        {
-            DisconnectInputPorts(graphView);
-            DisconnectOutputPorts(graphView);
-        }
-
-        private void DisconnectInputPorts(ARFGraphView graphView)
-        {
-            DisconnectPorts(inputContainer, graphView);
-        }
-
-        private void DisconnectOutputPorts(ARFGraphView graphView)
-        {
-            DisconnectPorts(outputContainer, graphView);
-        }
-
-        private void DisconnectPorts(VisualElement container, ARFGraphView graphView)
-        {
-            foreach (Port port in container.Children())
-            {
-                if (!port.connected)
-                {
-                    continue;
-                }
-
-                graphView.DeleteElements(port.connections);
-            }
-        }
-
-        public Port GeneratePort(ARFNode node, Direction portDirection, Port.Capacity capacity = Port.Capacity.Multi)
-        {
-            return node.InstantiatePort(Orientation.Horizontal, portDirection, capacity, typeof(int)); // dummy
-        }
-
-        //override the BuildContextualMenu method to prevent the "disconnect" option from appearing in the contextual menu
-        public override void BuildContextualMenu(ContextualMenuPopulateEvent evt)
-        {
-        }
-
-        public abstract TypeWorldStorage GetElemType();
-        public void MarkUnsaved()
-        {
-            if(savedIcon == null)
-            {
-                //the icon to add if the node does not correspond to an element in the server
-                Texture2D warningImage = (Texture2D)AssetDatabase.LoadAssetAtPath("Assets/ETSI.ARF/ARF World Storage API/Images/cloud.png", typeof(Texture2D));
-                savedIcon = new Image
-                {
-                    image = warningImage,
-                    scaleMode = ScaleMode.ScaleToFit
-                };
-                savedIcon.style.width = 25;
-                savedIcon.style.height = 25;
-                savedIcon.style.minWidth = 25;
-                savedIcon.style.minHeight = 25;
-                savedIcon.style.left = 8;
-                savedIcon.style.paddingRight = 8;
-                savedIcon.style.alignSelf = Align.Center;
-
-            }
-            if (!titleContainer.Contains(savedIcon))
-            {
-                titleContainer.Insert(0,savedIcon);
-            }
-            tooltip = "This element is not synchronized with the World Storage";
-        }
-
-        public void MarkSaved()
-        {
-            if (titleContainer.Contains(savedIcon))
-            {
-                titleContainer.Remove(savedIcon);
-                tooltip = "";
-            }
-        }
-
-    }
-}
\ No newline at end of file
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Editor/Graph/ARFNode.cs.meta b/Assets/ETSI.ARF/ARF World Storage API/Editor/Graph/ARFNode.cs.meta
deleted file mode 100644
index 97a115b08bf4f22d06121149b104a93e9a6f3433..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/Editor/Graph/ARFNode.cs.meta	
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 0216cf1af3743f2429eb4b01db300b0e
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Editor/Graph/ARFNodeTrackable.cs b/Assets/ETSI.ARF/ARF World Storage API/Editor/Graph/ARFNodeTrackable.cs
deleted file mode 100644
index 6c03916a3e73fcd37dd4f1fc28d8a9ce28759e7a..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/Editor/Graph/ARFNodeTrackable.cs	
+++ /dev/null
@@ -1,85 +0,0 @@
-//
-// ARF - Augmented Reality Framework (ETSI ISG ARF)
-//
-// Copyright 2024 ETSI
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// Last change: June 2024
-//
-
-#define USING_OPENAPI_GENERATOR // alt. is Swagger
-
-using UnityEngine;
-using UnityEngine.UIElements;
-using UnityEditor;
-using UnityEditor.Experimental.GraphView;
-
-using ETSI.ARF.WorldStorage.Editor.Windows;
-using ETSI.ARF.OpenAPI.WorldStorage;
-
-namespace ETSI.ARF.WorldStorage.UI
-{
-    public class ARFNodeTrackable : ARFNode
-    {
-        public Trackable trackable;
-
-        public ARFNodeTrackable(Trackable trackable)
-        {
-            this.trackable = trackable;
-            this.GUID = trackable.UUID.ToString();
-            this.title = trackable.Name;
-
-            /*COLOR*/
-            var colorRectangle = new VisualElement();
-            colorRectangle.style.height = 160;
-            colorRectangle.style.height = 5;
-            colorRectangle.style.backgroundColor = new Color(1, 0.31f, 0.31f, 0.9f);
-            //get the index of the title container
-            int titleIndex = mainContainer.hierarchy.IndexOf(titleContainer);
-            mainContainer.Insert(titleIndex+1, colorRectangle);
-
-            /*PORTS*/
-            var portIn = GeneratePort(this, Direction.Input, Port.Capacity.Multi);
-            portIn.portColor = new Color(0.66f, 0.39f, 1, 0.77f);
-            portIn.portName = "Target"; // "Input"
-            //portIn.AddManipulator(new EdgeConnector<ARFEdgeLink>(new WorldLinkListener()));
-            inputContainer.Add(portIn);
-
-            var portOut = GeneratePort(this, Direction.Output, Port.Capacity.Multi);
-            portOut.portColor = new Color(0.66f, 0.39f, 1, 0.77f);
-            portOut.portName = "Source"; // "Output";
-            //portOut.AddManipulator(new EdgeConnector<ARFEdgeLink>(new WorldLinkListener())); ;
-            outputContainer.Add(portOut);
-
-            RefreshExpandedState();
-            RefreshPorts();
-
-            /*MANIPULATOR*/
-            var doubleClickManipulator = new Clickable(Clicked);
-            doubleClickManipulator.activators.Clear();
-            doubleClickManipulator.activators.Add(new ManipulatorActivationFilter { button = MouseButton.LeftMouse, clickCount = 2 });
-            this.AddManipulator(doubleClickManipulator);
-        }
-
-        public void Clicked()
-        {
-            Debug.Log(trackable.ToJson());
-            GraphEditorWindow.ShowWindow(this);
-        }
-        public override TypeWorldStorage GetElemType()
-        {
-            return TypeWorldStorage.TRACKABLE;
-        }
-    }
-}
\ No newline at end of file
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Editor/Graph/ARFNodeTrackable.cs.meta b/Assets/ETSI.ARF/ARF World Storage API/Editor/Graph/ARFNodeTrackable.cs.meta
deleted file mode 100644
index 17e98f27c0df67b74d8e87e243203ba56f30d987..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/Editor/Graph/ARFNodeTrackable.cs.meta	
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 01bfb1a0a4a788c48a6c6675034ba8d5
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Editor/Graph/ARFNodeWorldAnchor.cs b/Assets/ETSI.ARF/ARF World Storage API/Editor/Graph/ARFNodeWorldAnchor.cs
deleted file mode 100644
index 9d031e85db3475ff746df58695f155410a2356c7..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/Editor/Graph/ARFNodeWorldAnchor.cs	
+++ /dev/null
@@ -1,79 +0,0 @@
-//
-// ARF - Augmented Reality Framework (ETSI ISG ARF)
-//
-// Copyright 2024 ETSI
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// Last change: June 2024
-//
-
-using UnityEngine;
-using UnityEngine.UIElements;
-using UnityEditor.Experimental.GraphView;
-
-using ETSI.ARF.WorldStorage.Editor.Windows;
-using ETSI.ARF.OpenAPI.WorldStorage;
-
-namespace ETSI.ARF.WorldStorage.UI
-{
-    public class ARFNodeWorldAnchor : ARFNode
-    {
-        public WorldAnchor worldAnchor;
-
-        public ARFNodeWorldAnchor(WorldAnchor worldAnchor)
-        {
-            this.worldAnchor = worldAnchor;
-            this.GUID = worldAnchor.UUID.ToString();
-            this.title = worldAnchor.Name;
-
-            /*COLOR*/
-            var colorRectangle = new VisualElement();
-            colorRectangle.style.height = 160;
-            colorRectangle.style.height = 5;
-            colorRectangle.style.backgroundColor = new Color(1, 0.7f, 0, 0.9f);
-            mainContainer.Insert(1, colorRectangle);
-
-            /*PORTS*/
-            var portIn = GeneratePort(this, Direction.Input, Port.Capacity.Multi);
-            portIn.portColor = new Color(0.66f, 0.39f, 1, 0.77f);
-            portIn.portName = "Target"; // "Input";
-            //portIn.AddManipulator(new EdgeConnector<ARFEdgeLink>(new WorldLinkListener()));
-            inputContainer.Add(portIn);
-
-            var portOut = GeneratePort(this, Direction.Output, Port.Capacity.Multi);
-            portOut.portColor = new Color(0.66f, 0.39f, 1, 0.77f);
-            portOut.portName = "Source"; // "Output";
-            //portOut.AddManipulator(new EdgeConnector<ARFEdgeLink>(new WorldLinkListener()));
-            outputContainer.Add(portOut);
-
-            RefreshExpandedState();
-            RefreshPorts();
-
-            /*MANIPULATOR*/
-            var doubleClickManipulator = new Clickable(Clicked);
-            doubleClickManipulator.activators.Clear();
-            doubleClickManipulator.activators.Add(new ManipulatorActivationFilter { button = MouseButton.LeftMouse, clickCount = 2 });
-            this.AddManipulator(doubleClickManipulator);
-        }
-
-        public void Clicked()
-        {
-            GraphEditorWindow.ShowWindow(this);
-        }
-        public override TypeWorldStorage GetElemType()
-        {
-            return TypeWorldStorage.ANCHOR;
-        }
-    }
-}
\ No newline at end of file
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Editor/Graph/ARFNodeWorldAnchor.cs.meta b/Assets/ETSI.ARF/ARF World Storage API/Editor/Graph/ARFNodeWorldAnchor.cs.meta
deleted file mode 100644
index bb1bb7e9dbcc846457423ce25bb5ae3dccc979ec..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/Editor/Graph/ARFNodeWorldAnchor.cs.meta	
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 21e22c1ed011b7a4da95fad83be1d9fa
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Editor/Graph/ARFPort.cs b/Assets/ETSI.ARF/ARF World Storage API/Editor/Graph/ARFPort.cs
deleted file mode 100644
index d55d759ea7465c0d9e455e57cabb7ca04ed681a8..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/Editor/Graph/ARFPort.cs	
+++ /dev/null
@@ -1,80 +0,0 @@
-//
-// ARF - Augmented Reality Framework (ETSI ISG ARF)
-//
-// Copyright 2024 ETSI
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// Last change: June 2024
-//
-
-using System;
-using System.Collections.Generic;
-using UnityEditor.Experimental.GraphView;
-using UnityEngine;
-using UnityEngine.UIElements;
-
-using ETSI.ARF.WorldStorage.Editor.Windows;
-using ETSI.ARF.WorldStorage.UI;
-using ETSI.ARF.OpenAPI.WorldStorage;
-
-namespace ETSI.ARF.WorldStorage.Editor.Graph
-{
-    public class ARFPort : Port
-    {
-        protected ARFPort(Orientation portOrientation, Direction portDirection, Capacity portCapacity, Type type) : base(portOrientation, portDirection, portCapacity, type)
-        {
-        }
-
-        public override void Connect(Edge edge)
-        {
-            base.Connect(edge);
-            ARFNode fromNode = edge.output.node as ARFNode;
-            ARFNode toNode = edge.input.node as ARFNode;
-
-            if (edge is ARFEdgeLink aRFedge)
-            {
-                Transform3D transform = new Transform3D();
-                for (int i = 0; i < 15; i++)
-                {
-                    transform.Add(0);
-                }
-                transform.Add(1);
-
-                WorldLink worldLink = new WorldLink()
-                {
-                    UUID = Guid.NewGuid(),
-                    CreatorUUID = Guid.Parse(SaveInfo.instance.worldStorageUser.UUID),
-                    UUIDFrom = Guid.Parse(fromNode.GUID),
-                    UUIDTo = Guid.Parse(toNode.GUID),
-                    TypeFrom = fromNode.GetElemType(),
-                    TypeTo = toNode.GetElemType(),
-                    Transform = transform,
-                    Unit = UnitSystem.CM
-                };
-                aRFedge.worldLink = worldLink;
-            }
-        }
-
-        public static ARFPort CreateARF<TEdge>(Orientation orientation, Direction direction, Capacity capacity, Type type) where TEdge : Edge, new()
-        {
-            WorldLinkListener listener = new WorldLinkListener();
-            ARFPort port = new(orientation, direction, capacity, type)
-            {
-                m_EdgeConnector = new EdgeConnector<TEdge>(listener)
-            };
-            port.AddManipulator(port.m_EdgeConnector);
-            return port;
-        }
-    }
-}
\ No newline at end of file
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Editor/Graph/ARFPort.cs.meta b/Assets/ETSI.ARF/ARF World Storage API/Editor/Graph/ARFPort.cs.meta
deleted file mode 100644
index 6d043fde500829981fc15944de7d1198cb5e1375..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/Editor/Graph/ARFPort.cs.meta	
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 3c67fa4402011954bb65be6215d52512
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Editor/Graph/WorldLinkListener.cs b/Assets/ETSI.ARF/ARF World Storage API/Editor/Graph/WorldLinkListener.cs
deleted file mode 100644
index f106c1396ae22e0b1711eda851c748877926593a..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/Editor/Graph/WorldLinkListener.cs	
+++ /dev/null
@@ -1,98 +0,0 @@
-//
-// ARF - Augmented Reality Framework (ETSI ISG ARF)
-//
-// Copyright 2024 ETSI
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// Last change: June 2024
-//
-
-using UnityEngine;
-using ETSI.ARF.WorldStorage.Editor.Windows;
-using System.Collections.Generic;
-using UnityEditor.Experimental.GraphView;
-using static UnityEditor.Experimental.GraphView.Port;
-
-namespace ETSI.ARF.WorldStorage.Editor.Graph
-{
-    public class WorldLinkListener : IEdgeConnectorListener
-    {
-        private GraphViewChange m_GraphViewChange;
-
-        private List<Edge> m_EdgesToCreate;
-
-        private List<GraphElement> m_EdgesToDelete;
-
-        public WorldLinkListener()
-        {
-            m_EdgesToCreate = new List<Edge>();
-            m_EdgesToDelete = new List<GraphElement>();
-            m_GraphViewChange.edgesToCreate = m_EdgesToCreate;
-        }
-        public void OnDrop(GraphView graphView, Edge edge)
-        {
-            m_EdgesToCreate.Clear();
-            m_EdgesToCreate.Add(edge);
-            m_EdgesToDelete.Clear();
-            if (edge.input.capacity == Capacity.Single)
-            {
-                foreach (Edge connection in edge.input.connections)
-                {
-                    if (connection != edge)
-                    {
-                        m_EdgesToDelete.Add(connection);
-                    }
-                }
-            }
-
-            if (edge.output.capacity == Capacity.Single)
-            {
-                foreach (Edge connection2 in edge.output.connections)
-                {
-                    if (connection2 != edge)
-                    {
-                        m_EdgesToDelete.Add(connection2);
-                    }
-                }
-            }
-
-            if (m_EdgesToDelete.Count > 0)
-            {
-                graphView.DeleteElements(m_EdgesToDelete);
-            }
-
-            List<Edge> edgesToCreate = m_EdgesToCreate;
-            if (graphView.graphViewChanged != null)
-            {
-                edgesToCreate = graphView.graphViewChanged(m_GraphViewChange).edgesToCreate;
-            }
-
-            foreach (Edge item in edgesToCreate)
-            {
-                graphView.AddElement(item);
-                edge.input.Connect(item);
-                edge.output.Connect(item);
-            }
-            if (!SaveInfo.instance.linkIds.Contains(((ARFEdgeLink)edge).GUID))
-            {
-                ((ARFEdgeLink)edge).MarkUnsaved();
-            }
-            GraphEditorWindow.ShowWindow((ARFEdgeLink)edge);
-        }
-
-        public void OnDropOutsidePort(Edge edge, Vector2 position)
-        {
-        }
-    }
-}
\ No newline at end of file
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Editor/Graph/WorldLinkListener.cs.meta b/Assets/ETSI.ARF/ARF World Storage API/Editor/Graph/WorldLinkListener.cs.meta
deleted file mode 100644
index e19f2ea2695b2106e4290577b9abef17cb4dd141..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/Editor/Graph/WorldLinkListener.cs.meta	
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 54dbfcfdc75de1b46bc7da09df52db34
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Editor/Windows.meta b/Assets/ETSI.ARF/ARF World Storage API/Editor/Windows.meta
deleted file mode 100644
index bf1141ac4617e76d6c3c2cfa2f92f99a21f33728..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/Editor/Windows.meta	
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: fbbff3217b2a8cd428764d83150c7b22
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/BaseWindow.cs b/Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/BaseWindow.cs
deleted file mode 100644
index 64bba1e903b0e9623f8593e3d17e5ecc5dc74d87..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/BaseWindow.cs	
+++ /dev/null
@@ -1,118 +0,0 @@
-//
-// ARF - Augmented Reality Framework (ETSI ISG ARF)
-//
-// Copyright 2024 ETSI
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// Last change: June 2024
-//
-
-#define isDEBUG
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-
-using UnityEngine;
-using UnityEditor;
-using TMPro;
-
-using ETSI.ARF.WorldStorage.REST;
-using ETSI.ARF.OpenAPI.WorldStorage;
-
-namespace ETSI.ARF.WorldStorage.UI
-{
-    public abstract class BaseWindow<T> : EditorWindow
-    {
-        [HideInInspector] public WorldStorageServer worldStorageServer;
-        [HideInInspector] public WorldStorageUser worldStorageUser;
-
-        [SerializeField] public List<string> trackables = new List<string>();
-
-        //
-        // Keyvalues
-        //
-        [SerializeField] protected KeyvalueTagList keyValueTags = new KeyvalueTagList();
-        protected List<(string, string)> keyValuesFixed = new List<(string, string)>(3)
-        {
-            ("", ""),("", ""),("", "")
-        };
-        protected void OutputKeyValue(int n)
-        {
-            string i1 = keyValuesFixed[n].Item1;
-            string i2 = keyValuesFixed[n].Item2;
-            i1 = EditorGUILayout.TextField("Key " + n, i1);
-            i2 = EditorGUILayout.TextField("Value " + n, i2);
-            keyValuesFixed[n] = (i1, i2);
-        }
-
-        //
-        // UI stuffs
-        //
-        protected bool groupEnabled;
-        protected bool repaint = false;
-        protected Vector2 scrollPos;
-        protected Color ori;
-        protected GUIStyle gsTest;
-        protected string saveText = "Save";
-
-        public void Update()
-        {
-            if (repaint)
-            {
-                Repaint();
-                repaint = false;
-            }
-        }
-
-        void OnGUI()
-        {
-            ori = GUI.backgroundColor; // remember ori color
-
-            gsTest = new GUIStyle("window");
-            //gsTest.normal.textColor = WorldStorageWindow.arfColors[0];
-            gsTest.fontStyle = FontStyle.Bold;
-            gsTest.alignment = TextAnchor.UpperLeft;
-            gsTest.fontSize = 16;
-
-            scrollPos = EditorGUILayout.BeginScrollView(scrollPos, GUILayout.ExpandWidth(true));
-            WorldStorageWindow.DrawCopyright();
-
-            DrawUIStuffs();
-
-            EditorGUILayout.EndScrollView();
-
-            if (GUILayout.Button("Close Window"))
-            {
-                Close();
-            }
-        }
-
-        public abstract void DrawUIStuffs();
-
-        public virtual void GetParams()
-        {
-        }
-
-        public virtual void AddObject()
-        {
-        }
-
-        public virtual T GenerateObject()
-        {
-            return default(T);
-        }
-    }
-}
\ No newline at end of file
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/BaseWindow.cs.meta b/Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/BaseWindow.cs.meta
deleted file mode 100644
index eed84fadb615b82bec15c5f19ee92935b2d96a72..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/BaseWindow.cs.meta	
+++ /dev/null
@@ -1,14 +0,0 @@
-fileFormatVersion: 2
-guid: b879c85f4eccbee40a78e1a01aaf77ca
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences:
-  - m_ViewDataDictionary: {instanceID: 0}
-  - worldStorageServer: {fileID: 11400000, guid: 4f997253243de534dad12937f1284975, type: 2}
-  - worldStorageUser: {instanceID: 0}
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/GraphEditorWindow.cs b/Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/GraphEditorWindow.cs
deleted file mode 100644
index 5b4fcf47e3bfe1abfa8ce6c8065bea47c96839de..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/GraphEditorWindow.cs	
+++ /dev/null
@@ -1,1276 +0,0 @@
-//
-// ARF - Augmented Reality Framework (ETSI ISG ARF)
-//
-// Copyright 2024 ETSI
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// Last change: June 2024
-//
-
-using System;
-using System.Collections.Generic;
-
-using UnityEditor;
-using UnityEngine;
-
-using ETSI.ARF.WorldStorage.REST;
-using ETSI.ARF.WorldStorage.UI;
-using ETSI.ARF.WorldStorage.Editor.Graph;
-using ETSI.ARF.OpenAPI.WorldStorage;
-using System.Collections.ObjectModel;
-
-namespace ETSI.ARF.WorldStorage.Editor.Windows
-{
-    public class GraphEditorWindow : EditorWindow
-    {
-        public enum GraphEditorType
-        {
-            TRACKABLE,
-            WORLDANCHOR,
-            WORLDLINK,
-            NULL
-        }
-
-        public GraphEditorType type;
-
-        public ARFNodeTrackable trackableNode;
-        public ARFNodeWorldAnchor worldAnchorNode;
-        public ARFEdgeLink worldLinkEdge;
-
-        public Trackable trackable;
-        public WorldAnchor worldAnchor;
-        public WorldLink worldLink;
-
-        public Vector3 local_size;
-        public Vector3 local_rot;
-        public Vector3 local_pos;
-
-        //test
-        string m_newKey = "";
-        List<string> m_newValues = new List<string>();
-
-        // UI stuffs
-        private Vector2 scrollPos;
-        static public GraphEditorWindow winSingleton;
-
-        public void OnEnable()
-        {
-            ResetWindow();
-        }
-
-        public static void ResetWindow()
-        {
-            Type inspectorType = Type.GetType("UnityEditor.InspectorWindow,UnityEditor.dll");
-            winSingleton = GetWindow<GraphEditorWindow>("Element Editor", true, inspectorType);
-            winSingleton.trackable = null;
-            winSingleton.worldAnchor = null;
-            winSingleton.worldLink = null;
-
-            winSingleton.trackableNode = null;
-            winSingleton.worldAnchorNode = null;
-            winSingleton.worldLinkEdge = null;
-
-            winSingleton.local_size = Vector3.zero;
-            winSingleton.local_rot = Vector3.zero;
-            winSingleton.local_pos = Vector3.zero;
-
-            winSingleton.type = GraphEditorType.NULL;
-        }
-
-        public static void ShowWindow(ARFNodeTrackable trackableNode)
-        {
-            Type inspectorType = Type.GetType("UnityEditor.InspectorWindow,UnityEditor.dll");
-            winSingleton = GetWindow<GraphEditorWindow>("Element Editor", true, inspectorType);
-            winSingleton.type = GraphEditorType.TRACKABLE;
-
-            winSingleton.trackable = null;
-            winSingleton.worldAnchor = null;
-            winSingleton.worldLink = null;
-
-            winSingleton.trackableNode = null;
-            winSingleton.worldAnchorNode = null;
-            winSingleton.worldLinkEdge = null;
-
-            winSingleton.trackableNode = trackableNode;
-            winSingleton.trackable = trackableNode.trackable;
-
-            winSingleton.local_size = new Vector3((float)winSingleton.trackable.TrackableSize[0], (float)winSingleton.trackable.TrackableSize[1], (float)winSingleton.trackable.TrackableSize[2]);
-            if (winSingleton.trackable.LocalCRS.Count == 16)
-            {
-                Matrix4x4 localCRS = new Matrix4x4();
-                localCRS.m00 = winSingleton.trackable.LocalCRS[0]; localCRS.m01 = winSingleton.trackable.LocalCRS[1]; localCRS.m02 = winSingleton.trackable.LocalCRS[2]; localCRS.m03 = winSingleton.trackable.LocalCRS[3];
-                localCRS.m10 = winSingleton.trackable.LocalCRS[4]; localCRS.m11 = winSingleton.trackable.LocalCRS[5]; localCRS.m12 = winSingleton.trackable.LocalCRS[6]; localCRS.m13 = winSingleton.trackable.LocalCRS[7];
-                localCRS.m20 = winSingleton.trackable.LocalCRS[8]; localCRS.m21 = winSingleton.trackable.LocalCRS[9]; localCRS.m22 = winSingleton.trackable.LocalCRS[10]; localCRS.m23 = winSingleton.trackable.LocalCRS[11];
-                localCRS.m30 = winSingleton.trackable.LocalCRS[12]; localCRS.m31 = winSingleton.trackable.LocalCRS[13]; localCRS.m32 = winSingleton.trackable.LocalCRS[14]; localCRS.m33 = winSingleton.trackable.LocalCRS[15];
-                winSingleton.local_pos = localCRS.GetPosition();
-                winSingleton.local_rot = localCRS.rotation.eulerAngles;
-            }
-
-        }
-
-        public static void ShowWindow(ARFNodeWorldAnchor worldAnchorNode)
-        {
-            Type inspectorType = Type.GetType("UnityEditor.InspectorWindow,UnityEditor.dll");
-            winSingleton = GetWindow<GraphEditorWindow>("Element Editor", true, inspectorType);
-            winSingleton.type = GraphEditorType.WORLDANCHOR;
-
-            winSingleton.trackable = null;
-            winSingleton.worldAnchor = null;
-            winSingleton.worldLink = null;
-
-            winSingleton.trackableNode = null;
-            winSingleton.worldAnchorNode = null;
-            winSingleton.worldLinkEdge = null;
-
-            winSingleton.worldAnchorNode = worldAnchorNode;
-            winSingleton.worldAnchor = worldAnchorNode.worldAnchor;
-
-            winSingleton.local_size = new Vector3((float)winSingleton.worldAnchor.WorldAnchorSize[0], (float)winSingleton.worldAnchor.WorldAnchorSize[1], (float)winSingleton.worldAnchor.WorldAnchorSize[2]);
-            if (winSingleton.worldAnchor.LocalCRS.Count == 16)
-            {
-                Matrix4x4 localCRS = new Matrix4x4();
-                localCRS.m00 = winSingleton.worldAnchor.LocalCRS[0]; localCRS.m01 = winSingleton.worldAnchor.LocalCRS[1]; localCRS.m02 = winSingleton.worldAnchor.LocalCRS[2]; localCRS.m03 = winSingleton.worldAnchor.LocalCRS[3];
-                localCRS.m10 = winSingleton.worldAnchor.LocalCRS[4]; localCRS.m11 = winSingleton.worldAnchor.LocalCRS[5]; localCRS.m12 = winSingleton.worldAnchor.LocalCRS[6]; localCRS.m13 = winSingleton.worldAnchor.LocalCRS[7];
-                localCRS.m20 = winSingleton.worldAnchor.LocalCRS[8]; localCRS.m21 = winSingleton.worldAnchor.LocalCRS[9]; localCRS.m22 = winSingleton.worldAnchor.LocalCRS[10]; localCRS.m23 = winSingleton.worldAnchor.LocalCRS[11];
-                localCRS.m30 = winSingleton.worldAnchor.LocalCRS[12]; localCRS.m31 = winSingleton.worldAnchor.LocalCRS[13]; localCRS.m32 = winSingleton.worldAnchor.LocalCRS[14]; localCRS.m33 = winSingleton.worldAnchor.LocalCRS[15];
-                winSingleton.local_pos = localCRS.GetPosition();
-                winSingleton.local_rot = localCRS.rotation.eulerAngles;
-            }
-        }
-
-        public static void ShowWindow(ARFEdgeLink graphEdge)
-        {
-            Type inspectorType = Type.GetType("UnityEditor.InspectorWindow,UnityEditor.dll");
-            winSingleton = GetWindow<GraphEditorWindow>("Element Editor", true, inspectorType);
-            winSingleton.type = GraphEditorType.WORLDLINK;
-
-            winSingleton.trackable = null;
-            winSingleton.worldAnchor = null;
-            winSingleton.worldLink = null;
-
-            winSingleton.trackableNode = null;
-            winSingleton.worldAnchorNode = null;
-            winSingleton.worldLinkEdge = null;
-
-            winSingleton.worldLinkEdge = graphEdge;
-            winSingleton.worldLink = graphEdge.worldLink;
-
-            if (winSingleton.worldLink.Transform.Count == 16)
-            {
-                Matrix4x4 localCRS = new Matrix4x4();
-                localCRS.m00 = winSingleton.worldLink.Transform[0]; localCRS.m01 = winSingleton.worldLink.Transform[1]; localCRS.m02 = winSingleton.worldLink.Transform[2]; localCRS.m03 = winSingleton.worldLink.Transform[3];
-                localCRS.m10 = winSingleton.worldLink.Transform[4]; localCRS.m11 = winSingleton.worldLink.Transform[5]; localCRS.m12 = winSingleton.worldLink.Transform[6]; localCRS.m13 = winSingleton.worldLink.Transform[7];
-                localCRS.m20 = winSingleton.worldLink.Transform[8]; localCRS.m21 = winSingleton.worldLink.Transform[9]; localCRS.m22 = winSingleton.worldLink.Transform[10]; localCRS.m23 = winSingleton.worldLink.Transform[11];
-                localCRS.m30 = winSingleton.worldLink.Transform[12]; localCRS.m31 = winSingleton.worldLink.Transform[13]; localCRS.m32 = winSingleton.worldLink.Transform[14]; localCRS.m33 = winSingleton.worldLink.Transform[15];
-                winSingleton.local_pos = localCRS.GetPosition();
-                winSingleton.local_rot = localCRS.rotation.eulerAngles;
-            }
-        }
-
-        public void OnGUI()
-        {
-            scrollPos = EditorGUILayout.BeginScrollView(scrollPos, GUILayout.ExpandWidth(true));
-
-            //style for copyrights label (left aligned)
-            var leftStyle = GUI.skin.GetStyle("Label");
-            leftStyle.alignment = TextAnchor.UpperLeft;
-
-            GUILayout.Label("Augmented Reality Framework", leftStyle);
-            GUILayout.Label("Copyright (C) 2024, ETSI (BSD 3-Clause License)", leftStyle);
-
-            //separator line
-            Rect rect = EditorGUILayout.GetControlRect(false, 1);
-            EditorGUI.DrawRect(rect, Color.gray);
-
-            switch (type)
-            {
-                case GraphEditorType.WORLDLINK:
-                    BuildWorldLinkUI();
-                    break;
-                case GraphEditorType.TRACKABLE:
-                    BuildTrackableUI();
-                    break;
-                case GraphEditorType.WORLDANCHOR:
-                    BuildWorldAnchorUI();
-                    break;
-                default:
-                    break;
-            }
-
-            EditorGUILayout.EndScrollView();
-        }
-
-        //BUILD UI FOR MODIYING THE WORLDANCHOR
-        private void BuildWorldAnchorUI()
-        {
-            if (worldAnchor != null)
-            {
-
-                //
-                //HEADER
-                //
-
-                //anchor icon
-                EditorGUILayout.BeginHorizontal();
-                Texture anchorImage = (Texture)AssetDatabase.LoadAssetAtPath("Assets/ETSI.ARF/ARF World Storage API/Images/anchor.png", typeof(Texture));
-                GUI.backgroundColor = WorldStorageWindow.arfColors[8];
-                GUILayout.Box(anchorImage, GUILayout.Width(40), GUILayout.Height(40));
-
-                //anchor label
-                EditorGUILayout.BeginVertical(GUILayout.Height(50));
-                GUILayout.FlexibleSpace();
-                EditorGUILayout.LabelField("WORLD ANCHOR", EditorStyles.boldLabel);
-                GUILayout.FlexibleSpace();
-                EditorGUILayout.EndVertical();
-                EditorGUILayout.EndHorizontal();
-
-                //separator line
-                var rect = EditorGUILayout.BeginHorizontal(GUILayout.Height(10));
-                DrawUILine(new Color(1, 0.7f, 0, 0.9f), 5, 5);
-                EditorGUILayout.EndHorizontal();
-
-                if (worldAnchorNode.titleContainer.Contains(worldAnchorNode.savedIcon))
-                {
-                    //the icon to add if the node does not correspond to an element in the server
-                    Texture2D warningImage = (Texture2D)AssetDatabase.LoadAssetAtPath("Assets/ETSI.ARF/ARF World Storage API/Images/warning.png", typeof(Texture2D));
-
-                    GUI.backgroundColor = Color.clear;
-                    GUILayout.BeginHorizontal();
-                    GUILayout.Box(warningImage, GUILayout.Width(27), GUILayout.Height(27));
-                    GUILayout.Label("This element is not synchronized with the World Storage!", EditorStyles.whiteBoldLabel);
-
-                    GUILayout.EndHorizontal();
-                }
-
-                //
-                //ELEMENT PARAMETERS
-                //
-
-                EditorGUI.BeginChangeCheck();
-
-                //uuid
-                EditorGUILayout.BeginHorizontal();
-                EditorGUILayout.LabelField("UUID ", EditorStyles.boldLabel, GUILayout.Width(50));
-                if (!SaveInfo.instance.nodePositions.ContainsKey(worldAnchor.UUID.ToString()))
-                {
-                    EditorGUILayout.LabelField("None yet (element not yet saved in the server)");
-                }
-                else
-                {
-                    EditorGUILayout.SelectableLabel(worldAnchor.UUID.ToString(), EditorStyles.textField, GUILayout.Height(EditorGUIUtility.singleLineHeight));
-                }
-                EditorGUILayout.EndHorizontal();
-
-                GUI.backgroundColor = Color.white;
-
-                //name
-                EditorGUILayout.BeginHorizontal();
-                EditorGUI.BeginChangeCheck();
-                EditorGUILayout.LabelField("Name ", EditorStyles.boldLabel, GUILayout.Width(50));
-                worldAnchor.Name = EditorGUILayout.DelayedTextField(worldAnchor.Name);
-                if (EditorGUI.EndChangeCheck())
-                {
-                    worldAnchorNode.title = worldAnchor.Name;
-                }
-                EditorGUILayout.EndHorizontal();
-
-                //unit system
-                EditorGUILayout.BeginHorizontal();
-                EditorGUILayout.LabelField("Unit ", EditorStyles.boldLabel, GUILayout.Width(50));
-                worldAnchor.Unit = (UnitSystem)EditorGUILayout.EnumPopup(worldAnchor.Unit);
-                EditorGUILayout.EndHorizontal();
-
-                //style for sublabels (right aligned)
-                var rightStyle = GUI.skin.GetStyle("Label");
-                rightStyle.alignment = TextAnchor.UpperRight;
-
-                //size
-                EditorGUILayout.BeginHorizontal();
-                EditorGUILayout.LabelField("Size ", EditorStyles.boldLabel, GUILayout.Width(50));
-                EditorGUILayout.EndHorizontal();
-                EditorGUILayout.BeginHorizontal();
-                EditorGUILayout.LabelField("Width", rightStyle, GUILayout.Width(50));
-                local_size[0] = EditorGUILayout.DelayedFloatField(local_size[0]);
-                EditorGUILayout.LabelField("Length", rightStyle, GUILayout.Width(50));
-                local_size[1] = EditorGUILayout.DelayedFloatField(local_size[1]);
-                EditorGUILayout.LabelField("Depth", rightStyle, GUILayout.Width(50));
-                local_size[2] = EditorGUILayout.DelayedFloatField(local_size[2]);
-                EditorGUILayout.EndHorizontal();
-
-                //localCRS
-                EditorGUILayout.BeginHorizontal();
-                EditorGUILayout.LabelField("Local CRS ", EditorStyles.boldLabel);
-                EditorGUILayout.EndHorizontal();
-                //position
-                EditorGUILayout.BeginHorizontal();
-                EditorGUILayout.LabelField("Position ", GUILayout.Width(60));
-                EditorGUILayout.LabelField("X", rightStyle, GUILayout.Width(15));
-                local_pos[0] = EditorGUILayout.DelayedFloatField(local_pos[0]);
-                EditorGUILayout.LabelField("Y", rightStyle, GUILayout.Width(15));
-                local_pos[1] = EditorGUILayout.DelayedFloatField(local_pos[1]);
-                EditorGUILayout.LabelField("Z", rightStyle, GUILayout.Width(15));
-                local_pos[2] = EditorGUILayout.DelayedFloatField(local_pos[2]);
-                EditorGUILayout.EndHorizontal();
-                //rotation
-                EditorGUILayout.BeginHorizontal();
-                EditorGUILayout.LabelField("Rotation ", GUILayout.Width(60));
-                EditorGUILayout.LabelField("X", rightStyle, GUILayout.Width(15));
-                local_rot[0] = EditorGUILayout.DelayedFloatField(local_rot[0]);
-                EditorGUILayout.LabelField("Y", rightStyle, GUILayout.Width(15));
-                local_rot[1] = EditorGUILayout.DelayedFloatField(local_rot[1]);
-                EditorGUILayout.LabelField("Z", rightStyle, GUILayout.Width(15));
-                local_rot[2] = EditorGUILayout.DelayedFloatField(local_rot[2]);
-                EditorGUILayout.EndHorizontal();
-
-                //keyvaluetags=================================================================================================TOBEMODIFIED
-                /*DrawUILine(Color.gray, 1, 1);
-                EditorGUILayout.BeginHorizontal();
-                GUILayout.Label("Tags ", EditorStyles.boldLabel);
-                EditorGUILayout.EndHorizontal();
-
-                EditorGUILayout.BeginVertical();
-                Dictionary<string, List<string>> tempPairs = worldAnchor.KeyvalueTags;
-                EditorGUILayout.BeginHorizontal();
-                m_newKey = GUILayout.TextField(m_newKey, GUILayout.Width(300));
-                if (GUILayout.Button("Add Key"))
-                {
-                    if (m_newKey != "")
-                    {
-                        List<string> emptyList = new List<string>();
-                        worldAnchor.KeyvalueTags.Add(m_newKey, emptyList);
-                        m_newKey = "";
-                    }
-                }
-                GUILayout.FlexibleSpace();
-                EditorGUILayout.EndHorizontal();
-                //iterator on m_newValues
-                int j = 0;
-                foreach (KeyValuePair<string, List<string>> entry in tempPairs)
-                {
-                    EditorGUILayout.BeginHorizontal();
-                    GUILayout.Label(entry.Key);
-                    GUILayout.FlexibleSpace();
-                    if (GUILayout.Button("x", GUILayout.Width(18), GUILayout.Height(18)))
-                    {
-                        worldAnchor.KeyvalueTags.Remove(entry.Key);
-                        m_newValues[j] = "";
-                    }
-                    EditorGUILayout.EndHorizontal();
-
-
-                    EditorGUILayout.BeginHorizontal();
-                    List<string> tempValues = entry.Value;
-                    foreach (string value in tempValues)
-                    {
-                        GUILayout.Label(value);
-
-                        if (GUILayout.Button("x", GUILayout.Width(18), GUILayout.Height(18)))
-                        {
-                            tempValues.Remove(value);
-                            worldAnchor.KeyvalueTags[entry.Key] = tempValues;
-                        }
-                    }
-                    GUILayout.FlexibleSpace();
-                    EditorGUILayout.EndHorizontal();
-                    EditorGUILayout.BeginHorizontal();
-                    if (m_newValues.Count < j + 1)
-                    {
-                        string value = "";
-                        m_newValues.Add(value);
-                    }
-                    m_newValues[j] = GUILayout.TextField(m_newValues[j], GUILayout.Width(200));
-                    if (GUILayout.Button("Add Value"))
-                    {
-                        if (m_newValues[j] != "")
-                        {
-                            List<string> valueList = entry.Value;
-                            valueList.Add(m_newValues[j]);
-                            worldAnchor.KeyvalueTags[entry.Key] = valueList;
-                            m_newValues[j] = "";
-                        }
-                    }
-                    GUILayout.FlexibleSpace();
-                    EditorGUILayout.EndHorizontal();
-
-                    j++;
-                }
-                EditorGUILayout.EndVertical();*/
-                //keyvaluetags=================================================================================================TOBEMODIFIED
-
-
-                //Actions when the ui fields have been changed
-                if (EditorGUI.EndChangeCheck())
-                {
-                    //
-                    Matrix4x4 localCRS = Matrix4x4.TRS(local_pos, Quaternion.Euler(local_rot), Vector3.one);
-                    Transform3D localCRSasFloat = new Transform3D
-                    {
-                        localCRS.m00,    localCRS.m01,    localCRS.m02,    localCRS.m03,
-                        localCRS.m10,    localCRS.m11,    localCRS.m12,    localCRS.m13,
-                        localCRS.m20,    localCRS.m21,    localCRS.m22,    localCRS.m23,
-                        localCRS.m30,    localCRS.m31,    localCRS.m32,    localCRS.m33,
-                    };
-                    worldAnchor.LocalCRS = localCRSasFloat;
-
-                    Size localSizeAsFloat = new Size
-                    {
-                        local_size.x,    local_size.y,    local_size.z
-                    };
-                    worldAnchor.WorldAnchorSize = localSizeAsFloat;
-
-                    if (SaveInfo.instance.nodePositions.ContainsKey(worldAnchor.UUID.ToString()) && (!SaveInfo.instance.elemsToUpdate.Contains(worldAnchor.UUID.ToString())))
-                    {
-                        SaveInfo.instance.elemsToUpdate.Add(worldAnchor.UUID.ToString());
-                    }
-                    worldAnchorNode.MarkUnsaved();
-                }
-
-                //
-                //FOOTER
-                //
-                //GUILayout.FlexibleSpace();
-                EditorGUILayout.BeginHorizontal();
-                GUILayout.FlexibleSpace();
-
-                var originalColor = GUI.backgroundColor;
-
-
-                //reload button
-                GUI.backgroundColor = Color.yellow;
-                if (GUILayout.Button("Reload"))
-                {
-                    //lose focus of fields otherwise the selected field won't updaate
-                    EditorGUI.FocusTextInControl(null);
-                    if (SaveInfo.instance.nodePositions.ContainsKey(worldAnchor.UUID.ToString()))
-                    {
-                        if (SaveInfo.instance.elemsToUpdate.Contains(worldAnchor.UUID.ToString()) && EditorUtility.DisplayDialog("Reset elements", "Are you sure you want to lose all your changes ?", "Yes", "No"))
-                        {
-                            WorldAnchorRequest.GetWorldAnchorAsync(SaveInfo.instance.worldStorageServer, worldAnchor.UUID, (response) =>
-                            {
-                                worldAnchor =
-                                worldAnchorNode.worldAnchor = worldAnchor;
-                                ShowWindow(worldAnchorNode);
-                            });
-                        }
-                    }
-                    else
-                    {
-                        if (EditorUtility.DisplayDialog("Reset elements", "Are you sure you want to lose all your changes ?", "Yes", "No"))
-                        {
-                            //generate the worldAnchor attributes
-                            Transform3D localCRS = new Transform3D();
-                            for (int i = 0; i < 15; i++)
-                            {
-                                localCRS.Add(0);
-                            }
-                            localCRS.Add(1);
-
-                            Size worldAnchorSize = new Size();
-                            for (int i = 0; i < 3; i++)
-                            {
-                                worldAnchorSize.Add(0);
-                            }
-                            worldAnchor = new WorldAnchor("DefaultWorldAnchor")
-                            {
-                                UUID = Guid.NewGuid(),
-                                CreatorUUID = Guid.Parse(SaveInfo.instance.worldStorageUser.UUID),
-                                LocalCRS = localCRS,
-                                Unit = UnitSystem.CM,
-                                WorldAnchorSize = worldAnchorSize,
-                                KeyvalueTags = new KeyvalueTagList()
-                            };
-                            worldAnchorNode.worldAnchor = worldAnchor;
-                            ShowWindow(worldAnchorNode);
-                        }
-                    }
-                }
-
-                // save button
-                GUI.backgroundColor = Color.green;
-                if (GUILayout.Button("Save"))
-                {
-                    System.Guid _creator = Guid.NewGuid(); // System.Guid.Parse(WorldStorageWindow.WorldStorageWindowSingleton.worldStorageUser.UUID);
-                    if (SaveInfo.instance.nodePositions.ContainsKey(worldAnchor.UUID.ToString()))
-                    {
-                        if (SaveInfo.instance.elemsToUpdate.Contains(worldAnchor.UUID.ToString()))
-                        {
-                            WorldAnchorRequest.UpdateWorldAnchorAsync(SaveInfo.instance.worldStorageServer, worldAnchor, (response) =>
-                            {
-                                SaveInfo.instance.elemsToUpdate.Remove(worldAnchor.UUID.ToString());
-                            });
-                        }
-                    }
-                    else
-                    {
-                        var posX = new Collection<String>();
-                        posX.Add(worldAnchorNode.GetPosition().x.ToString());
-                        var posY = new Collection<String>();
-                        posY.Add(worldAnchorNode.GetPosition().y.ToString());
-
-                        WorldAnchor worldAnchor = worldAnchorNode.worldAnchor;
-                        worldAnchor.KeyvalueTags["unityAuthoringPosX"] = posX;
-                        worldAnchor.KeyvalueTags["unityAuthoringPosY"] = posY;
-
-                        WorldAnchorRequest.CreateWorldAnchorAsync(SaveInfo.instance.worldStorageServer, worldAnchor, (response) =>
-                        {
-                            String uuid = response.result;
-
-                            //change the uuid in its edges, if there is a new edge to be added in the world storage it needs to have the correct uuid
-                            uuid = uuid.Replace("\"", "");
-                            foreach (ARFEdgeLink edge in worldAnchorNode.portIn.connections)
-                            {
-                                edge.worldLink.UUIDTo = Guid.Parse(uuid);
-                            }
-                            foreach (ARFEdgeLink edge in worldAnchorNode.portOut.connections)
-                            {
-                                edge.worldLink.UUIDFrom = Guid.Parse(uuid);
-                            }
-                            worldAnchorNode.worldAnchor.UUID = Guid.Parse(uuid);
-                            worldAnchorNode.GUID = uuid;
-                            worldAnchorNode.title = worldAnchor.Name;
-
-                            //Add the newly saved World Anchor to the SaveInfo singleton
-                            Rect trackPos = new(worldAnchorNode.GetPosition().x, worldAnchorNode.GetPosition().y, 135, 77);
-                            SaveInfo.instance.nodePositions[uuid] = trackPos;
-                        });
-                    }
-                    worldAnchorNode.MarkSaved();
-                }
-                GUILayout.Space(10);
-                EditorGUILayout.EndHorizontal();
-                GUILayout.Space(10);
-
-                GUI.backgroundColor = originalColor;
-
-
-            }
-        }
-
-        private void BuildTrackableUI()
-        {
-            if (trackable != null)
-            {
-                //
-                //HEADER
-                //
-
-                //trackable icon
-                EditorGUILayout.BeginHorizontal();
-                Texture trackImage = (Texture)AssetDatabase.LoadAssetAtPath("Assets/ETSI.ARF/ARF World Storage API/Images/trackable.png", typeof(Texture));
-                GUI.backgroundColor = WorldStorageWindow.arfColors[7];
-                GUILayout.Box(trackImage, GUILayout.Width(40), GUILayout.Height(40));
-
-                //trackable label
-                EditorGUILayout.BeginVertical(GUILayout.Height(50));
-                GUILayout.FlexibleSpace();
-                EditorGUILayout.LabelField("TRACKABLE", EditorStyles.boldLabel);
-                GUILayout.FlexibleSpace();
-                EditorGUILayout.EndVertical();
-                EditorGUILayout.EndHorizontal();
-
-                //separator line
-                var rect = EditorGUILayout.BeginHorizontal(GUILayout.Height(10));
-                DrawUILine(new Color(1, 0.31f, 0.31f, 0.9f), 5, 0);
-                EditorGUILayout.EndHorizontal();
-
-                if (trackableNode.titleContainer.Contains(trackableNode.savedIcon))
-                {
-                    //the icon to add if the node does not correspond to an element in the server
-                    Texture2D warningImage = (Texture2D)AssetDatabase.LoadAssetAtPath("Assets/ETSI.ARF/ARF World Storage API/Images/warning.png", typeof(Texture2D));
-
-                    GUI.backgroundColor = Color.clear;
-                    GUILayout.BeginHorizontal();
-                    GUILayout.Box(warningImage, GUILayout.Width(27), GUILayout.Height(27));
-                    GUILayout.Label("This element is not synchronized with the World Storage!", EditorStyles.whiteBoldLabel);
-                    GUILayout.EndHorizontal();
-                }
-
-                //
-                //ELEMENT PARAMETERS
-                //
-
-                EditorGUI.BeginChangeCheck();
-
-                //uuid
-                EditorGUILayout.BeginHorizontal();
-                EditorGUILayout.LabelField("UUID ", EditorStyles.boldLabel, GUILayout.Width(50));
-                if (!SaveInfo.instance.nodePositions.ContainsKey(trackable.UUID.ToString()))
-                {
-                    EditorGUILayout.LabelField("None yet (element not yet saved in the server)");
-                }
-                else
-                {
-                    EditorGUILayout.SelectableLabel(trackable.UUID.ToString(), EditorStyles.textField, GUILayout.Height(EditorGUIUtility.singleLineHeight));
-                }
-                EditorGUILayout.EndHorizontal();
-
-                GUI.backgroundColor = Color.white;
-
-                //name
-                EditorGUILayout.BeginHorizontal();
-                EditorGUI.BeginChangeCheck();
-                EditorGUILayout.LabelField("Name ", EditorStyles.boldLabel, GUILayout.Width(50));
-                trackable.Name = EditorGUILayout.DelayedTextField(trackable.Name);
-                if (EditorGUI.EndChangeCheck())
-                {
-                    trackableNode.title = trackable.Name;
-                }
-                EditorGUILayout.EndHorizontal();
-
-                //trackable's type
-                EditorGUILayout.BeginHorizontal();
-                EditorGUILayout.LabelField("Type ", EditorStyles.boldLabel, GUILayout.Width(50));
-                trackable.TrackableType = (TrackableType)EditorGUILayout.EnumPopup(trackable.TrackableType);
-                EditorGUILayout.EndHorizontal();
-
-                //unit system
-                EditorGUILayout.BeginHorizontal();
-                EditorGUILayout.LabelField("Unit ", EditorStyles.boldLabel, GUILayout.Width(50));
-                trackable.Unit = (UnitSystem)EditorGUILayout.EnumPopup(trackable.Unit);
-                EditorGUILayout.EndHorizontal();
-
-                //style for sublabels (right aligned)
-                var rightStyle = GUI.skin.GetStyle("Label");
-                rightStyle.alignment = TextAnchor.UpperRight;
-
-                //size
-                EditorGUILayout.BeginHorizontal();
-                EditorGUILayout.LabelField("Size ", EditorStyles.boldLabel, GUILayout.Width(50));
-                EditorGUILayout.EndHorizontal();
-                EditorGUILayout.BeginHorizontal();
-                EditorGUILayout.LabelField("Width", rightStyle, GUILayout.Width(50));
-                local_size[0] = EditorGUILayout.DelayedFloatField(local_size[0]);
-                EditorGUILayout.LabelField("Length", rightStyle, GUILayout.Width(50));
-                local_size[1] = EditorGUILayout.DelayedFloatField(local_size[1]);
-                EditorGUILayout.LabelField("Depth", rightStyle, GUILayout.Width(50));
-                local_size[2] = EditorGUILayout.DelayedFloatField(local_size[2]);
-                EditorGUILayout.EndHorizontal();
-
-                //localCRS
-                EditorGUILayout.BeginHorizontal();
-                EditorGUILayout.LabelField("Local CRS ", EditorStyles.boldLabel);
-                EditorGUILayout.EndHorizontal();
-                //position
-                EditorGUILayout.BeginHorizontal();
-                EditorGUILayout.LabelField("Position ", GUILayout.Width(60));
-                EditorGUILayout.LabelField("X", rightStyle, GUILayout.Width(15));
-                local_pos[0] = EditorGUILayout.DelayedFloatField(local_pos[0]);
-                EditorGUILayout.LabelField("Y", rightStyle, GUILayout.Width(15));
-                local_pos[1] = EditorGUILayout.DelayedFloatField(local_pos[1]);
-                EditorGUILayout.LabelField("Z", rightStyle, GUILayout.Width(15));
-                local_pos[2] = EditorGUILayout.DelayedFloatField(local_pos[2]);
-                EditorGUILayout.EndHorizontal();
-                //rotation
-                EditorGUILayout.BeginHorizontal();
-                EditorGUILayout.LabelField("Rotation ", GUILayout.Width(60));
-                EditorGUILayout.LabelField("X", rightStyle, GUILayout.Width(15));
-                local_rot[0] = EditorGUILayout.DelayedFloatField(local_rot[0]);
-                EditorGUILayout.LabelField("Y", rightStyle, GUILayout.Width(15));
-                local_rot[1] = EditorGUILayout.DelayedFloatField(local_rot[1]);
-                EditorGUILayout.LabelField("Z", rightStyle, GUILayout.Width(15));
-                local_rot[2] = EditorGUILayout.DelayedFloatField(local_rot[2]);
-                EditorGUILayout.EndHorizontal();
-
-                //encodingInofrmation
-                EditorGUILayout.BeginHorizontal();
-                EditorGUILayout.LabelField("Trackable Information ", EditorStyles.boldLabel);
-                EditorGUILayout.EndHorizontal();
-                EditorGUILayout.BeginHorizontal();
-                EditorGUILayout.LabelField("Format ", GUILayout.Width(50));
-                trackable.TrackableEncodingInformation.DataFormat = (EncodingInformationStructureDataFormat)EditorGUILayout.EnumPopup(trackable.TrackableEncodingInformation.DataFormat);
-                EditorGUILayout.LabelField("Version ", GUILayout.Width(50));
-                float floatVersion;
-                if (trackable.TrackableEncodingInformation.Version != null)
-                {
-                    floatVersion = EditorGUILayout.DelayedFloatField(float.Parse(trackable.TrackableEncodingInformation.Version.Replace(".", ",")));
-                }
-                else
-                {
-                    floatVersion = EditorGUILayout.DelayedFloatField(0);
-                }
-                trackable.TrackableEncodingInformation.Version = floatVersion.ToString();
-                EditorGUILayout.EndHorizontal();
-
-                /*//trackable payload
-                EditorGUILayout.BeginHorizontal();
-                EditorGUILayout.LabelField("Trackable Payload ", EditorStyles.boldLabel, GUILayout.Width(140));
-                EditorGUILayout.LabelField("===============================================================================");
-                EditorGUILayout.EndHorizontal();*/
-
-                //keyvaluetags=================================================================================================TOBEMODIFIED
-                /*EditorGUILayout.BeginHorizontal();
-                GUILayout.Label("Tags ", EditorStyles.boldLabel);
-                EditorGUILayout.EndHorizontal();
-
-                EditorGUILayout.BeginVertical();
-                Dictionary<string, List<string>> tempPairs = trackable.KeyvalueTags;
-                EditorGUILayout.BeginHorizontal();
-                m_newKey = GUILayout.TextField(m_newKey, GUILayout.Width(300));
-                if (GUILayout.Button("Add Key"))
-                {
-                    if (m_newKey != "")
-                    {
-                        List<string> emptyList = new List<string>();
-                        trackable.KeyvalueTags.Add(m_newKey, emptyList);
-                        m_newKey = "";
-                    }
-                }
-                GUILayout.FlexibleSpace();
-                EditorGUILayout.EndHorizontal();
-                //iterator on m_newValues
-                int j = 0;
-                foreach (KeyValuePair<string, List<string>> entry in tempPairs)
-                {
-                    DrawUILine(Color.gray, 1, 1);
-                    EditorGUILayout.BeginHorizontal();
-                    GUILayout.Label(entry.Key);
-                    GUILayout.FlexibleSpace();
-                    if (GUILayout.Button("x", GUILayout.Width(18), GUILayout.Height(18)))
-                    {
-                        trackable.KeyvalueTags.Remove(entry.Key);
-                        m_newValues[j] = "";
-                    }
-                    EditorGUILayout.EndHorizontal();
-
-
-                    EditorGUILayout.BeginHorizontal();
-                    List<string> tempValues = entry.Value;
-                    foreach (string value in tempValues)
-                    {
-                        GUILayout.Label(value);
-
-                        if (GUILayout.Button("x", GUILayout.Width(18), GUILayout.Height(18)))
-                        {
-                            tempValues.Remove(value);
-                            trackable.KeyvalueTags[entry.Key] = tempValues;
-                        }
-                    }
-                    GUILayout.FlexibleSpace();
-                    EditorGUILayout.EndHorizontal();
-                    EditorGUILayout.BeginHorizontal();
-                    if (m_newValues.Count < j + 1)
-                    {
-                        string value = "";
-                        m_newValues.Add(value);
-                    }
-                    m_newValues[j] = GUILayout.TextField(m_newValues[j], GUILayout.Width(200));
-                    if (GUILayout.Button("Add Value"))
-                    {
-                        if (m_newValues[j] != "")
-                        {
-                            List<string> valueList = entry.Value;
-                            valueList.Add(m_newValues[j]);
-                            trackable.KeyvalueTags[entry.Key] = valueList;
-                            m_newValues[j] = "";
-                        }
-                    }
-                    GUILayout.FlexibleSpace();
-                    EditorGUILayout.EndHorizontal();
-
-                    j++;
-                }
-                EditorGUILayout.EndVertical();*//*EditorGUILayout.BeginHorizontal();
-                GUILayout.Label("Tags ", EditorStyles.boldLabel);
-                EditorGUILayout.EndHorizontal();
-
-                EditorGUILayout.BeginVertical();
-                Dictionary<string, List<string>> tempPairs = trackable.KeyvalueTags;
-                EditorGUILayout.BeginHorizontal();
-                m_newKey = GUILayout.TextField(m_newKey, GUILayout.Width(300));
-                if (GUILayout.Button("Add Key"))
-                {
-                    if (m_newKey != "")
-                    {
-                        List<string> emptyList = new List<string>();
-                        trackable.KeyvalueTags.Add(m_newKey, emptyList);
-                        m_newKey = "";
-                    }
-                }
-                GUILayout.FlexibleSpace();
-                EditorGUILayout.EndHorizontal();
-                //iterator on m_newValues
-                int j = 0;
-                foreach (KeyValuePair<string, List<string>> entry in tempPairs)
-                {
-                    DrawUILine(Color.gray, 1, 1);
-                    EditorGUILayout.BeginHorizontal();
-                    GUILayout.Label(entry.Key);
-                    GUILayout.FlexibleSpace();
-                    if (GUILayout.Button("x", GUILayout.Width(18), GUILayout.Height(18)))
-                    {
-                        trackable.KeyvalueTags.Remove(entry.Key);
-                        m_newValues[j] = "";
-                    }
-                    EditorGUILayout.EndHorizontal();
-
-
-                    EditorGUILayout.BeginHorizontal();
-                    List<string> tempValues = entry.Value;
-                    foreach (string value in tempValues)
-                    {
-                        GUILayout.Label(value);
-
-                        if (GUILayout.Button("x", GUILayout.Width(18), GUILayout.Height(18)))
-                        {
-                            tempValues.Remove(value);
-                            trackable.KeyvalueTags[entry.Key] = tempValues;
-                        }
-                    }
-                    GUILayout.FlexibleSpace();
-                    EditorGUILayout.EndHorizontal();
-                    EditorGUILayout.BeginHorizontal();
-                    if (m_newValues.Count < j + 1)
-                    {
-                        string value = "";
-                        m_newValues.Add(value);
-                    }
-                    m_newValues[j] = GUILayout.TextField(m_newValues[j], GUILayout.Width(200));
-                    if (GUILayout.Button("Add Value"))
-                    {
-                        if (m_newValues[j] != "")
-                        {
-                            List<string> valueList = entry.Value;
-                            valueList.Add(m_newValues[j]);
-                            trackable.KeyvalueTags[entry.Key] = valueList;
-                            m_newValues[j] = "";
-                        }
-                    }
-                    GUILayout.FlexibleSpace();
-                    EditorGUILayout.EndHorizontal();
-
-                    j++;
-                }
-                EditorGUILayout.EndVertical();*/
-                //keyvaluetags=================================================================================================TOBEMODIFIED
-
-
-                //Actions when the ui fields have been changed
-                if (EditorGUI.EndChangeCheck())
-                {
-                    //
-                    Matrix4x4 localCRS = Matrix4x4.TRS(local_pos, Quaternion.Euler(local_rot), Vector3.one);
-                    Transform3D localCRSasFloat = new Transform3D
-                    {
-                        localCRS.m00,    localCRS.m01,    localCRS.m02,    localCRS.m03,
-                        localCRS.m10,    localCRS.m11,    localCRS.m12,    localCRS.m13,
-                        localCRS.m20,    localCRS.m21,    localCRS.m22,    localCRS.m23,
-                        localCRS.m30,    localCRS.m31,    localCRS.m32,    localCRS.m33,
-                    };
-                    trackable.LocalCRS = localCRSasFloat;
-
-                    Size localSizeAsFloat = new Size
-                    {
-                        local_size.x,    local_size.y,    local_size.z
-                    };
-                    trackable.TrackableSize = localSizeAsFloat;
-
-                    if (SaveInfo.instance.nodePositions.ContainsKey(trackable.UUID.ToString()) && (!SaveInfo.instance.elemsToUpdate.Contains(trackable.UUID.ToString())))
-                    {
-                        SaveInfo.instance.elemsToUpdate.Add(trackable.UUID.ToString());
-                    }
-                    trackableNode.MarkUnsaved();
-                }
-
-                //
-                //FOOTER
-                //
-                GUILayout.FlexibleSpace();
-                EditorGUILayout.BeginHorizontal();
-                GUILayout.FlexibleSpace();
-
-                var originalColor = GUI.backgroundColor;
-
-                //reload button
-                GUI.backgroundColor = Color.yellow;
-                if (GUILayout.Button("Reload"))
-                {
-                    //lose focus of fields otherwise the selected field won't updaate
-                    EditorGUI.FocusTextInControl(null);
-                    if (SaveInfo.instance.nodePositions.ContainsKey(trackable.UUID.ToString()))
-                    {
-                        if (SaveInfo.instance.elemsToUpdate.Contains(trackable.UUID.ToString()) && EditorUtility.DisplayDialog("Reset elements", "Are you sure you want to lose all your changes ?", "Yes", "No"))
-                        {
-                            TrackableRequest.GetTrackableAsync(SaveInfo.instance.worldStorageServer, trackable.UUID, (response) =>
-                            {
-                                trackable = response.result;
-                                trackableNode.trackable = trackable;
-                                ShowWindow(trackableNode);
-                            });
-                        }
-                    }
-                    else
-                    {
-                        if (EditorUtility.DisplayDialog("Reset elements", "Are you sure you want to lose all your changes ?", "Yes", "No"))
-                        {
-                            //generate the Trackables's attributes
-                            EncodingInformationStructure trackableEncodingInformation = new EncodingInformationStructure()
-                            {
-                                DataFormat = EncodingInformationStructureDataFormat.OTHER,
-                                Version = "0"
-                            };
-
-                            Transform3D localCRS = new Transform3D();
-                            for (int i = 0; i < 15; i++)
-                            {
-                                localCRS.Add(0);
-                            }
-                            localCRS.Add(1);
-
-                            Size trackableSize = new Size();
-                            for (int i = 0; i < 3; i++)
-                            {
-                                trackableSize.Add(0);
-                            }
-
-                            Trackable trackable = new Trackable("DefaultTrackable")
-                            {
-                                UUID = Guid.NewGuid(),
-                                CreatorUUID = Guid.Parse(SaveInfo.instance.worldStorageUser.UUID),
-                                TrackableType = TrackableType.OTHER,
-                                TrackableEncodingInformation = trackableEncodingInformation,
-                                TrackablePayload = new byte[64],
-                                LocalCRS = localCRS,
-                                Unit = UnitSystem.CM,
-                                Confidence = 0,
-                                TrackableSize = trackableSize,
-                                KeyvalueTags = new KeyvalueTagList()
-                            };
-                            trackableNode.trackable = trackable;
-                            ShowWindow(trackableNode);
-                        }
-                    }
-                }
-
-                //save button
-                GUI.backgroundColor = Color.green;
-                if (GUILayout.Button("Save"))
-                {
-                    if (SaveInfo.instance.nodePositions.ContainsKey(trackable.UUID.ToString()))
-                    {
-                        if (SaveInfo.instance.elemsToUpdate.Contains(trackable.UUID.ToString()))
-                        {
-                            TrackableRequest.UpdateTrackableAsync(SaveInfo.instance.worldStorageServer, trackable, (response) =>
-                            {
-                                SaveInfo.instance.elemsToUpdate.Remove(trackable.UUID.ToString());
-                            });
-                        }
-                    }
-                    else
-                    {
-                        var posX = new Collection<String>();
-                        posX.Add(trackableNode.GetPosition().x.ToString());
-                        var posY = new Collection<String>();
-                        posY.Add(trackableNode.GetPosition().y.ToString());
-                        Trackable trackable = trackableNode.trackable;
-                        trackable.KeyvalueTags["unityAuthoringPosX"] = posX;
-                        trackable.KeyvalueTags["unityAuthoringPosY"] = posY;
-                        TrackableRequest.CreateTrackableAsync(SaveInfo.instance.worldStorageServer, trackable, (response) =>
-                        {
-                            String uuid = response.result;
-
-                            //change the uuid in its edges, if there is a new edge to be added in the world storage it needs to have the correct uuid
-                            uuid = uuid.Replace("\"", "");
-                            foreach (ARFEdgeLink edge in trackableNode.portIn.connections)
-                            {
-                                edge.worldLink.UUIDTo = Guid.Parse(uuid);
-                            }
-                            foreach (ARFEdgeLink edge in trackableNode.portOut.connections)
-                            {
-                                edge.worldLink.UUIDFrom = Guid.Parse(uuid);
-                            }
-                            trackableNode.trackable.UUID = Guid.Parse(uuid);
-                            trackableNode.GUID = uuid;
-                            trackableNode.title = trackable.Name;
-
-                            //Add the newly saved Trackable to the SaveInfo singleton
-                            Rect trackPos = new(trackableNode.GetPosition().x, trackableNode.GetPosition().y, 135, 77);
-                            SaveInfo.instance.nodePositions[uuid] = trackPos;
-                        });
-                    }
-                    trackableNode.MarkSaved();
-                }
-                GUILayout.Space(10);
-                EditorGUILayout.EndHorizontal();
-                GUILayout.Space(10);
-
-                GUI.backgroundColor = originalColor;
-
-
-            }
-        }
-
-        private void BuildWorldLinkUI()
-        {
-            if (worldLink != null)
-            {
-                //
-                //HEADER
-                //
-
-                //world link icon
-                EditorGUILayout.BeginHorizontal();
-                Texture linkImage = (Texture)AssetDatabase.LoadAssetAtPath("Assets/ETSI.ARF/ARF World Storage API/Images/link.png", typeof(Texture));
-                GUI.backgroundColor = WorldStorageWindow.arfColors[9];
-                GUILayout.Box(linkImage, GUILayout.Width(40), GUILayout.Height(40));
-
-                //world link label
-                EditorGUILayout.BeginVertical(GUILayout.Height(50));
-                GUILayout.FlexibleSpace();
-                EditorGUILayout.LabelField("WORLD LINK", EditorStyles.boldLabel);
-                GUILayout.FlexibleSpace();
-                EditorGUILayout.EndVertical();
-                EditorGUILayout.EndHorizontal();
-
-                //separator line
-                var rect = EditorGUILayout.BeginHorizontal(GUILayout.Height(10));
-                DrawUILine(new Color(0.66f, 0.39f, 1, 0.77f), 5, 5);
-                EditorGUILayout.EndHorizontal();
-
-                if (worldLinkEdge.contentContainer.Contains(worldLinkEdge.savedIcon))
-                {
-                    //the icon to add if the node does not correspond to an element in the server
-                    Texture2D warningImage = (Texture2D)AssetDatabase.LoadAssetAtPath("Assets/ETSI.ARF/ARF World Storage API/Images/warning.png", typeof(Texture2D));
-
-                    GUI.backgroundColor = Color.clear;
-                    GUILayout.BeginHorizontal();
-                    GUILayout.Box(warningImage, GUILayout.Width(27), GUILayout.Height(27));
-                    GUILayout.Label("This element is not synchronized with the World Storage!", EditorStyles.whiteBoldLabel);
-                    GUILayout.EndHorizontal();
-                }
-
-                //ELEMENT'S ATTRIBUTES
-                EditorGUI.BeginChangeCheck();
-
-                GUI.backgroundColor = Color.white;
-
-                //uuid
-                EditorGUILayout.BeginHorizontal();
-                EditorGUILayout.LabelField("UUID ", EditorStyles.boldLabel, GUILayout.Width(50));
-                if (!SaveInfo.instance.linkIds.Contains(worldLink.UUID.ToString()))
-                {
-                    EditorGUILayout.LabelField("None yet (element not yet saved in the server)");
-                }
-                else
-                {
-                    EditorGUILayout.SelectableLabel(worldLink.UUID.ToString(), EditorStyles.textField, GUILayout.Height(EditorGUIUtility.singleLineHeight));
-                }
-                EditorGUILayout.EndHorizontal();
-
-                //source element
-                EditorGUILayout.LabelField("Source Element (From element)", EditorStyles.boldLabel);
-                EditorGUILayout.BeginHorizontal();
-                GUILayout.Space(50);
-                EditorGUILayout.LabelField("Name ", GUILayout.Width(75));
-                EditorGUILayout.LabelField(worldLinkEdge.output.node.title);
-                EditorGUILayout.EndHorizontal();
-                EditorGUILayout.BeginHorizontal();
-                GUILayout.Space(50);
-                EditorGUILayout.LabelField("Type ", GUILayout.Width(75));
-                EditorGUILayout.LabelField(worldLink.TypeFrom.ToString(), GUILayout.Width(80));
-                EditorGUILayout.EndHorizontal();
-                EditorGUILayout.BeginHorizontal();
-                GUILayout.Space(50);
-                EditorGUILayout.LabelField("UUID ", GUILayout.Width(75));
-                if (SaveInfo.instance.nodePositions.ContainsKey(worldLink.UUIDFrom.ToString()))
-                {
-                    EditorGUILayout.LabelField(worldLink.UUIDFrom.ToString());
-                }
-                else
-                {
-                    EditorGUILayout.LabelField("no UUID yet (element not yet saved in the server)");
-                }
-                EditorGUILayout.EndHorizontal();
-
-                //target element
-                EditorGUILayout.LabelField("Target Element (To element)", EditorStyles.boldLabel);
-                EditorGUILayout.BeginHorizontal();
-                GUILayout.Space(50);
-                EditorGUILayout.LabelField("Name ", GUILayout.Width(70));
-                EditorGUILayout.LabelField(worldLinkEdge.input.node.title);
-                EditorGUILayout.EndHorizontal();
-                EditorGUILayout.BeginHorizontal();
-                GUILayout.Space(50);
-                EditorGUILayout.LabelField("Type ", GUILayout.Width(70));
-                EditorGUILayout.LabelField(worldLink.TypeTo.ToString(), GUILayout.Width(80));
-                EditorGUILayout.EndHorizontal();
-                EditorGUILayout.BeginHorizontal();
-                GUILayout.Space(50);
-                EditorGUILayout.LabelField("UUID ", GUILayout.Width(70));
-                if (SaveInfo.instance.nodePositions.ContainsKey(worldLink.UUIDTo.ToString()))
-                {
-                    EditorGUILayout.LabelField(worldLink.UUIDTo.ToString());
-                }
-                else
-                {
-                    EditorGUILayout.LabelField("no UUID yet (element not yet saved in the server)");
-                }
-                EditorGUILayout.EndHorizontal();
-
-                //unit system
-                EditorGUILayout.BeginHorizontal();
-                EditorGUILayout.LabelField("Unit ", EditorStyles.boldLabel, GUILayout.Width(50));
-                worldLink.Unit = (UnitSystem)EditorGUILayout.EnumPopup(worldLink.Unit);
-                EditorGUILayout.EndHorizontal();
-
-                //style for sublabels (right aligned)
-                var rightStyle = GUI.skin.GetStyle("Label");
-                rightStyle.alignment = TextAnchor.UpperRight;
-
-                //localCRS
-                EditorGUILayout.BeginHorizontal();
-                EditorGUILayout.LabelField("3D Transform ", EditorStyles.boldLabel);
-                EditorGUILayout.EndHorizontal();
-                //position
-                EditorGUILayout.BeginHorizontal();
-                EditorGUILayout.LabelField("Position ", GUILayout.Width(60));
-                EditorGUILayout.LabelField("X", rightStyle, GUILayout.Width(15));
-                local_pos[0] = EditorGUILayout.DelayedFloatField(local_pos[0]);
-                EditorGUILayout.LabelField("Y", rightStyle, GUILayout.Width(15));
-                local_pos[1] = EditorGUILayout.DelayedFloatField(local_pos[1]);
-                EditorGUILayout.LabelField("Z", rightStyle, GUILayout.Width(15));
-                local_pos[2] = EditorGUILayout.DelayedFloatField(local_pos[2]);
-                EditorGUILayout.EndHorizontal();
-                //rotation
-                EditorGUILayout.BeginHorizontal();
-                EditorGUILayout.LabelField("Rotation ", GUILayout.Width(60));
-                EditorGUILayout.LabelField("X", rightStyle, GUILayout.Width(15));
-                local_rot[0] = EditorGUILayout.DelayedFloatField(local_rot[0]);
-                EditorGUILayout.LabelField("Y", rightStyle, GUILayout.Width(15));
-                local_rot[1] = EditorGUILayout.DelayedFloatField(local_rot[1]);
-                EditorGUILayout.LabelField("Z", rightStyle, GUILayout.Width(15));
-                local_rot[2] = EditorGUILayout.DelayedFloatField(local_rot[2]);
-                EditorGUILayout.EndHorizontal();
-
-                //Actions when the ui fields have been changed
-                if (EditorGUI.EndChangeCheck())
-                {
-                    //
-                    Matrix4x4 localCRS = Matrix4x4.TRS(local_pos, Quaternion.Euler(local_rot), Vector3.one);
-                    Transform3D localCRSasFloat = new Transform3D
-                    {
-                        localCRS.m00,    localCRS.m01,    localCRS.m02,    localCRS.m03,
-                        localCRS.m10,    localCRS.m11,    localCRS.m12,    localCRS.m13,
-                        localCRS.m20,    localCRS.m21,    localCRS.m22,    localCRS.m23,
-                        localCRS.m30,    localCRS.m31,    localCRS.m32,    localCRS.m33,
-                    };
-                    worldLink.Transform = localCRSasFloat;
-
-                    if (SaveInfo.instance.linkIds.Contains(worldLink.UUID.ToString()) && (!SaveInfo.instance.elemsToUpdate.Contains(worldLink.UUID.ToString())))
-                    {
-                        SaveInfo.instance.elemsToUpdate.Add(worldLink.UUID.ToString());
-                    }
-                    worldLinkEdge.MarkUnsaved();
-                }
-
-                //
-                //FOOTER
-                //
-                GUILayout.FlexibleSpace();
-                EditorGUILayout.BeginHorizontal();
-                GUILayout.FlexibleSpace();
-
-                var originalColor = GUI.backgroundColor;
-
-                //reload button
-                GUI.backgroundColor = Color.yellow;
-                if (GUILayout.Button("Reload"))
-                {
-                    //lose focus of fields otherwise the selected field won't updaate
-                    EditorGUI.FocusTextInControl(null);
-                    if (SaveInfo.instance.linkIds.Contains(worldLink.UUID.ToString()))
-                    {
-                        if (SaveInfo.instance.elemsToUpdate.Contains(worldLink.UUID.ToString()) && EditorUtility.DisplayDialog("Reset elements", "Are you sure you want to lose all your changes ?", "Yes", "No"))
-                        {
-                            WorldLinkRequest.GetWorldLinkAsync(SaveInfo.instance.worldStorageServer, worldLink.UUID, (response) =>
-                        {
-                            worldLink = response.result;
-                            worldLinkEdge.worldLink = worldLink;
-                            ShowWindow(worldLinkEdge);
-                        });
-                        }
-                    }
-                    else
-                    {
-                        if (EditorUtility.DisplayDialog("Reset elements", "Are you sure you want to lose all your changes ?", "Yes", "No"))
-                        {
-                            Transform3D transform = new Transform3D();
-                            for (int i = 0; i < 15; i++)
-                            {
-                                transform.Add(0);
-                            }
-                            transform.Add(1);
-
-                            worldLink.Transform = transform;
-                            worldLink.Unit = UnitSystem.CM;
-                            ShowWindow(worldLinkEdge);
-                        }
-                    }
-                }
-
-                //save button
-                GUI.backgroundColor = Color.green;
-                if (GUILayout.Button("Save"))
-                {
-                    //if one of the connected elements is not in the server, you can't save the link
-                    if ((SaveInfo.instance.nodePositions.ContainsKey(worldLink.UUIDTo.ToString()) && SaveInfo.instance.nodePositions.ContainsKey(worldLink.UUIDFrom.ToString())))
-                    {
-                        if (SaveInfo.instance.linkIds.Contains(worldLink.UUID.ToString()))
-                        {
-                            if (SaveInfo.instance.elemsToUpdate.Contains(worldLink.UUID.ToString()))
-                            {
-                                WorldLinkRequest.UpdateWorldLinkAsync(SaveInfo.instance.worldStorageServer, worldLink, (response) =>
-                                {
-                                    SaveInfo.instance.elemsToUpdate.Remove(worldLink.UUID.ToString());
-                                });
-                            }
-                        }
-                        else
-                        {
-                            WorldLinkRequest.CreateWorldLinkAsync(SaveInfo.instance.worldStorageServer, worldLink, (response) =>
-                            {
-                                String uuid = response.result;
-
-                                //Add the newly saved WorldLink to the SaveInfo singleton
-                                uuid = uuid.Replace("\"", "");
-                                worldLink.UUID = Guid.Parse(uuid);
-                                worldLinkEdge.GUID = uuid;
-                                SaveInfo.instance.linkIds.Add(uuid);
-                            });
-                        }
-                        worldLinkEdge.MarkSaved();
-                    }
-                    else
-                    {
-                        EditorUtility.DisplayDialog("Error", "You are not able to save this link because at least one of its connected elements is not saved in the World Storage", "Ok");
-                    }
-                }
-                GUILayout.Space(10);
-                EditorGUILayout.EndHorizontal();
-                GUILayout.Space(10);
-
-            }
-        }
-
-        //utilty method to draw lines
-        public static void DrawUILine(Color color, int thickness = 2, int padding = 10)
-        {
-            Rect r = EditorGUILayout.GetControlRect(GUILayout.Height(padding + thickness));
-            r.height = thickness;
-            r.y += padding / 2;
-            r.x -= 2;
-            r.width += 6;
-            EditorGUI.DrawRect(r, color);
-        }
-    }
-}
\ No newline at end of file
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/GraphEditorWindow.cs.meta b/Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/GraphEditorWindow.cs.meta
deleted file mode 100644
index 10797498c8160eb8e60e846ba012c764bd775c18..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/GraphEditorWindow.cs.meta	
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: e219817d65c8b1f40ad85e6185e89e92
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/TrackableWindow.cs b/Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/TrackableWindow.cs
deleted file mode 100644
index 69f7b229e72dbe3419edd9fb3f48f53898c6c144..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/TrackableWindow.cs	
+++ /dev/null
@@ -1,378 +0,0 @@
-//
-// ARF - Augmented Reality Framework (ETSI ISG ARF)
-//
-// Copyright 2024 ETSI
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// Last change: June 2024
-//
-
-#define isDEBUG
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-
-using UnityEngine;
-using UnityEditor;
-using TMPro;
-
-using ETSI.ARF.WorldStorage.REST;
-using ETSI.ARF.OpenAPI.WorldStorage;
-
-namespace ETSI.ARF.WorldStorage.UI
-{
-    public class TrackableWindow : BaseWindow<Trackable>
-    {
-        static public TrackableWindow winSingleton;
-
-        // Trackable params
-        string UUID = System.Guid.Empty.ToString();
-        string customName = "NotDefined";
-        string creatorUUID = System.Guid.Empty.ToString();
-        double confidence = 0f;
-        TrackableType type = TrackableType.OTHER;
-        UnitSystem unit = UnitSystem.CM;
-        Vector3 trackableSize;
-        Vector3 localCRS_pos;
-        Vector3 localCRS_rot;
-        byte[] trackablePayload = new byte[1] { 0 };
-
-        //graph params to generate the node
-        public bool useCoord;
-        public float nodePosX = 0;
-        public float nodePosY = 0;
-
-        public TrackableWindow()
-        {
-            // init somne stuffs
-        }
-
-        public static void ShowWindow(WorldStorageServer ws, WorldStorageUser user, string UUID = "")
-        {
-            winSingleton = EditorWindow.GetWindow(typeof(TrackableWindow), false, "ETSI ARF - Trackable") as TrackableWindow;
-            winSingleton.worldStorageServer = ws;
-            winSingleton.worldStorageUser = user;
-            if (!string.IsNullOrEmpty(UUID))
-            {
-                winSingleton.saveText = "Update";
-                winSingleton.UUID = UUID;
-                winSingleton.GetParams();
-            }
-            else
-            {
-                // Create new one
-                winSingleton.saveText = "Create";
-                winSingleton.AddObject();
-            }
-        }
-
-        public static GameObject GenerateAndUpdateVisual(string UUID, string name, Vector3 pos, Vector3 rot)
-        {
-            ETSI.ARF.WorldStorage.UI.Prefabs.WorldStoragePrefabs prefabs;
-            prefabs = (Prefabs.WorldStoragePrefabs)Resources.Load("ARFPrefabs");
-            GameObject arf = GameObject.Find("ARF Visuals");
-            GameObject visual = GameObject.Find(UUID);
-
-            if (arf == null) arf = new GameObject("ARF Visuals");
-            if (visual == null)
-            {
-                visual = SceneAsset.Instantiate<GameObject>(prefabs.trackablePrefab, pos, Quaternion.Euler(rot), arf.transform); // TODO rot
-                visual.name = UUID;
-            }
-            else
-            {
-                visual.transform.SetPositionAndRotation(pos, Quaternion.Euler(rot));
-            }
-            visual.transform.Find("Canvas/Text").GetComponent<TextMeshProUGUI>().text = $"Name: { name }\nUUID: { UUID }";
-            return visual;
-        }
-
-        void OnGUI()
-        {
-            ori = GUI.backgroundColor; // remember ori color
-
-            gsTest = new GUIStyle("window");
-            //gsTest.normal.textColor = WorldStorageWindow.arfColors[0];
-            gsTest.fontStyle = FontStyle.Bold;
-            gsTest.alignment = TextAnchor.UpperLeft;
-            gsTest.fontSize = 16;
-
-            scrollPos = EditorGUILayout.BeginScrollView(scrollPos, GUILayout.ExpandWidth(true));
-            WorldStorageWindow.DrawCopyright();
-
-            DrawUIStuffs();
-
-            EditorGUILayout.EndScrollView();
-
-            if (GUILayout.Button("Close Window"))
-            {
-                Close();
-            }
-        }
-
-        public override void DrawUIStuffs()// Trackable trackable)
-        {
-            GUILayout.BeginVertical(); // "Trackable Editor", gsTest);
-            EditorGUILayout.Space();
-
-            GUILayout.BeginHorizontal();
-            GUI.backgroundColor = WorldStorageWindow.arfColors[7];
-            Texture trackableImage = (Texture)AssetDatabase.LoadAssetAtPath("Assets/ETSI.ARF/ARF World Storage API/Images/trackable.png", typeof(Texture));
-            GUILayout.Box(trackableImage, GUILayout.Width(24), GUILayout.Height(24));
-            GUI.backgroundColor = ori;
-            GUILayout.Label("Trackable Parameters:", EditorStyles.whiteBoldLabel);
-            GUILayout.EndHorizontal();
-
-            Rect rect = EditorGUILayout.GetControlRect(false, WorldStorageWindow.lineH);
-            EditorGUI.DrawRect(rect, WorldStorageWindow.arfColors[7]);
-
-            //
-            GUILayout.Label("Server: " + worldStorageServer.serverName, EditorStyles.whiteLargeLabel);
-            GUILayout.Label("User: " + worldStorageUser.userName, EditorStyles.whiteLargeLabel);
-            EditorGUILayout.Space();
-
-#if isDEBUG
-            GUILayout.Label("UUID: " + UUID, EditorStyles.miniLabel); // readonly
-            GUILayout.Label("Creator UID: " + creatorUUID, EditorStyles.miniLabel); // readonly
-            EditorGUILayout.Space();
-#endif
-            customName = EditorGUILayout.TextField("Name of Trackable:", customName);
-            EditorGUILayout.Space();
-
-            // ---------------------
-            // Toolbar
-            // ---------------------
-            EditorGUILayout.BeginHorizontal();
-            GUI.backgroundColor = WorldStorageWindow.arfColors[2];
-            if (GUILayout.Button(saveText))
-            {
-                Debug.Log("PUT Trackable");
-
-                if (!string.IsNullOrEmpty(UUID) && UUID != "0" && UUID != System.Guid.Empty.ToString())
-                {
-                    Trackable obj = GenerateObject();
-                    TrackableRequest.UpdateTrackableAsync(worldStorageServer, obj, (response) =>
-                    {
-                        UUID = response.result;
-                        UUID = UUID.Trim('"'); //Bugfix: remove " from server return value
-
-                        if (WorldStorageWindow.WorldStorageWindowSingleton != null)
-                        {
-                            WorldStorageWindow.WorldStorageWindowSingleton.GetTrackables();
-                        }
-                        Close();
-                    });
-                }
-            }
-
-            GUI.backgroundColor = WorldStorageWindow.arfColors[3];
-            if (GUILayout.Button("Delete"))
-            {
-                if (EditorUtility.DisplayDialog("Delete", "Are you sure you want to delete this Trackable?", "Delete", "Cancel"))
-                {
-                    Debug.Log("Delete Trackable");
-                    TrackableRequest.DeleteTrackableAsync(worldStorageServer, Guid.Parse(UUID), (response) =>
-                    {
-                        UUID = System.Guid.Empty.ToString();
-                        customName = "Warning: Object deleted !";
-                        creatorUUID = System.Guid.Empty.ToString();
-                        confidence = 0f;
-                        type = TrackableType.OTHER;
-                        unit = UnitSystem.CM;
-                        if (WorldStorageWindow.WorldStorageWindowSingleton != null)
-                        {
-                            WorldStorageWindow.WorldStorageWindowSingleton.GetTrackables();
-                        }
-                        Close();
-                    });
-                }
-            }
-            GUI.backgroundColor = ori;
-
-            GUI.backgroundColor = WorldStorageWindow.arfColors[5];
-            if (GUILayout.Button("Generate/Update GameObject"))
-            {
-                GenerateAndUpdateVisual(UUID, customName, localCRS_pos, localCRS_rot);
-            }
-            GUI.backgroundColor = ori;
-            EditorGUILayout.EndHorizontal();
-            EditorGUILayout.Space();
-
-            // ---------------------
-            // Params
-            // ---------------------
-            type = (TrackableType)EditorGUILayout.EnumPopup("Trackable Type:", type);
-            unit = (UnitSystem)EditorGUILayout.EnumPopup("Unit System:", unit);
-            confidence = EditorGUILayout.DoubleField("Confidence:", confidence);
-
-            EditorGUILayout.Space();
-            trackableSize = EditorGUILayout.Vector3Field("Trackable Size:", trackableSize);
-
-            EditorGUILayout.Space();
-            GUILayout.Label("Local CRS:");
-            localCRS_pos = EditorGUILayout.Vector3Field("   Position:", localCRS_pos);
-            localCRS_rot = EditorGUILayout.Vector3Field("   Rotation:", localCRS_rot);
-
-            EditorGUILayout.Space();
-            if (GUILayout.Button("Generate Dummy Payload"))
-            {
-                // dummy
-                trackablePayload = new byte[100];
-                for (int i = 0; i < trackablePayload.Length; i++)
-                {
-                    trackablePayload[i] = (byte)i;
-                }
-            }
-
-            // ---------------------
-            // Keyvalues
-            // ---------------------
-            EditorGUILayout.Space();
-            groupEnabled = EditorGUILayout.BeginToggleGroup("Optional Parameters:", groupEnabled);
-            if (keyValuesFixed.Count > 0)
-            {
-                OutputKeyValue(0);
-                OutputKeyValue(1);
-                OutputKeyValue(2);
-            }
-            EditorGUILayout.EndToggleGroup();
-            //
-            GUILayout.EndVertical();
-        }
-
-        public override void GetParams()
-        {
-            customName = "Requesting information...";
-
-            TrackableRequest.GetTrackableAsync(worldStorageServer, Guid.Parse(UUID), (response) =>
-            {
-                Trackable obj = response.result;
-                customName = obj.Name;
-                creatorUUID = obj.CreatorUUID.ToString();
-                type = obj.TrackableType;
-                unit = obj.Unit;
-                confidence = obj.Confidence;
-                if (obj.TrackableSize.Count == 3)
-                {
-                    trackableSize = new Vector3((float)obj.TrackableSize[0], (float)obj.TrackableSize[1], (float)obj.TrackableSize[2]);
-                }
-                else trackableSize = Vector3.zero;
-
-                if (obj.LocalCRS.Count == 16)
-                {
-                    Matrix4x4 localCRS = WorldStorageUnityHelper.ConvertETSIARFTransform3DToUnity(obj.LocalCRS);
-                    localCRS_pos = localCRS.GetPosition();
-                    localCRS_rot = localCRS.rotation.eulerAngles;
-                }
-                else
-                {
-                    localCRS_pos = Vector3.zero;
-                    localCRS_rot = Vector3.zero;
-                }
-
-                // ---------------------
-                // Keyvalues
-                // ---------------------
-                //var first = WorldStorageWindow.GetFirstKeyValueTags(obj.KeyvalueTags);
-                //keyValuesFixed.Clear(); // no
-                for (int i = 0; i < keyValuesFixed.Count; i++) keyValuesFixed[i] = ("", "");
-
-                if (obj.KeyvalueTags.Count > 0)
-                {
-                    int cnt = 0;
-                    foreach (var item in obj.KeyvalueTags)
-                    {
-                        if (item.Key == "unityAuthoringPosX" || item.Key == "unityAuthoringPosY") continue; // ignore internal params
-                        if (cnt < keyValuesFixed.Count) keyValuesFixed[cnt] = (item.Key, item.Value[0]);
-                        cnt++;
-                    }
-                }
-                repaint = true;
-            });
-        }
-
-        public override void AddObject()
-        {
-            Debug.Log("POST Trackable");
-            UUID = System.Guid.Empty.ToString();
-            customName = "Default Trackable";
-
-            Trackable obj = GenerateObject();
-            TrackableRequest.CreateTrackableAsync(worldStorageServer, obj, (response) =>
-            {
-                UUID = response.result;
-                UUID = UUID.Trim('"'); //Bugfix: remove " from server return value
-                WorldStorageWindow.WorldStorageWindowSingleton.GetTrackables();
-            });
-        }
-
-        public override Trackable GenerateObject()
-        {
-            EncodingInformationStructure trackableEncodingInformation = new EncodingInformationStructure()
-            {
-                DataFormat = EncodingInformationStructureDataFormat.ARCORE,
-                Version = "1.0"
-            };
-            Debug.Log("Created encoding information");
-
-            Size _trackableSize = new Size();
-
-            _trackableSize.Add(trackableSize.x);
-            _trackableSize.Add(trackableSize.y);
-            _trackableSize.Add(trackableSize.z);
-            Debug.Log("Created dimension");
-
-            Matrix4x4 localCRS = new Matrix4x4();
-            localCRS = Matrix4x4.TRS(localCRS_pos, Quaternion.Euler(localCRS_rot), Vector3.one);
-            Transform3D _localCRS = WorldStorageUnityHelper.ConvertUnityToETSIARFTransform3D(localCRS);
-
-            // Remember the position of the Unity graph node
-            var posX = new Collection<String>();
-            posX.Add(nodePosX.ToString());
-            var posY = new Collection<String>();
-            posY.Add(nodePosY.ToString());
-
-            // ---------------------
-            // Keyvalues
-            // ---------------------
-            keyValueTags.Clear();
-            keyValueTags.Add("unityAuthoringPosX", posX);
-            keyValueTags.Add("unityAuthoringPosY", posY);
-            if (keyValuesFixed.Count > 0)
-                foreach (var item in keyValuesFixed)
-                {
-                    if (!string.IsNullOrEmpty(item.Item1)) keyValueTags.Add(item.Item1, new Collection<string> { item.Item2 });
-                }
-
-            System.Guid _uuid = System.Guid.Parse(UUID);
-            System.Guid _creator = System.Guid.Parse(worldStorageUser.UUID);
-            Trackable t = new Trackable(customName)
-            {
-                UUID = _uuid,
-                CreatorUUID = _creator,
-                TrackableType = type,
-                TrackableEncodingInformation = trackableEncodingInformation,
-                TrackablePayload = trackablePayload,
-                LocalCRS = _localCRS,
-                Unit = unit,
-                Confidence = confidence,
-                TrackableSize = _trackableSize,
-                KeyvalueTags = keyValueTags
-            };
-            return t;
-        }
-    }
-}
\ No newline at end of file
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/TrackableWindow.cs.meta b/Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/TrackableWindow.cs.meta
deleted file mode 100644
index 020c2af305925803868dbb5f22c964e5176c8f49..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/TrackableWindow.cs.meta	
+++ /dev/null
@@ -1,14 +0,0 @@
-fileFormatVersion: 2
-guid: 229d5ea484d30f945b9318581fb4f2da
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences:
-  - m_ViewDataDictionary: {instanceID: 0}
-  - worldStorageServer: {fileID: 11400000, guid: 4f997253243de534dad12937f1284975, type: 2}
-  - worldStorageUser: {instanceID: 0}
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/WorldAnchorWindow.cs b/Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/WorldAnchorWindow.cs
deleted file mode 100644
index d74f54c91e90b4a111d5f3f4b7c2efe001256ab6..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/WorldAnchorWindow.cs	
+++ /dev/null
@@ -1,344 +0,0 @@
-//
-// ARF - Augmented Reality Framework (ETSI ISG ARF)
-//
-// Copyright 2024 ETSI
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// Last change: June 2024
-//
-
-#define isDEBUG
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-
-using UnityEngine;
-using UnityEditor;
-using TMPro;
-
-using ETSI.ARF.WorldStorage.REST;
-using ETSI.ARF.OpenAPI.WorldStorage;
-
-namespace ETSI.ARF.WorldStorage.UI
-{
-    public class WorldAnchorWindow : BaseWindow<WorldAnchor>
-    {
-        static public WorldAnchorWindow winSingleton;
-
-        // World Anchors params
-        string UUID = System.Guid.Empty.ToString();
-        string customName = "NotDefined";
-        string creatorUUID = System.Guid.Empty.ToString();
-        UnitSystem unit = UnitSystem.CM;
-        Vector3 worldAnchorSize;
-        Vector3 localCRS_pos;
-        Vector3 localCRS_rot;
-
-        //graph params to generate the node
-        public bool useCoord;
-        public float nodePosX = 0;
-        public float nodePosY = 0;
-
-        public WorldAnchorWindow()
-        {
-            // init somne stuffs
-        }
-
-        public static void ShowWindow(WorldStorageServer ws, WorldStorageUser user, string UUID = "")
-        {
-            winSingleton = EditorWindow.GetWindow(typeof(WorldAnchorWindow), false, "ETSI ARF - World Anchor") as WorldAnchorWindow;
-            winSingleton.worldStorageServer = ws;
-            winSingleton.worldStorageUser = user;
-            if (!string.IsNullOrEmpty(UUID))
-            {
-                winSingleton.saveText = "Update";
-                winSingleton.UUID = UUID;
-                winSingleton.GetParams();
-            }
-            else
-            {
-                // Create new one
-                winSingleton.saveText = "Create";
-                winSingleton.AddObject();
-            }
-        }
-
-        public static GameObject GenerateAndUpdateVisual(string UUID, string name, Vector3 pos, Vector3 rot)
-        {
-            ETSI.ARF.WorldStorage.UI.Prefabs.WorldStoragePrefabs prefabs;
-            prefabs = (Prefabs.WorldStoragePrefabs)Resources.Load("ARFPrefabs");
-            GameObject arf = GameObject.Find("ARF Visuals");
-            GameObject visual = GameObject.Find(UUID);
-
-            if (arf == null) arf = new GameObject("ARF Visuals");
-            if (visual == null)
-            {
-                visual = SceneAsset.Instantiate<GameObject>(prefabs.worldAnchorPrefab, pos, Quaternion.Euler(rot), arf.transform); // TODO rot
-                visual.name = UUID;
-            }
-            else
-            {
-                visual.transform.SetPositionAndRotation(pos, Quaternion.Euler(rot));
-            }
-            visual.transform.Find("Canvas/Text").GetComponent<TextMeshProUGUI>().text = $"Name: { name }\nUUID: { UUID }";
-            return visual;
-        }
-
-        void OnGUI()
-        {
-            ori = GUI.backgroundColor; // remember ori color
-
-            gsTest = new GUIStyle("window");
-            //gsTest.normal.textColor = WorldStorageWindow.arfColors[0];
-            gsTest.fontStyle = FontStyle.Bold;
-            gsTest.alignment = TextAnchor.UpperLeft;
-            gsTest.fontSize = 16;
-
-            scrollPos = EditorGUILayout.BeginScrollView(scrollPos, GUILayout.ExpandWidth(true));
-            WorldStorageWindow.DrawCopyright();
-
-            DrawUIStuffs();
-
-            EditorGUILayout.EndScrollView();
-
-            if (GUILayout.Button("Close Window"))
-            {
-                Close();
-            }
-        }
-
-        public override void DrawUIStuffs()
-        {
-            GUILayout.BeginVertical(); // "World Anchor Editor", gsTest);
-            EditorGUILayout.Space();
-
-            GUILayout.BeginHorizontal();
-            GUI.backgroundColor = WorldStorageWindow.arfColors[8];
-            Texture anchorImage = (Texture)AssetDatabase.LoadAssetAtPath("Assets/ETSI.ARF/ARF World Storage API/Images/anchor.png", typeof(Texture));
-            GUILayout.Box(anchorImage, GUILayout.Width(24), GUILayout.Height(24));
-            GUI.backgroundColor = ori;
-            GUILayout.Label("World Anchor Parameters:", EditorStyles.whiteBoldLabel);
-            GUILayout.EndHorizontal();
-
-            Rect rect = EditorGUILayout.GetControlRect(false, WorldStorageWindow.lineH);
-            EditorGUI.DrawRect(rect, WorldStorageWindow.arfColors[8]);
-
-            //
-            GUILayout.Label("Server: " + worldStorageServer.serverName, EditorStyles.whiteLargeLabel);
-            GUILayout.Label("User: " + worldStorageUser.userName, EditorStyles.whiteLargeLabel);
-            EditorGUILayout.Space();
-
-#if isDEBUG
-            GUILayout.Label("UUID: " + UUID, EditorStyles.miniLabel); // readonly
-            GUILayout.Label("Creator UID: " + creatorUUID, EditorStyles.miniLabel); // readonly
-            EditorGUILayout.Space();
-#endif
-            customName = EditorGUILayout.TextField("Name of Anchor:", customName);
-            EditorGUILayout.Space();
-
-            // ---------------------
-            // Toolbar
-            // ---------------------
-            EditorGUILayout.BeginHorizontal();
-            GUI.backgroundColor = WorldStorageWindow.arfColors[2];
-            if (GUILayout.Button(saveText))
-            {
-                Debug.Log("PUT World Anchor");
-
-                if (!string.IsNullOrEmpty(UUID) && UUID != "0" && UUID != System.Guid.Empty.ToString())
-                {
-                    WorldAnchor obj = GenerateObject();
-                    WorldAnchorRequest.UpdateWorldAnchorAsync(worldStorageServer, obj, (response) =>
-                    {
-                        UUID = response.result;
-                        UUID = UUID.Trim('"'); //Bugfix: remove " from server return value
-
-                        if (WorldStorageWindow.WorldStorageWindowSingleton != null)
-                        {
-                            WorldStorageWindow.WorldStorageWindowSingleton.GetWorldAnchors();
-                        }
-                        Close();
-                    });
-                }
-            }
-
-            GUI.backgroundColor = WorldStorageWindow.arfColors[3];
-            if (GUILayout.Button("Delete"))
-            {
-                if (EditorUtility.DisplayDialog("Delete", "Are you sure you want to delete this World Anchor?", "Delete", "Cancel"))
-                {
-                    Debug.Log("Delete World Anchor");
-                    WorldAnchorRequest.DeleteWorldAnchorAsync(worldStorageServer, Guid.Parse(UUID), (response) =>
-                    {
-                        UUID = System.Guid.Empty.ToString();
-                        customName = "Warning: Object deleted !";
-                        creatorUUID = System.Guid.Empty.ToString();
-                        unit = UnitSystem.CM;
-                        if (WorldStorageWindow.WorldStorageWindowSingleton != null)
-                        {
-                            WorldStorageWindow.WorldStorageWindowSingleton.GetWorldAnchors();
-                        }
-                        Close();
-                    });
-                }
-            }
-            GUI.backgroundColor = ori;
-
-            GUI.backgroundColor = WorldStorageWindow.arfColors[5];
-            if (GUILayout.Button("Generate/Update GameObject"))
-            {
-                GenerateAndUpdateVisual(UUID, customName, localCRS_pos, localCRS_rot);
-            }
-            GUI.backgroundColor = ori;
-            EditorGUILayout.EndHorizontal();
-            EditorGUILayout.Space();
-
-            // ---------------------
-            // Params
-            // ---------------------
-            unit = (UnitSystem)EditorGUILayout.EnumPopup("Unit System:", unit);
-
-            EditorGUILayout.Space();
-            worldAnchorSize = EditorGUILayout.Vector3Field("Trackable Size:", worldAnchorSize);
-
-            EditorGUILayout.Space();
-            GUILayout.Label("Local CRS:");
-            localCRS_pos = EditorGUILayout.Vector3Field("   Position:", localCRS_pos);
-            localCRS_rot = EditorGUILayout.Vector3Field("   Rotation:", localCRS_rot);
-
-            // ---------------------
-            // Keyvalues
-            // ---------------------
-            EditorGUILayout.Space();
-            groupEnabled = EditorGUILayout.BeginToggleGroup("Optional Parameters:", groupEnabled);
-            if (keyValuesFixed.Count > 0)
-            {
-                OutputKeyValue(0);
-                OutputKeyValue(1);
-                OutputKeyValue(2);
-            }
-            EditorGUILayout.EndToggleGroup();
-            //
-            GUILayout.EndVertical();
-        }
-
-        public override void GetParams()
-        {
-            WorldAnchorRequest.GetWorldAnchorAsync(worldStorageServer, Guid.Parse(UUID), (response) =>
-            {
-                WorldAnchor obj = response.result;
-                customName = obj.Name;
-                creatorUUID = obj.CreatorUUID.ToString();
-                unit = obj.Unit;
-                if (obj.WorldAnchorSize.Count == 3)
-                {
-                    worldAnchorSize = new Vector3((float)obj.WorldAnchorSize[0], (float)obj.WorldAnchorSize[1], (float)obj.WorldAnchorSize[2]);
-                }
-                else worldAnchorSize = Vector3.zero;
-
-                if (obj.LocalCRS.Count == 16)
-                {
-                    Matrix4x4 localCRS = WorldStorageUnityHelper.ConvertETSIARFTransform3DToUnity(obj.LocalCRS);
-                    localCRS_pos = localCRS.GetPosition();
-                    localCRS_rot = localCRS.rotation.eulerAngles;
-                }
-                else
-                {
-                    localCRS_pos = Vector3.zero;
-                    localCRS_rot = Vector3.zero;
-                }
-
-                // ---------------------
-                // Keyvalues
-                // ---------------------
-                //var first = WorldStorageWindow.GetFirstKeyValueTags(obj.KeyvalueTags);
-                //keyValuesFixed.Clear(); // no
-                for (int i = 0; i < keyValuesFixed.Count; i++) keyValuesFixed[i] = ("", "");
-
-                if (obj.KeyvalueTags.Count > 0)
-                {
-                    int cnt = 0;
-                    foreach (var item in obj.KeyvalueTags)
-                    {
-                        if (item.Key == "unityAuthoringPosX" || item.Key == "unityAuthoringPosY") continue; // ignore internal params
-                        if (cnt < keyValuesFixed.Count) keyValuesFixed[cnt] = (item.Key, item.Value[0]);
-                        cnt++;
-                    }
-                }
-                repaint = true;
-            });
-        }
-
-        public override void AddObject()
-        {
-            Debug.Log("POST World Anchor");
-            UUID = System.Guid.Empty.ToString();
-            customName = "Default Anchor";
-
-            WorldAnchor obj = GenerateObject();
-            WorldAnchorRequest.CreateWorldAnchorAsync(worldStorageServer, obj, (response) =>
-            {
-                UUID = response.result;
-                UUID = UUID.Trim('"'); //Bugfix: remove " from server return value
-                WorldStorageWindow.WorldStorageWindowSingleton.GetWorldAnchors();
-            });
-        }
-
-        public override WorldAnchor GenerateObject()
-        {
-            Size _worldAnchorSize = new Size();
-            _worldAnchorSize.Add(worldAnchorSize.x);
-            _worldAnchorSize.Add(worldAnchorSize.y);
-            _worldAnchorSize.Add(worldAnchorSize.z);
-            Debug.Log("Created dimension");
-
-            Matrix4x4 localCRS = new Matrix4x4();
-            localCRS = Matrix4x4.TRS(localCRS_pos, Quaternion.Euler(localCRS_rot), Vector3.one);
-            Transform3D _localCRS = WorldStorageUnityHelper.ConvertUnityToETSIARFTransform3D(localCRS);
-
-            // Remember the position of the Unity graph node
-            var posX = new Collection<String>();
-            posX.Add(nodePosX.ToString());
-            var posY = new Collection<String>();
-            posY.Add(nodePosY.ToString());
-
-            // ---------------------
-            // Keyvalues
-            // ---------------------
-            keyValueTags.Clear();
-            keyValueTags.Add("unityAuthoringPosX", posX);
-            keyValueTags.Add("unityAuthoringPosY", posY);
-            if (keyValuesFixed.Count > 0)
-                foreach (var item in keyValuesFixed)
-                {
-                    if (!string.IsNullOrEmpty(item.Item1)) keyValueTags.Add(item.Item1, new Collection<string> { item.Item2 });
-                }
-
-            Guid _uuid = Guid.Parse(UUID);
-            Guid _creator = Guid.Parse(worldStorageUser.UUID);
-            WorldAnchor t = new WorldAnchor(customName)
-            {
-                UUID = _uuid,
-                CreatorUUID = _creator,
-                LocalCRS = _localCRS,
-                Unit = unit,
-                WorldAnchorSize = _worldAnchorSize,
-                KeyvalueTags = keyValueTags
-            };
-            return t;
-        }
-    }
-}
\ No newline at end of file
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/WorldAnchorWindow.cs.meta b/Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/WorldAnchorWindow.cs.meta
deleted file mode 100644
index c4ffaff830a063cc1184c01ac8c139ab428aebf3..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/WorldAnchorWindow.cs.meta	
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: a0f67f823dd6ff246be6c656b120756e
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/WorldGraphWindow.cs b/Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/WorldGraphWindow.cs
deleted file mode 100644
index 1a5e621df865f18c47340f4a4297c887583a71e1..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/WorldGraphWindow.cs	
+++ /dev/null
@@ -1,304 +0,0 @@
-//
-// ARF - Augmented Reality Framework (ETSI ISG ARF)
-//
-// Copyright 2024 ETSI
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// Last change: July 2022
-//
-
-using System;
-using System.Collections.Generic;
-
-using UnityEditor;
-using UnityEditor.Experimental.GraphView;
-using UnityEditor.UIElements;
-using UnityEngine;
-using UnityEngine.UIElements;
-
-using ETSI.ARF.WorldStorage.Editor.Graph;
-using ETSI.ARF.WorldStorage;
-using ETSI.ARF.WorldStorage.REST;
-using ETSI.ARF.WorldStorage.UI;
-using ETSI.ARF.OpenAPI.WorldStorage;
-
-namespace ETSI.ARF.WorldStorage.Editor.Windows
-{
-    public class WorldGraphWindow : EditorWindow
-    {
-        [HideInInspector] public WorldStorageServer worldStorageServer;
-        [HideInInspector] public WorldStorageUser worldStorageUser;
-
-        private ARFGraphView myGraph;
-
-        //to delay the reframe (otherwise it reframes when the graph isn't built yet)
-        int twoFrames = 0;
-
-        [MenuItem("ARFWorldStorage/Edit Graph...")]
-        public static void ShowWindow()
-        {
-            GetWindow<WorldGraphWindow>("Graph Editor", true, typeof(SceneView));
-        }
-
-        public static void ShowWindowFromWorldStorageWindow(WorldStorageServer server, WorldStorageUser user)
-        {
-            var window = GetWindow<WorldGraphWindow>("Graph Editor", true, typeof(SceneView));
-            window.worldStorageServer = server;
-            window.worldStorageUser = user;
-            if (window.myGraph != null)
-            {
-                if (window.myGraph.ServerAndLocalDifferent() && EditorUtility.DisplayDialog("Saving node positions", "The World Graph has been modified. \nWould you like to push the modifications to the server ?", "Yes", "No"))
-                {
-                    window.myGraph.SaveInServer();
-                }
-                window.rootVisualElement.Remove(window.myGraph);
-            }
-            GraphEditorWindow.ResetWindow();
-            SaveInfo.instance.nodePositions = null;
-            window.OnEnable();
-        }
-
-        public void OnEnable()
-        {
-            if (worldStorageServer != null)
-            {
-                try
-                {
-                    if (SaveInfo.instance.nodePositions == null)
-                    {
-                        SaveInfo.instance.InitNodePos(worldStorageServer, worldStorageUser);
-                    }
-                    ConstructGraphView();
-                    myGraph.style.top = Length.Percent(11);
-                    myGraph.style.bottom = Length.Percent(5);
-                    rootVisualElement.Add(myGraph);
-                }
-                catch (Exception e)
-                {
-                    EditorUtility.DisplayDialog("Error", "The server you selected is unreachable", "Ok");
-                    myGraph = null;
-                    Debug.Log(e.ToString());
-                }
-            }
-        }
-
-        //initiate the graphView Attribute 
-        public void ConstructGraphView()
-        {
-            myGraph = new ARFGraphView
-            {
-                name = "ARF Graph",
-                worldStorageServer = worldStorageServer,
-                worldStorageUser = worldStorageUser
-            };
-            //top offset so that the graph does'nt overlap with the rest of the ui
-            myGraph.style.top = Length.Percent(11);
-            myGraph.PaintWorldStorage();
-            myGraph.StretchToParentSize();
-            SaveInfo.instance.toReFrame = true;
-        }
-
-
-        void OnGUI()
-        {
-            if (SaveInfo.instance.nodePositions == null)
-            {
-                SaveInfo.instance.InitNodePos(worldStorageServer, worldStorageUser);
-            }
-
-
-            EditorGUILayout.BeginVertical();
-
-            EditorGUI.BeginChangeCheck();
-            worldStorageServer = (WorldStorageServer)EditorGUILayout.ObjectField("World Storage Server", worldStorageServer, typeof(WorldStorageServer), false, GUILayout.Width(500));
-            worldStorageUser = (WorldStorageUser)EditorGUILayout.ObjectField("User", worldStorageUser, typeof(WorldStorageUser), false, GUILayout.Width(500));
-            if (EditorGUI.EndChangeCheck())
-            {
-                GraphEditorWindow.ResetWindow();
-
-                if ((myGraph != null))
-                {
-                    if (myGraph.ServerAndLocalDifferent() && EditorUtility.DisplayDialog("Saving node positions", "The World Graph has been modified. \nWould you like to push the modifications to the server ?", "Yes", "No"))
-                    {
-                        myGraph.SaveInServer();
-                    }
-                    rootVisualElement.Remove(myGraph);
-                }
-                if (worldStorageServer != null)
-                {
-                    try
-                    {
-                        SaveInfo.instance.InitNodePos(worldStorageServer, worldStorageUser);
-                        ConstructGraphView();
-                        myGraph.style.top = Length.Percent(11);
-                        myGraph.style.bottom = Length.Percent(5);
-                        rootVisualElement.Add(myGraph);
-                        Debug.Log("World Graph window initialized.");
-                    }
-                    catch (Exception e)
-                    {
-                        EditorUtility.DisplayDialog("Error", "The server you selected is unreachable", "Ok");
-                        myGraph = null;
-                        Debug.Log(e.ToString());
-                    }
-                }
-                else
-                {
-                    myGraph = null;
-                }
-            }
-
-
-            //style for copyrights label (left aligned)
-            var leftStyle = GUI.skin.GetStyle("Label");
-            leftStyle.alignment = TextAnchor.MiddleLeft;
-
-            GUILayout.Label("Augmented Reality Framework", leftStyle);
-            GUILayout.Label("Copyright (C) 2024, ETSI (BSD 3-Clause License)", leftStyle);
-
-            //separator line
-            Rect rect = EditorGUILayout.GetControlRect(false, 1);
-            EditorGUI.DrawRect(rect, Color.gray);
-
-            //reframe all elements to see them all
-            if (SaveInfo.instance.toReFrame && (twoFrames == 2))
-            {
-                myGraph.FrameAllElements();
-                SaveInfo.instance.toReFrame = false;
-                twoFrames = 0;
-            }
-            else if (SaveInfo.instance.toReFrame)
-            {
-                twoFrames++;
-            }
-            EditorGUILayout.EndVertical();
-
-            GUILayout.FlexibleSpace();
-
-            //Notify the user that the graph is different from the one in the server
-            if (myGraph != null)
-            {
-                if (myGraph.ServerAndLocalDifferent())
-                {
-                    //the icon to add if the node does not correspond to an element in the server
-                    Texture2D warningImage = (Texture2D)AssetDatabase.LoadAssetAtPath("Assets/ETSI.ARF/ARF World Storage API/Images/warning.png", typeof(Texture2D));
-
-                    GUI.backgroundColor = Color.clear;
-                    GUILayout.BeginHorizontal();
-                    GUILayout.Box(warningImage, GUILayout.Width(27), GUILayout.Height(27));
-                    GUILayout.Box("There are elements in your graph that have been added, modified or deleted ! The current graph is not synchronized with the World Storage", leftStyle, GUILayout.ExpandWidth(true), GUILayout.Height(27));
-                    GUILayout.EndHorizontal();
-                }
-            }
-        }
-
-        public void DeleteNode(ARFNode node)
-        {
-            rootVisualElement.Remove(myGraph);
-            node.DisconnectAllPorts(myGraph);
-            myGraph.DeleteElements(new List<GraphElement> { node });
-            rootVisualElement.Add(myGraph);
-        }
-
-        public void DeleteEdge(ARFEdgeLink edge)
-        {
-            rootVisualElement.Remove(myGraph);
-            myGraph.DeleteElements(new List<GraphElement> { edge });
-            rootVisualElement.Add(myGraph);
-        }
-    }
-
-    public class SaveInfo : ScriptableSingleton<SaveInfo>
-    {
-        [SerializeField]
-        public Dictionary<String, Rect> nodePositions;
-        public List<String> linkIds;
-
-        public Dictionary<String, Type> elemsToRemove;
-        public List<String> elemsToUpdate;
-
-        //keep the info of the graph reframe
-        public Boolean toReFrame = false;
-
-        public WorldStorageServer worldStorageServer;
-        public WorldStorageUser worldStorageUser;
-
-        public void InitNodePos(WorldStorageServer server, WorldStorageUser user)
-        {
-            worldStorageServer = server;
-            worldStorageUser = user;
-
-            instance.nodePositions = new Dictionary<string, Rect>();
-
-            List<Trackable> listT = TrackableRequest.GetTrackablesSync(worldStorageServer);
-            foreach (Trackable track in listT)
-            {
-                if (track.KeyvalueTags.ContainsKey("unityAuthoringPosX") && track.KeyvalueTags.ContainsKey("unityAuthoringPosY"))
-                {
-                    var posX = RoundToNearestHalf(float.Parse(track.KeyvalueTags["unityAuthoringPosX"][0]));
-                    var posY = RoundToNearestHalf(float.Parse(track.KeyvalueTags["unityAuthoringPosY"][0]));
-                    Rect trackPos = new(posX, posY, 135, 77);
-                    instance.nodePositions[track.UUID.ToString()] = trackPos;
-                }
-                else
-                {
-                    Rect trackPos = new(0, 0, 135, 77);
-                    instance.nodePositions[track.UUID.ToString()] = trackPos;
-                }
-            }
-
-            List<WorldAnchor> listA = WorldAnchorRequest.GetWorldAnchorsSync(worldStorageServer);
-            Debug.Log("Anchors " +listA.Count);
-            foreach (WorldAnchor wa in listA)
-            {
-                if (wa.KeyvalueTags.ContainsKey("unityAuthoringPosX") && wa.KeyvalueTags.ContainsKey("unityAuthoringPosY"))
-                {
-                    var posX = RoundToNearestHalf(float.Parse(wa.KeyvalueTags["unityAuthoringPosX"][0]));
-                    var posY = RoundToNearestHalf(float.Parse(wa.KeyvalueTags["unityAuthoringPosY"][0]));
-                    Rect waPos = new(posX, posY, 135, 77);
-                    instance.nodePositions[wa.UUID.ToString()] = waPos;
-                }
-                else
-                {
-                    Rect trackPos = new(0, 0, 135, 77);
-                    instance.nodePositions[wa.UUID.ToString()] = trackPos;
-                }
-            }
-
-
-            instance.linkIds = new List<string>();
-            List<WorldLink> listWL = WorldLinkRequest.GetWorldLinksSync(worldStorageServer);
-            foreach (WorldLink link in listWL)
-            {
-                instance.linkIds.Add(link.UUID.ToString());
-            }
-
-            instance.elemsToRemove = new Dictionary<string, Type>();
-            instance.elemsToUpdate = new List<string>();
-        }
-
-        //method to predict the position of a node (the float that will be saved in the PositionInfo singleton)
-        public static float RoundToNearestHalf(float a)
-        {
-            return a = Mathf.Round(a * 2f) * 0.5f;
-        }
-
-        public static void PrintInfo()
-        {
-            Debug.Log("elems to delete : " + string.Join(", ", instance.elemsToRemove.Keys));
-            Debug.Log("elems to update : " + string.Join(", ", instance.elemsToUpdate));
-            Debug.Log("elems tout court : " + string.Join(", ", instance.nodePositions.Keys));
-        }
-    }
-}
\ No newline at end of file
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/WorldGraphWindow.cs.meta b/Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/WorldGraphWindow.cs.meta
deleted file mode 100644
index add62927e11e960a03f3343413c056b51ab7b98d..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/WorldGraphWindow.cs.meta	
+++ /dev/null
@@ -1,14 +0,0 @@
-fileFormatVersion: 2
-guid: 2c1a0c92306453d46897c1af6cb5c2f9
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences:
-  - m_ViewDataDictionary: {instanceID: 0}
-  - worldStorageServer: {instanceID: 0}
-  - worldStorageUser: {fileID: 11400000, guid: c0696089e4a855b46ad490437919b1e8, type: 2}
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/WorldLinkWindow.cs b/Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/WorldLinkWindow.cs
deleted file mode 100644
index 2338b2291f99e30d50a3465af92c1c05c5335ff5..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/WorldLinkWindow.cs	
+++ /dev/null
@@ -1,515 +0,0 @@
-//
-// ARF - Augmented Reality Framework (ETSI ISG ARF)
-//
-// Copyright 2024 ETSI
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// Last change: June 2024
-//
-
-#define isDEBUG
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-
-using UnityEngine;
-using UnityEditor;
-using TMPro;
-
-using ETSI.ARF.WorldStorage.REST;
-using ETSI.ARF.OpenAPI.WorldStorage;
-
-namespace ETSI.ARF.WorldStorage.UI
-{
-    public class WorldLinkWindow : BaseWindow<WorldLink>
-    {
-        static public WorldLinkWindow winSingleton;
-
-        public class Element
-        {
-            public string UUID = System.Guid.Empty.ToString();
-            public string name = "(none)";
-            public TypeWorldStorage type = TypeWorldStorage.UNKNOWN;
-            public Vector3 pos = Vector3.zero;
-        }
-        
-        [SerializeField] public List<string> anchors = new List<string>();
-
-        private static GUILayoutOption miniButtonWidth = GUILayout.Width(50);
-
-        // World Anchors params
-        string UUID = System.Guid.Empty.ToString();
-        string customName = "(no name for World Links)";
-        string creatorUUID = System.Guid.Empty.ToString();
-
-        // From & To elements:
-        private bool showListFrom = true;
-        private bool showListTo = true;
-        private Element FROM = new Element();
-        private Element TO = new Element();
-
-        UnitSystem unit = UnitSystem.CM;
-        Vector3 transf_pos;
-        Vector3 transf_rot;
-
-        public WorldLinkWindow()
-        {
-            // init somne stuffs
-        }
-
-        public static void ShowWindow(WorldStorageServer ws, WorldStorageUser user, string UUID = "")
-        {
-            winSingleton = EditorWindow.GetWindow(typeof(WorldLinkWindow), false, "ETSI ARF - World Link") as WorldLinkWindow;
-            winSingleton.worldStorageServer = ws;
-            winSingleton.worldStorageUser = user;
-            if (!string.IsNullOrEmpty(UUID))
-            {
-                winSingleton.saveText = "Update";
-                winSingleton.UUID = UUID;
-                winSingleton.GetParams();
-            }
-            else
-            {
-                // Create new one
-                winSingleton.saveText = "Create";
-                winSingleton.AddObject();
-            }
-        }
-
-        public static GameObject GenerateAndUpdateVisual(string UUID, Element from, Element to)
-        {
-            ETSI.ARF.WorldStorage.UI.Prefabs.WorldStoragePrefabs prefabs;
-            prefabs = (Prefabs.WorldStoragePrefabs)Resources.Load("ARFPrefabs");
-            GameObject arf = GameObject.Find("ARF Visuals");
-            GameObject visual = GameObject.Find(UUID);
-
-            //Value between from and to
-            Vector3 centerPos = (from.pos + to.pos) * 0.5f;
-            Vector3 rot = Vector3.zero;  // Direction
-
-            if (arf == null) arf = new GameObject("ARF Visuals");
-            if (visual == null)
-            {
-                visual = SceneAsset.Instantiate<GameObject>(prefabs.worldLinkPrefab, centerPos, Quaternion.Euler(rot), arf.transform); // TODO rot
-                visual.name = UUID;
-            }
-            else
-            {
-                visual.transform.SetPositionAndRotation(centerPos, Quaternion.Euler(rot));
-            }
-
-            // Update the gizno, if GaneObject are founds!!!
-            GameObject go1 = GameObject.Find(from.UUID);
-            GameObject go2 = GameObject.Find(to.UUID);
-            if (go1 && go2)
-            {
-                LinkVisual gizmo = visual.GetComponent<LinkVisual>();
-                if (gizmo)
-                {
-                    gizmo.fromElement = go1;
-                    gizmo.toElement = go2;
-                }
-            }
-
-            // Update the annotation
-            visual.transform.Find("Canvas/Text").GetComponent<TextMeshProUGUI>().text = $"UUID: { UUID }\nFrom: { from.name }\nTo: { to.name }";
-            return visual;
-        }
-
-      
-        void OnGUI()
-        {
-            ori = GUI.backgroundColor; // remember ori color
-
-            gsTest = new GUIStyle("window");
-            //gsTest.normal.textColor = WorldStorageWindow.arfColors[0];
-            gsTest.fontStyle = FontStyle.Bold;
-            gsTest.alignment = TextAnchor.UpperLeft;
-            gsTest.fontSize = 16;
-            gsTest.fixedHeight = 100;
-
-            scrollPos = EditorGUILayout.BeginScrollView(scrollPos, GUILayout.ExpandWidth(true));
-            WorldStorageWindow.DrawCopyright();
-
-            DrawUIStuffs();
-
-            EditorGUILayout.EndScrollView();
-
-            if (GUILayout.Button("Close Window"))
-            {
-                Close();
-            }
-        }
-
-        private void GetElementFROM()
-        {
-            // Trackable?
-            TrackableRequest.GetTrackableAsync(worldStorageServer, Guid.Parse(FROM.UUID), (response) =>
-            {
-                try
-                {
-                    Trackable result = response.result;
-                    FROM.name = result.Name;
-                    FROM.type = TypeWorldStorage.TRACKABLE;
-
-                    Matrix4x4 localCRS = WorldStorageUnityHelper.ConvertETSIARFTransform3DToUnity(result.LocalCRS);
-                    FROM.pos = localCRS.GetPosition();
-                }
-                catch
-                {
-                    // Anchor?
-                    WorldAnchorRequest.GetWorldAnchorAsync(worldStorageServer, Guid.Parse(FROM.UUID), (response) =>
-                    {
-                        try
-                        {
-                            WorldAnchor result = response.result;
-                            FROM.name = result.Name;
-                            FROM.type = TypeWorldStorage.ANCHOR;
-
-                            Matrix4x4 localCRS = WorldStorageUnityHelper.ConvertETSIARFTransform3DToUnity(result.LocalCRS);
-                            FROM.pos = localCRS.GetPosition();
-                        }
-                        catch
-                        {
-                            // Nothing!
-                            FROM.name = "";
-                            FROM.type = TypeWorldStorage.UNKNOWN;
-                        }
-                    });
-                }
-            });
-        }
-
-        private void GetElementTO()
-        {
-            // Trackable?
-            TrackableRequest.GetTrackableAsync(worldStorageServer, Guid.Parse(TO.UUID), (response) =>
-            {
-                try
-                {
-                    Trackable result = response.result;
-                    TO.name = result.Name;
-                    TO.type = TypeWorldStorage.TRACKABLE;
-
-                    Matrix4x4 localCRS = WorldStorageUnityHelper.ConvertETSIARFTransform3DToUnity(result.LocalCRS);
-                    TO.pos = localCRS.GetPosition();
-                }
-                catch
-                {
-                    // Anchor?
-                    WorldAnchorRequest.GetWorldAnchorAsync(worldStorageServer, Guid.Parse(TO.UUID), (response) =>
-                    {
-                        try
-                        {
-                            WorldAnchor result = response.result;
-                            TO.name = result.Name;
-                            TO.type = TypeWorldStorage.ANCHOR;
-
-                            Matrix4x4 localCRS = WorldStorageUnityHelper.ConvertETSIARFTransform3DToUnity(result.LocalCRS);
-                            TO.pos = localCRS.GetPosition();
-                        }
-                        catch
-                        {
-                            // Nothing!
-                            TO.UUID = System.Guid.Empty.ToString();
-                            TO.name = "";
-                            TO.type = TypeWorldStorage.UNKNOWN;
-                        }
-                    });
-                }
-            });
-        }
-
-        public override void DrawUIStuffs()
-        {
-            GUILayout.BeginVertical(); // "World Link Editor", gsTest);
-            EditorGUILayout.Space();
-
-            GUILayout.BeginHorizontal();
-            GUI.backgroundColor = WorldStorageWindow.arfColors[9];
-            Texture linkImage = (Texture)AssetDatabase.LoadAssetAtPath("Assets/ETSI.ARF/ARF World Storage API/Images/link.png", typeof(Texture));
-            GUILayout.Box(linkImage, GUILayout.Width(24), GUILayout.Height(24));
-            GUI.backgroundColor = ori;
-            GUILayout.Label("World Link Parameters:", EditorStyles.whiteBoldLabel);
-            GUILayout.EndHorizontal();
-
-            Rect rect = EditorGUILayout.GetControlRect(false, WorldStorageWindow.lineH);
-            EditorGUI.DrawRect(rect, WorldStorageWindow.arfColors[9]);
-
-            //
-            GUILayout.Label("Server: " + worldStorageServer.serverName, EditorStyles.whiteLargeLabel);
-            GUILayout.Label("User: " + worldStorageUser.userName, EditorStyles.whiteLargeLabel);
-            EditorGUILayout.Space();
-
-#if isDEBUG
-            GUILayout.Label("UUID: " + UUID, EditorStyles.miniLabel); // readonly
-            GUILayout.Label("Creator UID: " + creatorUUID, EditorStyles.miniLabel); // readonly
-#endif
-
-            EditorGUILayout.Space();
-
-            // ---------------------
-            // Toolbar
-            // ---------------------
-            EditorGUILayout.BeginHorizontal();
-            GUI.backgroundColor = WorldStorageWindow.arfColors[2];
-            if (GUILayout.Button(saveText))
-            {
-                Debug.Log("PUT World Link");
-
-                if (!string.IsNullOrEmpty(UUID) && UUID != "0" && UUID != System.Guid.Empty.ToString())
-                {
-                    WorldLink obj = GenerateObject();
-                    WorldLinkRequest.UpdateWorldLinkAsync(worldStorageServer, obj, (response) =>
-                    {
-                        UUID = response.result;
-                        UUID = UUID.Trim('"'); //Bugfix: remove " from server return value
-
-                        if (WorldStorageWindow.WorldStorageWindowSingleton != null)
-                        {
-                            WorldStorageWindow.WorldStorageWindowSingleton.GetWorldLinks();
-                        }
-                        Close();
-                    });
-                }
-            }
-
-            GUI.backgroundColor = WorldStorageWindow.arfColors[3];
-            if (GUILayout.Button("Delete"))
-            {
-                if (EditorUtility.DisplayDialog("Delete", "Are you sure you want to delete this World Link?", "Delete", "Cancel"))
-                {
-                    Debug.Log("Delete World Link");
-                    WorldLinkRequest.DeleteWorldLinkAsync(worldStorageServer, Guid.Parse(UUID), (response) =>
-                    {
-                        UUID = System.Guid.Empty.ToString();
-                        customName = "Warning: Object deleted !";
-                        creatorUUID = System.Guid.Empty.ToString();
-                        unit = UnitSystem.CM;
-                        WorldStorageWindow.WorldStorageWindowSingleton.GetWorldLinks();
-                    });
-                }
-            }
-            GUI.backgroundColor = ori;
-
-            GUI.backgroundColor = WorldStorageWindow.arfColors[5];
-            if (GUILayout.Button("Generate/Update GameObject"))
-            {
-                GenerateAndUpdateVisual(UUID, FROM, TO);
-            }
-            GUI.backgroundColor = ori;
-            EditorGUILayout.EndHorizontal();
-            EditorGUILayout.Space();
-
-            // ---------------------
-            // Params
-            // ---------------------
-            string lastFromUUID = FROM.UUID;
-            string lastToUUID = TO.UUID;
-
-            if (GUILayout.Button("Use 'From-To' Objects from Scene Selection"))
-            {
-                GameObject from, to;
-                GameObject[] SelectedObjects = Selection.gameObjects;
-
-                if (SelectedObjects.Length == 2)
-                {
-                    Debug.Log("Creation du lien (Many thanks Eric ;-)");
-                    from = SelectedObjects[0];
-                    to = SelectedObjects[1];
-                    FROM.UUID = from.name;
-                    TO.UUID = to.name;
-                }
-                else
-                {
-                    EditorUtility.DisplayDialog("Selection", "Please select exactly 2 GameObject from typ Trackable(s) and/or WorldAnchor(s) in the scene!", "OK");
-                }
-            }
-
-            showListFrom = EditorGUILayout.Foldout(showListFrom, "Parent Object (From)");
-            if (showListFrom)
-            {
-                EditorGUILayout.BeginHorizontal();
-                FROM.UUID = EditorGUILayout.TextField("UUID:", FROM.UUID);
-                if (FROM.UUID.Contains("["))
-                {
-                    // extract the UUID
-                    FROM.UUID = FROM.UUID.Split('[', ']')[1];
-                }
-
-                GUI.backgroundColor = WorldStorageWindow.arfColors[0];
-                if (GUILayout.Button("Request", EditorStyles.miniButtonLeft, miniButtonWidth) || lastFromUUID != FROM.UUID)
-                {
-                    GetElementFROM();
-                }
-                EditorGUILayout.EndHorizontal();
-                GUI.backgroundColor = ori;
-                EditorGUILayout.LabelField("Name:", FROM.name);
-                EditorGUILayout.LabelField("Type:", FROM.type.ToString());
-            }
-
-            EditorGUILayout.Space();
-            showListTo = EditorGUILayout.Foldout(showListTo, "Child Object (To)");
-            if (showListTo)
-            {
-                EditorGUILayout.BeginHorizontal();
-                TO.UUID = EditorGUILayout.TextField("UUID:", TO.UUID);
-                if (TO.UUID.Contains("["))
-                {
-                    // extract the UUID
-                    TO.UUID = TO.UUID.Split('[', ']')[1];
-                }
-                GUI.backgroundColor = WorldStorageWindow.arfColors[0];
-                if (GUILayout.Button("Request", EditorStyles.miniButtonLeft, miniButtonWidth) || lastToUUID != TO.UUID)
-                {
-                    GetElementTO();
-                }
-                EditorGUILayout.EndHorizontal();
-                GUI.backgroundColor = ori;
-                EditorGUILayout.LabelField("Name:", TO.name);
-                EditorGUILayout.LabelField("Type:", TO.type.ToString());
-            }
-
-            EditorGUILayout.Space();
-            unit = (UnitSystem)EditorGUILayout.EnumPopup("Unit System:", unit);
-
-            EditorGUILayout.Space();
-            //TODO Is this required???
-            GUILayout.Label("Transform:");
-            transf_pos = EditorGUILayout.Vector3Field("Position:", transf_pos);
-            transf_rot = EditorGUILayout.Vector3Field("Rotation:", transf_rot);
-
-            // ---------------------
-            // Keyvalues
-            // ---------------------
-            EditorGUILayout.Space();
-            groupEnabled = EditorGUILayout.BeginToggleGroup("Optional Parameters:", groupEnabled);
-            if (keyValuesFixed.Count > 0)
-            {
-                OutputKeyValue(0);
-                OutputKeyValue(1);
-                OutputKeyValue(2);
-            }
-            EditorGUILayout.EndToggleGroup();
-            //
-            GUILayout.EndVertical();
-        }
-
-        public override void GetParams()
-        {
-            WorldLinkRequest.GetWorldLinkAsync(worldStorageServer, Guid.Parse(UUID), (response) =>
-            {
-                WorldLink obj = response.result;
-                //customName = obj.Name;
-                creatorUUID = obj.CreatorUUID.ToString();
-
-                FROM.UUID = obj.UUIDFrom.ToString();
-                FROM.type = obj.TypeFrom;
-
-                TO.UUID = obj.UUIDTo.ToString();
-                TO.type = obj.TypeTo;
-
-                unit = obj.Unit;
-                if (obj.Transform.Count == 16)
-                {
-                    Matrix4x4 transf = WorldStorageUnityHelper.ConvertETSIARFTransform3DToUnity(obj.Transform);
-                    transf_pos = transf.GetPosition();
-                    transf_rot = transf.rotation.eulerAngles;
-                }
-                else
-                {
-                    transf_pos = Vector3.zero;
-                    transf_rot = Vector3.zero;
-                }
-
-                // Get here the params of the from/to elements (GET)
-                GetElementFROM();
-                GetElementTO();
-
-                // ---------------------
-                // Keyvalues
-                // ---------------------
-                //var first = WorldStorageWindow.GetFirstKeyValueTags(obj.KeyvalueTags);
-                //keyValuesFixed.Clear(); // no
-                for (int i = 0; i < keyValuesFixed.Count; i++) keyValuesFixed[i] = ("", "");
-
-                if (obj.KeyvalueTags.Count > 0)
-                {
-                    int cnt = 0;
-                    foreach (var item in obj.KeyvalueTags)
-                    {
-                        if (item.Key == "unityAuthoringPosX" || item.Key == "unityAuthoringPosY") continue; // ignore internal params
-                        if (cnt < keyValuesFixed.Count) keyValuesFixed[cnt] = (item.Key, item.Value[0]);
-                        cnt++;
-                    }
-                }
-                repaint = true;
-            });
-        }
-
-        public override void AddObject()
-        {
-            Debug.Log("POST World Link");
-            UUID = System.Guid.Empty.ToString();
-            customName = "Default Link";
-
-            WorldLink obj = GenerateObject();
-            WorldLinkRequest.CreateWorldLinkAsync(worldStorageServer, obj, (response) =>
-            {
-                UUID = response.result;
-                UUID = UUID.Trim('"'); //Bugfix: remove " from server return value
-                WorldStorageWindow.WorldStorageWindowSingleton.GetWorldLinks();
-            });
-        }
-
-        public override WorldLink GenerateObject()
-        {
-            Matrix4x4 localCRS = new Matrix4x4();
-            localCRS = Matrix4x4.TRS(transf_pos, Quaternion.Euler(transf_rot), Vector3.one);
-            Transform3D transform3d = WorldStorageUnityHelper.ConvertUnityToETSIARFTransform3D(localCRS);
-
-            // ---------------------
-            // Keyvalues
-            // ---------------------
-            keyValueTags.Clear();
-            //keyValueTags.Add("unityAuthoringPosX", posX);
-            //keyValueTags.Add("unityAuthoringPosY", posY);
-            if (keyValuesFixed.Count > 0)
-                foreach (var item in keyValuesFixed)
-                {
-                    if (!string.IsNullOrEmpty(item.Item1)) keyValueTags.Add(item.Item1, new Collection<string> { item.Item2 });
-                }
-
-            System.Guid _uuid = System.Guid.Parse(UUID);
-            System.Guid _creator = System.Guid.Parse(worldStorageUser.UUID);
-            System.Guid _from = System.Guid.Parse(FROM.UUID);
-            System.Guid _to = System.Guid.Parse(TO.UUID);
-            WorldLink t = new WorldLink()
-            {
-                UUID = _uuid,
-                CreatorUUID = _creator,
-                UUIDFrom = _from,
-                UUIDTo = _to,
-                TypeFrom = FROM.type,
-                TypeTo = TO.type,
-                Transform = transform3d,
-                Unit = unit,
-                KeyvalueTags = keyValueTags
-            };
-            return t;
-        }
-    }
-}
\ No newline at end of file
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/WorldLinkWindow.cs.meta b/Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/WorldLinkWindow.cs.meta
deleted file mode 100644
index 6fdeb449c37b137881847fdb1819809eb9dfce05..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/WorldLinkWindow.cs.meta	
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: f66d40f8781c5784cbe1013328d78ae6
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/WorldStorageWindow.cs b/Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/WorldStorageWindow.cs
deleted file mode 100644
index 281150aa166306a7379166be8fd994e3804d93c7..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/WorldStorageWindow.cs	
+++ /dev/null
@@ -1,641 +0,0 @@
-//
-// ARF - Augmented Reality Framework (ETSI ISG ARF)
-//
-// Copyright 2024 ETSI
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// Last change: June 2024
-//
-
-#define isDEBUG
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-
-using UnityEngine;
-using UnityEditor;
-
-using ETSI.ARF.WorldStorage;
-using ETSI.ARF.WorldStorage.REST;
-using ETSI.ARF.WorldStorage.Editor.Windows;
-using ETSI.ARF.OpenAPI.WorldStorage;
-
-namespace ETSI.ARF.WorldStorage.UI
-{
-    public class WorldStorageWindow : EditorWindow
-    {
-        static public WorldStorageWindow WorldStorageWindowSingleton;
-        static public string lastUserID = "8fb169e2-8910-4cd5-a8f9-b7abff38d013"; // dummy
-
-        [HideInInspector] public WorldStorageServer worldStorageServer;
-        [HideInInspector] public WorldStorageUser worldStorageUser;
-
-        [SerializeField] public List<string> creators = new List<string>();
-        [SerializeField] public List<string> trackables = new List<string>();
-        [SerializeField] public List<string> anchors = new List<string>();
-        [SerializeField] public List<string> links = new List<string>();
-
-        string ping = "-";
-        string state = "Unknow";
-        string vers = "Unknow";
-
-        private bool repaint = false;
-        private Vector2 scrollPos;
-        private Color ori;
-        private GUIStyle gsTest;
-
-        private static GUILayoutOption miniButtonWidth = GUILayout.Width(32);
-        private static GUILayoutOption buttonWidth = GUILayout.Width(64f);
-        private bool showListT = true;
-        private bool showListA = true;
-        private bool showListL = true;
-
-        private string filterByKeyValueTag = "";
-
-        static public string winName = "ARF Authoring Editor";
-        static public int lineH = 5;
-        static public Color[] arfColors = new Color[]
-        {
-            Color.yellow,                   // paneltext
-            new Color(0.3f, 1f, 1f),        // button REST
-            new Color(0.3f, 1f, 0.3f),      // button create
-            new Color(1f, 0f, 0f),          // button delete (red)
-            new Color(.5f, .7f, 1f),        // button graph window
-            new Color(.3f, .7f, 1f),        // button generate prefab
-            new Color(1f, 1f, 0.3f),        // button request
-            new Color(1f, 0.3f, 0.3f),      // 7/ color for trackables
-            new Color(1f, 0.7f, 0f),        // 8/ color for anchors
-            new Color(.66f, .4f, 1f),        // 9/ color for links
-            new Color(.66f, .66f, 66f),        // color for light grey
-            new Color(.22f, .22f, 22f)        // color for dark grey
-        };
-
-
-        //[MenuItem("[ ISG-ARF ]/World Storage Editor")]
-        public static void ShowWindow()
-        {
-            WorldStorageWindowSingleton = EditorWindow.GetWindow(typeof(WorldStorageWindow), false, WorldStorageWindow.winName) as WorldStorageWindow;
-            OpenAPI.ResponseObject<string> ro = AdminRequest.PingAsync(WorldStorageWindowSingleton.worldStorageServer, (response) =>
-            {
-                WorldStorageWindowSingleton.ping = response.result;
-                WorldStorageWindowSingleton.repaint = true;
-            });
-            WorldStorageWindow.lastUserID = WorldStorageWindowSingleton.worldStorageUser.UUID;
-        }
-
-        public void Update()
-        {
-            if (repaint)
-            {
-                Repaint();
-                repaint = false;
-            }
-        }
-
-        public WorldStorageWindow()
-        {
-        }
-
-        static public void DrawCopyright()
-        {
-            // Title 
-            GUILayout.Label("Augmented Reality Framework", EditorStyles.boldLabel);
-            GUILayout.Label("Copyright (C) 2024, ETSI (BSD 3-Clause License)");
-        }
-
-        void OnGUI()
-        {
-            ori = GUI.backgroundColor;
-            gsTest = new GUIStyle("window");
-            //gsTest.normal.textColor = WorldStorageWindow.arfColors[0];
-            gsTest.fontStyle = FontStyle.Bold;
-            gsTest.alignment = TextAnchor.UpperLeft;
-            gsTest.fontSize = 16;
-
-            scrollPos = EditorGUILayout.BeginScrollView(scrollPos, GUILayout.ExpandWidth(true));
-            WorldStorageWindow.DrawCopyright();
-
-            // Server info
-            GUILayout.BeginVertical("World Storage Server", gsTest);
-            EditorGUILayout.Space();
-            Rect rect = EditorGUILayout.GetControlRect(false, 1); // WorldStorageWindow.lineH);
-            EditorGUI.DrawRect(rect, Color.black);
-            //
-            GUILayout gl = new GUILayout();
-
-            GUILayout.Label("Server Name: " + worldStorageServer.serverName, EditorStyles.whiteLargeLabel);
-            GUILayout.Label("User Name: " + worldStorageUser.userName, EditorStyles.whiteLargeLabel);
-#if isDEBUG
-            GUILayout.Label("Creator UID: " + worldStorageUser.UUID);
-            GUILayout.Label("Base Path: " + worldStorageServer.basePath);
-            GUILayout.Label("Port: " + worldStorageServer.port);
-#endif
-
-            GUI.backgroundColor = WorldStorageWindow.arfColors[1];
-            if (GUILayout.Button("Open World Representation Graph Window..."))
-            {
-                WorldGraphWindow.ShowWindowFromWorldStorageWindow(worldStorageServer, worldStorageUser);
-            }
-            GUI.backgroundColor = ori;
-
-            DrawElementStuffs();
-
-            EditorGUILayout.EndScrollView();
-        }
-
-        public void OnInspectorUpdate()
-        {
-            this.Repaint();
-        }
-
-        void DrawElementStuffs()
-        {
-
-            EditorGUILayout.Space();
-
-            // ###########################################################
-            // Handle admin
-            // ###########################################################
-            #region Ping
-            GUILayout.BeginHorizontal();
-            ping = EditorGUILayout.TextField("Last Ping", ping);
-            if (GUILayout.Button("Ping"))
-            {
-                OpenAPI.ResponseObject<string> ro = AdminRequest.PingAsync(worldStorageServer, (response) =>
-                {
-                    ping = response.result;
-                });
-            }
-            GUI.backgroundColor = ori;
-            GUILayout.EndHorizontal();
-            #endregion
-
-            #region State
-            GUILayout.BeginHorizontal();
-            state = EditorGUILayout.TextField("State", state);
-
-            if (GUILayout.Button("Get World Storage Sate"))
-            {
-                OpenAPI.ResponseObject<string> ro = AdminRequest.AdminAsync(worldStorageServer, (response) =>
-                {
-                    state = response.result;
-                });
-            }
-            GUI.backgroundColor = ori;
-            GUILayout.EndHorizontal();
-            #endregion
-
-            #region Version
-            GUILayout.BeginHorizontal();
-            vers = EditorGUILayout.TextField("Version", vers);
-
-            if (GUILayout.Button("Get World Storage API Version"))
-            {
-                OpenAPI.ResponseObject<string> ro = AdminRequest.VersionAsync(worldStorageServer, (response) =>
-                {
-                    vers = response.result;
-                });
-            }
-            GUI.backgroundColor = ori;
-            GUILayout.EndHorizontal();
-            #endregion
-
-            EditorGUILayout.Space();
-
-            ScriptableObject target = this;
-            SerializedObject so = new SerializedObject(target);
-
-            // ###########################################################
-            // Get creators
-            // ###########################################################
-            #region Get all creator UUID
-            EditorGUILayout.Space();
-            GUI.backgroundColor = WorldStorageWindow.arfColors[4];
-            if (GUILayout.Button("Request UUID of Creators")) GetCreators();
-            GUI.backgroundColor = ori;
-
-            SerializedProperty stringsProperty = so.FindProperty("creators");
-            EditorGUILayout.PropertyField(stringsProperty, true); // True means show children
-            so.ApplyModifiedProperties(); // Remember to apply modified properties
-            #endregion
-
-            //EditorGUILayout.Space();
-            //GUILayout.Label("World Storage Elements:", EditorStyles.whiteLargeLabel);
-
-
-            // ###########################################################
-            // Filter (Key = Group)
-            // ###########################################################
-            #region Filter
-            EditorGUILayout.Space();
-            filterByKeyValueTag = EditorGUILayout.TextField("Filter for KeyValue Group:", filterByKeyValueTag);
-            #endregion
-
-            // ###########################################################
-            // Handle trackables
-            // ###########################################################
-            #region Get all trackable objects
-            EditorGUILayout.Space();
-
-            GUI.backgroundColor = WorldStorageWindow.arfColors[0];
-            if (GUILayout.Button("Request All"))
-            {
-                GetTrackables();
-                GetWorldAnchors();
-                GetWorldLinks();
-            }
-
-            GUILayout.BeginHorizontal();
-            GUI.backgroundColor = WorldStorageWindow.arfColors[7];
-            Texture trackableImage = (Texture)AssetDatabase.LoadAssetAtPath("Assets/ETSI.ARF/ARF World Storage API/Images/trackable.png", typeof(Texture));
-            GUILayout.Box(trackableImage, GUILayout.Width(24), GUILayout.Height(24));
-            GUI.backgroundColor = ori;
-            GUILayout.Label("Trackables:", EditorStyles.whiteBoldLabel);
-            GUILayout.EndHorizontal();
-
-            EditorGUILayout.BeginHorizontal();
-            GUI.backgroundColor = WorldStorageWindow.arfColors[0];
-            if (GUILayout.Button("Request Trackables"))
-            {
-                GetTrackables();
-            }
-
-            GUI.backgroundColor = WorldStorageWindow.arfColors[2];
-            if (GUILayout.Button("Create New"))
-            {
-                Debug.Log("Create trackable and open window");
-                TrackableWindow.ShowWindow(worldStorageServer, worldStorageUser);
-            }
-
-            GUI.backgroundColor = ori;
-            //GUI.backgroundColor = WorldStorageWindow.arfColors[3];
-            if (GUILayout.Button("Delete all Trackables (3 stay in!!!)"))
-            {
-                if (EditorUtility.DisplayDialog("Deleting elements", "Do you really want to delete all trackables?", "Yes", "No"))
-                {
-                    Debug.Log("Deleting all Trackable ");
-                    int n = 0;
-                    string UUID;
-                    foreach (var customName in trackables)
-                    {
-                        if (!customName.Contains("[")) UUID = customName;
-                        else
-                        {
-                            // extract the UUID
-                            UUID = customName.Split('[', ']')[1];
-                        }
-                        if (++n > 3) TrackableRequest.DeleteTrackableAsync(worldStorageServer, Guid.Parse(UUID), (response) =>
-                        {
-                            // nothing to do
-                        });
-                    }
-
-                    GetTrackables();
-                    WorldStorageWindow.WorldStorageWindowSingleton.repaint = true;
-                }
-            }
-            GUI.backgroundColor = ori;
-            EditorGUILayout.EndHorizontal();
-
-            // Show list
-            stringsProperty = so.FindProperty("trackables");
-            showListT = EditorGUILayout.BeginFoldoutHeaderGroup(showListT, "List of Trackables");
-            if (showListT)
-                for (int i = 0; i < stringsProperty.arraySize; i++)
-                {
-                    EditorGUILayout.BeginHorizontal();
-                    EditorGUILayout.PropertyField(stringsProperty.GetArrayElementAtIndex(i));
-
-                    string UUID = WorldStorageWindow.GetUUIDFromString(stringsProperty.GetArrayElementAtIndex(i).stringValue);
-                    if (UUID == null && i < trackables.Count) UUID = trackables[i]; // try this
-                    if (GUILayout.Button("Edit...", EditorStyles.miniButtonLeft, buttonWidth))
-                    {
-                        Debug.Log("Open Trackable Window");
-                        TrackableWindow.ShowWindow(worldStorageServer, worldStorageUser, UUID);
-                    }
-
-                    GUI.backgroundColor = WorldStorageWindow.arfColors[3];
-                    if (GUILayout.Button("X", EditorStyles.miniButtonLeft, miniButtonWidth))
-                    {
-                        if (EditorUtility.DisplayDialog("Delete", "Are you sure you want to delete this element?", "Delete", "Cancel"))
-                        {
-                            TrackableRequest.DeleteTrackableAsync(worldStorageServer, Guid.Parse(UUID), (response) =>
-                            {
-                                WorldStorageWindowSingleton.GetTrackables();
-                                WorldStorageWindowSingleton.repaint = true;
-                            });
-                        }
-                    }
-                    GUI.backgroundColor = ori;
-
-                    EditorGUILayout.EndHorizontal();
-                }
-            EditorGUILayout.EndFoldoutHeaderGroup();
-            #endregion
-
-            // ###########################################################
-            // Handle anchors
-            // ###########################################################
-            #region Get all anchor objects
-            EditorGUILayout.Space();
-
-            GUILayout.BeginHorizontal();
-            GUI.backgroundColor = WorldStorageWindow.arfColors[8];
-            Texture anchorImage = (Texture)AssetDatabase.LoadAssetAtPath("Assets/ETSI.ARF/ARF World Storage API/Images/anchor.png", typeof(Texture));
-            GUILayout.Box(anchorImage, GUILayout.Width(24), GUILayout.Height(24));
-            GUI.backgroundColor = ori;
-            GUILayout.Label("World Anchors:", EditorStyles.whiteBoldLabel);
-            GUILayout.EndHorizontal();
-
-            EditorGUILayout.BeginHorizontal();
-            GUI.backgroundColor = WorldStorageWindow.arfColors[0];
-            if (GUILayout.Button("Request Anchors"))
-            {
-                GetWorldAnchors();
-            }
-
-            GUI.backgroundColor = WorldStorageWindow.arfColors[2];
-            if (GUILayout.Button("Create New"))
-            {
-                Debug.Log("Create anchor and open window");
-                WorldAnchorWindow.ShowWindow(worldStorageServer, worldStorageUser);
-            }
-
-            GUI.backgroundColor = ori;
-            //GUI.backgroundColor = WorldStorageWindow.arfColors[3];
-            if (GUILayout.Button("Delete all Anchors (3 stay in!!!)"))
-            {
-                if (EditorUtility.DisplayDialog("Deleting elements", "Do you really want to delete all anchors?", "Yes", "No"))
-                {
-                    Debug.Log("Deleting all World Anchors ");
-                    int n = 0;
-                    string UUID;
-                    foreach (var customName in anchors)
-                    {
-                        if (!customName.Contains("[")) UUID = customName;
-                        else
-                        {
-                            // extract the UUID
-                            UUID = customName.Split('[', ']')[1];
-                        }
-                        if (++n > 3) WorldAnchorRequest.DeleteWorldAnchorAsync(worldStorageServer, Guid.Parse(UUID), (response) =>
-                        {
-                            WorldStorageWindowSingleton.GetWorldAnchors();
-                            WorldStorageWindowSingleton.repaint = true;
-                        });
-                    }
-                }
-            }
-            GUI.backgroundColor = ori;
-            EditorGUILayout.EndHorizontal();
-
-            // Show list
-            stringsProperty = so.FindProperty("anchors");
-            showListA = EditorGUILayout.BeginFoldoutHeaderGroup(showListA, "List of World Anchors");
-            if (showListA)
-                for (int i = 0; i < stringsProperty.arraySize; i++)
-                {
-                    EditorGUILayout.BeginHorizontal();
-                    EditorGUILayout.PropertyField(stringsProperty.GetArrayElementAtIndex(i));
-
-                    string UUID = WorldStorageWindow.GetUUIDFromString(stringsProperty.GetArrayElementAtIndex(i).stringValue);
-                    if (UUID == null && i < anchors.Count) UUID = anchors[i]; // try this
-                    if (GUILayout.Button("Edit...", EditorStyles.miniButtonLeft, buttonWidth))
-                    {
-                        Debug.Log("Open Anchor Window");
-                        WorldAnchorWindow.ShowWindow(worldStorageServer, worldStorageUser, UUID);
-                    }
-
-                    GUI.backgroundColor = WorldStorageWindow.arfColors[3];
-                    if (GUILayout.Button("X", EditorStyles.miniButtonLeft, miniButtonWidth))
-                    {
-                        if (EditorUtility.DisplayDialog("Delete", "Are you sure you want to delete this element?", "Delete", "Cancel"))
-                        {
-                            WorldAnchorRequest.DeleteWorldAnchorAsync(worldStorageServer, Guid.Parse(UUID), (response) =>
-                            {
-                                WorldStorageWindowSingleton.GetWorldAnchors();
-                            });
-                        }
-                    }
-                    GUI.backgroundColor = ori;
-
-                    EditorGUILayout.EndHorizontal();
-                }
-            EditorGUILayout.EndFoldoutHeaderGroup();
-            #endregion
-
-            // ###########################################################
-            // Handle Links
-            // ###########################################################
-            #region Get all link objects
-            EditorGUILayout.Space();
-
-            GUILayout.BeginHorizontal();
-            GUI.backgroundColor = WorldStorageWindow.arfColors[9];
-            Texture linkImage = (Texture)AssetDatabase.LoadAssetAtPath("Assets/ETSI.ARF/ARF World Storage API/Images/link.png", typeof(Texture));
-            GUILayout.Box(linkImage, GUILayout.Width(24), GUILayout.Height(24));
-            GUI.backgroundColor = ori;
-            GUILayout.Label("World Links:", EditorStyles.whiteBoldLabel);
-            GUILayout.EndHorizontal();
-
-            EditorGUILayout.BeginHorizontal();
-            GUI.backgroundColor = WorldStorageWindow.arfColors[0];
-            if (GUILayout.Button("Request Links"))
-            {
-                GetWorldLinks();
-            }
-
-            GUI.backgroundColor = WorldStorageWindow.arfColors[2];
-            if (GUILayout.Button("Create New"))
-            {
-                Debug.Log("Create link and open window");
-                WorldLinkWindow.ShowWindow(worldStorageServer, worldStorageUser);
-            }
-
-            GUI.backgroundColor = ori;
-            //GUI.backgroundColor = WorldStorageWindow.arfColors[3];
-            if (GUILayout.Button("Delete all Links (3 stay in!!!)"))
-            {
-                if (EditorUtility.DisplayDialog("Deleting elements", "Do you really want to delete all links?", "Yes", "No"))
-                {
-                    Debug.Log("Deleting all World Links");
-                    int n = 0;
-                    string UUID;
-                    foreach (var customName in links)
-                    {
-                        if (!customName.Contains("[")) UUID = customName;
-                        else
-                        {
-                            // extract the UUID
-                            UUID = customName.Split('[', ']')[1];
-                        }
-                        if (++n > 3) WorldLinkRequest.DeleteWorldLinkAsync(worldStorageServer, Guid.Parse(UUID), (response) =>
-                        {
-                            WorldStorageWindowSingleton.GetWorldLinks();
-                        });
-                    }
-                }
-            }
-            GUI.backgroundColor = ori;
-            EditorGUILayout.EndHorizontal();
-
-            // Show list
-            stringsProperty = so.FindProperty("links");
-            showListL = EditorGUILayout.BeginFoldoutHeaderGroup(showListL, "List of World Links");
-            if (showListL)
-                for (int i = 0; i < stringsProperty.arraySize; i++)
-                {
-                    EditorGUILayout.BeginHorizontal();
-                    EditorGUILayout.PropertyField(stringsProperty.GetArrayElementAtIndex(i));
-
-                    string UUID = WorldStorageWindow.GetUUIDFromString(stringsProperty.GetArrayElementAtIndex(i).stringValue);
-                    if (UUID == null && i < links.Count) UUID = links[i]; // try this
-                    if (GUILayout.Button("Edit...", EditorStyles.miniButtonLeft, buttonWidth))
-                    {
-                        Debug.Log("Open Link Window");
-
-                        WorldLinkWindow.ShowWindow(worldStorageServer, worldStorageUser, UUID);
-                    }
-
-                    GUI.backgroundColor = WorldStorageWindow.arfColors[3];
-                    if (GUILayout.Button("X", EditorStyles.miniButtonLeft, miniButtonWidth))
-                    {
-                        if (EditorUtility.DisplayDialog("Delete", "Are you sure you want to delete this element?", "Delete", "Cancel"))
-                        {
-                            WorldLinkRequest.DeleteWorldLinkAsync(worldStorageServer, Guid.Parse(UUID), (response) =>
-                            {
-                                WorldStorageWindowSingleton.GetWorldLinks();
-                            });
-                        }
-                    }
-                    GUI.backgroundColor = ori;
-
-                    EditorGUILayout.EndHorizontal();
-                }
-            EditorGUILayout.EndFoldoutHeaderGroup();
-            #endregion
-
-            //
-            GUILayout.EndVertical();
-        }
-
-        // ###########################################################
-        // Get elements from current server
-        // ###########################################################
-        #region Helpers
-        static public string GetUUIDFromString(string text)
-        {
-            if (!text.Contains("[")) return null;
-            else
-            {
-                // extract the UUID
-                return text.Split('[', ']')[1];
-            }
-        }
-        public void GetCreators()
-        {
-            // Get all objects
-            Debug.Log("Get all creators id");
-            TrackableRequest.GetTrackablesAsync(worldStorageServer, (response) =>
-            {
-                creators.Clear();
-                foreach (var item in response.result)
-                {
-                    if (!creators.Contains(item.CreatorUUID.ToString())) creators.Add(item.CreatorUUID.ToString());
-                }
-            });
-        }
-
-        static public (string, string) GetFirstKeyValueTags(KeyvalueTagList dict)
-        {
-            if (dict.Count >= 1)
-            {
-                // Get the first value in account (demo)
-                foreach (var item in dict)
-                {
-                    string key1 = item.Key;
-                    if (item.Value.Count >= 1)
-                    {
-                        string value1 = item.Value[0];
-                        return (key1, value1);
-                    }
-                }
-            }
-            return ("", "");
-        }
-
-        public void GetTrackables()
-        {
-            // Get all objects
-            Debug.Log("Get all server objects");
-            trackables.Clear();
-            repaint = true;
-            TrackableRequest.GetTrackablesAsync(worldStorageServer, (response) =>
-            {
-                Debug.Log("Get objects num = " + response.result.Count);
-                foreach (var item in response.result)
-                {
-                    if (filterByKeyValueTag != "")
-                    {
-                        var first = GetFirstKeyValueTags(item.KeyvalueTags);
-                        if (first.Item1.ToLower() != "group" || first.Item2 != filterByKeyValueTag) continue;
-                    }
-                    if (!string.IsNullOrEmpty(item.Name)) trackables.Add(item.Name + " [" + item.UUID.ToString() + "]");
-                    else trackables.Add(item.UUID.ToString());
-                }
-                repaint = true;
-            });
-        }
-
-        public void GetWorldAnchors()
-        {
-            // Get all objects
-            Debug.Log("Get all server objects");
-            anchors.Clear();
-            repaint = true;
-            WorldAnchorRequest.GetWorldAnchorsAsync(worldStorageServer, (response) =>
-            {
-                foreach (var item in response.result)
-                {
-                    if (filterByKeyValueTag != "")
-                    {
-                        var first = GetFirstKeyValueTags(item.KeyvalueTags);
-                        if (first.Item1.ToLower() != "group" || first.Item2 != filterByKeyValueTag) continue;
-                    }
-                    if (!string.IsNullOrEmpty(item.Name)) anchors.Add(item.Name + " [" + item.UUID.ToString() + "]");
-                    else anchors.Add(item.UUID.ToString());
-                }
-                repaint = true;
-            });
-        }
-
-        public void GetWorldLinks()
-        {
-            // Get all objects
-            Debug.Log("Get all server objects");
-            links.Clear();
-            repaint = true;
-            WorldLinkRequest.GetWorldLinksAsync(worldStorageServer, (response) =>
-            {
-                foreach (var item in response.result)
-                {
-                    links.Add(item.UUID.ToString());
-                }
-                repaint = true;
-            });
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/WorldStorageWindow.cs.meta b/Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/WorldStorageWindow.cs.meta
deleted file mode 100644
index ec99c51dab094a4ad96d5a8815ad02617d7c3307..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/WorldStorageWindow.cs.meta	
+++ /dev/null
@@ -1,14 +0,0 @@
-fileFormatVersion: 2
-guid: a1647df9b48bf4f49a664a929fff57ff
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences:
-  - m_ViewDataDictionary: {instanceID: 0}
-  - worldStorageServer: {fileID: 11400000, guid: 4f997253243de534dad12937f1284975, type: 2}
-  - worldStorageUser: {fileID: 11400000, guid: c0696089e4a855b46ad490437919b1e8, type: 2}
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Editor/WorldStoragePrefabs.cs b/Assets/ETSI.ARF/ARF World Storage API/Editor/WorldStoragePrefabs.cs
deleted file mode 100644
index be46c26538991d61db430e1e3f59b64738ef51f4..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/Editor/WorldStoragePrefabs.cs	
+++ /dev/null
@@ -1,36 +0,0 @@
-//
-// ARF - Augmented Reality Framework (ETSI ISG ARF)
-//
-// Copyright 2024 ETSI
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// Last change: July 2022
-//
-
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEditor;
-
-namespace ETSI.ARF.WorldStorage.UI.Prefabs
-{
-    [System.Serializable]
-    [CreateAssetMenu(fileName = "ARFPrefabs", menuName = "ARF World Storage/Setup for Visuals (prefabs)", order = 1)]
-    public class WorldStoragePrefabs : ScriptableObject
-    {
-        [SerializeField] public GameObject trackablePrefab;
-        [SerializeField] public GameObject worldAnchorPrefab;
-        [SerializeField] public GameObject worldLinkPrefab;
-    }
-}
\ No newline at end of file
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Editor/WorldStoragePrefabs.cs.meta b/Assets/ETSI.ARF/ARF World Storage API/Editor/WorldStoragePrefabs.cs.meta
deleted file mode 100644
index c921b2346f741651adbfe7293a583be4a8b6cb5c..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/Editor/WorldStoragePrefabs.cs.meta	
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 1aec4cd1383f70e4092183ea55088e8e
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Editor/WorldStorageServerEditor.cs b/Assets/ETSI.ARF/ARF World Storage API/Editor/WorldStorageServerEditor.cs
deleted file mode 100644
index 98b8311209d4b9885cb180189f5964fe45a044c7..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/Editor/WorldStorageServerEditor.cs	
+++ /dev/null
@@ -1,64 +0,0 @@
-//
-// ARF - Augmented Reality Framework (ETSI ISG ARF)
-//
-// Copyright 2024 ETSI
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// Last change: June 2022
-//
-
-using System.Collections;
-using System.Collections.Generic;
-
-using UnityEngine;
-using UnityEditor;
-
-namespace ETSI.ARF.WorldStorage.UI
-{
-    [CustomEditor(typeof(WorldStorageServer))]
-    public class WorldStorageServerEditor : UnityEditor.Editor
-    {
-        WorldStorageServer worldStorageServer;
-        WorldStorageWindow win;
-
-        public void OnEnable()
-        {
-            worldStorageServer = (WorldStorageServer)target;
-        }
-
-        public override void OnInspectorGUI()
-        {
-            serializedObject.Update();
-
-            Color ori = GUI.backgroundColor;
-
-            GUILayout.Label("Copyright(c) 2022, ETSI - ARF");
-            EditorGUILayout.Space();
-            GUILayout.Label("Parameters:", EditorStyles.boldLabel);
-            DrawDefaultInspector();
-            EditorGUILayout.Space();
-
-            // open window button
-            GUI.backgroundColor = WorldStorageWindow.arfColors[1];
-            if (GUILayout.Button("Open World Storage Window..."))
-            {
-                Debug.Log("Open Main ARF Window");
-                win = EditorWindow.GetWindow(typeof(WorldStorageWindow), false, "ETSI ARF - Authoring Editor") as WorldStorageWindow;
-                win.worldStorageServer = worldStorageServer;
-                win.worldStorageUser = worldStorageServer.currentUser;
-            }
-            GUI.backgroundColor = ori;
-        }
-    }
-}
\ No newline at end of file
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Editor/WorldStorageServerEditor.cs.meta b/Assets/ETSI.ARF/ARF World Storage API/Editor/WorldStorageServerEditor.cs.meta
deleted file mode 100644
index 2cc100f65e07665be1a6553ce793290920974cdf..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/Editor/WorldStorageServerEditor.cs.meta	
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 878ee3c4c6608354f90354fd159f4e04
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Editor/WorldStorageUserEditor.cs b/Assets/ETSI.ARF/ARF World Storage API/Editor/WorldStorageUserEditor.cs
deleted file mode 100644
index 61710a072e6e56f340ae3b533cf5fd45f7f20afa..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/Editor/WorldStorageUserEditor.cs	
+++ /dev/null
@@ -1,62 +0,0 @@
-//
-// ARF - Augmented Reality Framework (ETSI ISG ARF)
-//
-// Copyright 2024 ETSI
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// Last change: June 2024
-//
-
-using System.Collections;
-using System.Collections.Generic;
-
-using UnityEngine;
-using UnityEditor;
-
-namespace ETSI.ARF.WorldStorage.UI
-{
-    [CustomEditor(typeof(WorldStorageUser))]
-    public class WorldStorageUserEditor : UnityEditor.Editor
-    {
-        WorldStorageUser worldStorageUser;
-        WorldStorageWindow win;
-
-        public void OnEnable()
-        {
-            worldStorageUser = (WorldStorageUser)target;
-        }
-
-        public override void OnInspectorGUI()
-        {
-            serializedObject.Update();
-
-            Color ori = GUI.backgroundColor;
-
-            GUILayout.Label("Copyright(c) 2022, ETSI - ARF");
-            EditorGUILayout.Space();
-            GUILayout.Label("Parameters:", EditorStyles.boldLabel);
-            DrawDefaultInspector();
-            EditorGUILayout.Space();
-
-            // creator UUID button
-            GUI.backgroundColor = WorldStorageWindow.arfColors[1];
-            if (GUILayout.Button("Generate New Creator UUID"))
-            {
-                worldStorageUser.UUID = System.Guid.NewGuid().ToString();
-                if (win != null) win.worldStorageUser.UUID = worldStorageUser.UUID;
-            }
-            GUI.backgroundColor = ori;
-        }
-    }
-}
\ No newline at end of file
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Editor/WorldStorageUserEditor.cs.meta b/Assets/ETSI.ARF/ARF World Storage API/Editor/WorldStorageUserEditor.cs.meta
deleted file mode 100644
index fda722e173a00845529c4320e13d4eb268184994..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/Editor/WorldStorageUserEditor.cs.meta	
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 134a71a4b493ae1468ea8de88c99135c
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Images.meta b/Assets/ETSI.ARF/ARF World Storage API/Images.meta
deleted file mode 100644
index e91faab6ea0fbedbaba1bfe5063740f6927eb413..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/Images.meta	
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-<<<<<<< HEAD
-guid: 7d34ace7d2e2513479736d20d0c95ad0
-=======
-guid: 959ac6161f5900d4aa7903c24bc5a31d
->>>>>>> develop
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Images/Materials.meta b/Assets/ETSI.ARF/ARF World Storage API/Images/Materials.meta
deleted file mode 100644
index 35aca11785a3afc87d0e25c630b4adf29b7ff3a2..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/Images/Materials.meta	
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: fb3f0905e8c5e4448ad7871a219b9f8a
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Images/Materials/anchor.mat b/Assets/ETSI.ARF/ARF World Storage API/Images/Materials/anchor.mat
deleted file mode 100644
index b0f2689b38220eef7be617bf450462f746e2d013..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/Images/Materials/anchor.mat	
+++ /dev/null
@@ -1,80 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!21 &2100000
-Material:
-  serializedVersion: 8
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: anchor
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ValidKeywords: []
-  m_InvalidKeywords: []
-  m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
-  stringTagMap: {}
-  disabledShaderPasses: []
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs:
-    - _BumpMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailAlbedoMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailMask:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailNormalMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _EmissionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MainTex:
-        m_Texture: {fileID: 2800000, guid: 000725cae67a4f7448f79fe2a478a50d, type: 3}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MetallicGlossMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _OcclusionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _ParallaxMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    m_Ints: []
-    m_Floats:
-    - _BumpScale: 1
-    - _Cutoff: 0.5
-    - _DetailNormalMapScale: 1
-    - _DstBlend: 0
-    - _GlossMapScale: 1
-    - _Glossiness: 0.5
-    - _GlossyReflections: 1
-    - _Metallic: 0
-    - _Mode: 0
-    - _OcclusionStrength: 1
-    - _Parallax: 0.02
-    - _SmoothnessTextureChannel: 0
-    - _SpecularHighlights: 1
-    - _SrcBlend: 1
-    - _UVSec: 0
-    - _ZWrite: 1
-    m_Colors:
-    - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-  m_BuildTextureStacks: []
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Images/Materials/anchor.mat.meta b/Assets/ETSI.ARF/ARF World Storage API/Images/Materials/anchor.mat.meta
deleted file mode 100644
index 477ef1d43c74c370c6e47cf0afb480d6a466e57c..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/Images/Materials/anchor.mat.meta	
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 730ea8fe50af5874fb3b990c534eaebc
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 2100000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Images/Materials/link.mat b/Assets/ETSI.ARF/ARF World Storage API/Images/Materials/link.mat
deleted file mode 100644
index 3e36be1d3bcc9bd667266f80d5eaeb8cd979edd0..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/Images/Materials/link.mat	
+++ /dev/null
@@ -1,80 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!21 &2100000
-Material:
-  serializedVersion: 8
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: link
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ValidKeywords: []
-  m_InvalidKeywords: []
-  m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
-  stringTagMap: {}
-  disabledShaderPasses: []
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs:
-    - _BumpMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailAlbedoMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailMask:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailNormalMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _EmissionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 5, y: 5}
-        m_Offset: {x: 0, y: 0}
-    - _MainTex:
-        m_Texture: {fileID: 2800000, guid: fef18a27fe1e4a040b8cfda6b3b5c178, type: 3}
-        m_Scale: {x: 5, y: 5}
-        m_Offset: {x: 0, y: 0}
-    - _MetallicGlossMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _OcclusionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _ParallaxMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    m_Ints: []
-    m_Floats:
-    - _BumpScale: 1
-    - _Cutoff: 0.5
-    - _DetailNormalMapScale: 1
-    - _DstBlend: 0
-    - _GlossMapScale: 1
-    - _Glossiness: 0.5
-    - _GlossyReflections: 1
-    - _Metallic: 0
-    - _Mode: 0
-    - _OcclusionStrength: 1
-    - _Parallax: 0.02
-    - _SmoothnessTextureChannel: 0
-    - _SpecularHighlights: 1
-    - _SrcBlend: 1
-    - _UVSec: 0
-    - _ZWrite: 1
-    m_Colors:
-    - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-  m_BuildTextureStacks: []
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Images/Materials/link.mat.meta b/Assets/ETSI.ARF/ARF World Storage API/Images/Materials/link.mat.meta
deleted file mode 100644
index b668a5a22ee75c7fa1be9daff2c495038b73f1ec..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/Images/Materials/link.mat.meta	
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: ce02d83032448a945ac827316ba8bb87
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 2100000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Images/Materials/trackable.mat b/Assets/ETSI.ARF/ARF World Storage API/Images/Materials/trackable.mat
deleted file mode 100644
index 1b5d4607ffec78ec72806ffd466d702e2b44f943..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/Images/Materials/trackable.mat	
+++ /dev/null
@@ -1,80 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!21 &2100000
-Material:
-  serializedVersion: 8
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: trackable
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ValidKeywords: []
-  m_InvalidKeywords: []
-  m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
-  stringTagMap: {}
-  disabledShaderPasses: []
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs:
-    - _BumpMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailAlbedoMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailMask:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailNormalMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _EmissionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MainTex:
-        m_Texture: {fileID: 2800000, guid: 90d4635c9d0895c42bec0551c4e790ea, type: 3}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MetallicGlossMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _OcclusionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _ParallaxMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    m_Ints: []
-    m_Floats:
-    - _BumpScale: 1
-    - _Cutoff: 0.5
-    - _DetailNormalMapScale: 1
-    - _DstBlend: 0
-    - _GlossMapScale: 1
-    - _Glossiness: 0.5
-    - _GlossyReflections: 1
-    - _Metallic: 0
-    - _Mode: 0
-    - _OcclusionStrength: 1
-    - _Parallax: 0.02
-    - _SmoothnessTextureChannel: 0
-    - _SpecularHighlights: 1
-    - _SrcBlend: 1
-    - _UVSec: 0
-    - _ZWrite: 1
-    m_Colors:
-    - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-  m_BuildTextureStacks: []
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Images/Materials/trackable.mat.meta b/Assets/ETSI.ARF/ARF World Storage API/Images/Materials/trackable.mat.meta
deleted file mode 100644
index fe1a18aae47ffa3114e23e5adae56d349174b11b..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/Images/Materials/trackable.mat.meta	
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 4f607925b7a7fcc44806b35f5aa087a4
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 2100000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Images/anchor.png b/Assets/ETSI.ARF/ARF World Storage API/Images/anchor.png
deleted file mode 100644
index bb1804db730faff5a6f0a7523a8729085e8dae34..0000000000000000000000000000000000000000
Binary files a/Assets/ETSI.ARF/ARF World Storage API/Images/anchor.png and /dev/null differ
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Images/anchor.png.meta b/Assets/ETSI.ARF/ARF World Storage API/Images/anchor.png.meta
deleted file mode 100644
index b8da83ad1c9b68b8a96b51093d3f1d54aa6d78dd..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/Images/anchor.png.meta	
+++ /dev/null
@@ -1,98 +0,0 @@
-fileFormatVersion: 2
-guid: 000725cae67a4f7448f79fe2a478a50d
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 11
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 1
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMasterTextureLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 0
-    wrapV: 0
-    wrapW: 0
-  nPOTScale: 1
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 0
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 0
-  spriteTessellationDetail: -1
-  textureType: 0
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Images/cloud.png b/Assets/ETSI.ARF/ARF World Storage API/Images/cloud.png
deleted file mode 100644
index a00dc22e5e0f7b506d089858b7ed281d3ed6092b..0000000000000000000000000000000000000000
Binary files a/Assets/ETSI.ARF/ARF World Storage API/Images/cloud.png and /dev/null differ
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Images/cloud.png.meta b/Assets/ETSI.ARF/ARF World Storage API/Images/cloud.png.meta
deleted file mode 100644
index d55875b36fcabd3b68f507a419bf97935937257b..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/Images/cloud.png.meta	
+++ /dev/null
@@ -1,98 +0,0 @@
-fileFormatVersion: 2
-guid: 8338d2b625f22b44095330be071b8e56
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 11
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 1
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMasterTextureLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 0
-    wrapV: 0
-    wrapW: 0
-  nPOTScale: 1
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 0
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 0
-  spriteTessellationDetail: -1
-  textureType: 0
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Images/link.png b/Assets/ETSI.ARF/ARF World Storage API/Images/link.png
deleted file mode 100644
index dda8f37b2a455617c9f692431928b0502e31747c..0000000000000000000000000000000000000000
Binary files a/Assets/ETSI.ARF/ARF World Storage API/Images/link.png and /dev/null differ
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Images/link.png.meta b/Assets/ETSI.ARF/ARF World Storage API/Images/link.png.meta
deleted file mode 100644
index 70c4feda72dbe3c9d316954b91263554356c5505..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/Images/link.png.meta	
+++ /dev/null
@@ -1,98 +0,0 @@
-fileFormatVersion: 2
-guid: fef18a27fe1e4a040b8cfda6b3b5c178
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 11
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 1
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMasterTextureLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 0
-    wrapV: 0
-    wrapW: 0
-  nPOTScale: 1
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 0
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 0
-  spriteTessellationDetail: -1
-  textureType: 0
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Images/trackable.png b/Assets/ETSI.ARF/ARF World Storage API/Images/trackable.png
deleted file mode 100644
index f31019b2f9ea607e3bfa127348fa17d80296938d..0000000000000000000000000000000000000000
Binary files a/Assets/ETSI.ARF/ARF World Storage API/Images/trackable.png and /dev/null differ
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Images/trackable.png.meta b/Assets/ETSI.ARF/ARF World Storage API/Images/trackable.png.meta
deleted file mode 100644
index fb299339b1756f509d67421574faa81ac5b0fa47..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/Images/trackable.png.meta	
+++ /dev/null
@@ -1,98 +0,0 @@
-fileFormatVersion: 2
-guid: 90d4635c9d0895c42bec0551c4e790ea
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 11
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 1
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMasterTextureLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 0
-    wrapV: 0
-    wrapW: 0
-  nPOTScale: 1
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 0
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 0
-  spriteTessellationDetail: -1
-  textureType: 0
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Images/warning.png b/Assets/ETSI.ARF/ARF World Storage API/Images/warning.png
deleted file mode 100644
index a989284db594278ae478f2e8cb1b8cafa036a229..0000000000000000000000000000000000000000
Binary files a/Assets/ETSI.ARF/ARF World Storage API/Images/warning.png and /dev/null differ
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Images/warning.png.meta b/Assets/ETSI.ARF/ARF World Storage API/Images/warning.png.meta
deleted file mode 100644
index d01302454a5d82fa883c4da0d0112d955b8d3474..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/Images/warning.png.meta	
+++ /dev/null
@@ -1,98 +0,0 @@
-fileFormatVersion: 2
-guid: 2add88abf0fc00043bfb7863d59d3aa8
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 11
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 1
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMasterTextureLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 0
-    wrapV: 0
-    wrapW: 0
-  nPOTScale: 1
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 0
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 0
-  spriteTessellationDetail: -1
-  textureType: 0
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Materials/blue.mat b/Assets/ETSI.ARF/ARF World Storage API/Materials/blue.mat
deleted file mode 100644
index 55a4310238708195b07cc2119ff68f9cb7aee670..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/Materials/blue.mat	
+++ /dev/null
@@ -1,80 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!21 &2100000
-Material:
-  serializedVersion: 8
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: blue
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ValidKeywords: []
-  m_InvalidKeywords: []
-  m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
-  stringTagMap: {}
-  disabledShaderPasses: []
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs:
-    - _BumpMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailAlbedoMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailMask:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailNormalMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _EmissionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MainTex:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MetallicGlossMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _OcclusionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _ParallaxMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    m_Ints: []
-    m_Floats:
-    - _BumpScale: 1
-    - _Cutoff: 0.5
-    - _DetailNormalMapScale: 1
-    - _DstBlend: 0
-    - _GlossMapScale: 1
-    - _Glossiness: 0.5
-    - _GlossyReflections: 1
-    - _Metallic: 0
-    - _Mode: 0
-    - _OcclusionStrength: 1
-    - _Parallax: 0.02
-    - _SmoothnessTextureChannel: 0
-    - _SpecularHighlights: 1
-    - _SrcBlend: 1
-    - _UVSec: 0
-    - _ZWrite: 1
-    m_Colors:
-    - _Color: {r: 0, g: 0, b: 1, a: 1}
-    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-  m_BuildTextureStacks: []
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Materials/blue.mat.meta b/Assets/ETSI.ARF/ARF World Storage API/Materials/blue.mat.meta
deleted file mode 100644
index 550aadad7709784990b9bf5a24d84f7d05d32cdd..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/Materials/blue.mat.meta	
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 1b6b868784cd25c46a90fe7b882fddb2
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 2100000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Materials/green.mat b/Assets/ETSI.ARF/ARF World Storage API/Materials/green.mat
deleted file mode 100644
index 62e69539f44cfd71aca9b2eea32305c742eecf51..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/Materials/green.mat	
+++ /dev/null
@@ -1,80 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!21 &2100000
-Material:
-  serializedVersion: 8
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: green
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ValidKeywords: []
-  m_InvalidKeywords: []
-  m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
-  stringTagMap: {}
-  disabledShaderPasses: []
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs:
-    - _BumpMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailAlbedoMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailMask:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailNormalMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _EmissionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MainTex:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MetallicGlossMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _OcclusionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _ParallaxMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    m_Ints: []
-    m_Floats:
-    - _BumpScale: 1
-    - _Cutoff: 0.5
-    - _DetailNormalMapScale: 1
-    - _DstBlend: 0
-    - _GlossMapScale: 1
-    - _Glossiness: 0.5
-    - _GlossyReflections: 1
-    - _Metallic: 0
-    - _Mode: 0
-    - _OcclusionStrength: 1
-    - _Parallax: 0.02
-    - _SmoothnessTextureChannel: 0
-    - _SpecularHighlights: 1
-    - _SrcBlend: 1
-    - _UVSec: 0
-    - _ZWrite: 1
-    m_Colors:
-    - _Color: {r: 0, g: 1, b: 0, a: 1}
-    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-  m_BuildTextureStacks: []
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Materials/green.mat.meta b/Assets/ETSI.ARF/ARF World Storage API/Materials/green.mat.meta
deleted file mode 100644
index 67bcad20aa45b4d5e80b478d09595ee98a1aef74..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/Materials/green.mat.meta	
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 19de5bd9483daf448a5fab21d3eecba3
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 2100000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Materials/red.mat b/Assets/ETSI.ARF/ARF World Storage API/Materials/red.mat
deleted file mode 100644
index cdde4c4a57f5becd1430701cf361d08b56ede0df..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/Materials/red.mat	
+++ /dev/null
@@ -1,80 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!21 &2100000
-Material:
-  serializedVersion: 8
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: red
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ValidKeywords: []
-  m_InvalidKeywords: []
-  m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
-  stringTagMap: {}
-  disabledShaderPasses: []
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs:
-    - _BumpMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailAlbedoMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailMask:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailNormalMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _EmissionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MainTex:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MetallicGlossMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _OcclusionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _ParallaxMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    m_Ints: []
-    m_Floats:
-    - _BumpScale: 1
-    - _Cutoff: 0.5
-    - _DetailNormalMapScale: 1
-    - _DstBlend: 0
-    - _GlossMapScale: 1
-    - _Glossiness: 0.5
-    - _GlossyReflections: 1
-    - _Metallic: 0
-    - _Mode: 0
-    - _OcclusionStrength: 1
-    - _Parallax: 0.02
-    - _SmoothnessTextureChannel: 0
-    - _SpecularHighlights: 1
-    - _SrcBlend: 1
-    - _UVSec: 0
-    - _ZWrite: 1
-    m_Colors:
-    - _Color: {r: 1, g: 0, b: 0, a: 1}
-    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-  m_BuildTextureStacks: []
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Materials/red.mat.meta b/Assets/ETSI.ARF/ARF World Storage API/Materials/red.mat.meta
deleted file mode 100644
index 2f910fe7529404b66bd809608dab598658034394..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/Materials/red.mat.meta	
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 0c6a9f85031693343a9e37c4a08627e9
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 2100000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Prefabs.meta b/Assets/ETSI.ARF/ARF World Storage API/Prefabs.meta
deleted file mode 100644
index 3afe3fd00467d620a850aacf421f90f4f376e4e5..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/Prefabs.meta	
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 58d625e15ff264e479d393186a4a9827
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Prefabs/ARFTrackable.prefab b/Assets/ETSI.ARF/ARF World Storage API/Prefabs/ARFTrackable.prefab
deleted file mode 100644
index 678ddae96b013c7b7ce8241fc169cdc894b6bec9..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/Prefabs/ARFTrackable.prefab	
+++ /dev/null
@@ -1,835 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!1 &1239500166128132140
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1814829793678878270}
-  m_Layer: 0
-  m_Name: ARFTrackable
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &1814829793678878270
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1239500166128132140}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 4532241398218188797}
-  - {fileID: 33536572583887604}
-  m_Father: {fileID: 0}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &1389085265039543899
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 788171341007892784}
-  - component: {fileID: 8839914115087242523}
-  - component: {fileID: 4246121306890513542}
-  - component: {fileID: 1020142642249578057}
-  m_Layer: 0
-  m_Name: Y
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &788171341007892784
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1389085265039543899}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0.1, z: 0}
-  m_LocalScale: {x: 0.020000001, y: 0.05, z: 0.020000001}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 4532241398218188797}
-  m_RootOrder: 2
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!33 &8839914115087242523
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1389085265039543899}
-  m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0}
---- !u!23 &4246121306890513542
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1389085265039543899}
-  m_Enabled: 1
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 2
-  m_RayTraceProcedural: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: 19de5bd9483daf448a5fab21d3eecba3, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  m_AdditionalVertexStreams: {fileID: 0}
---- !u!136 &1020142642249578057
-CapsuleCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1389085265039543899}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  m_Radius: 0.5000001
-  m_Height: 2
-  m_Direction: 1
-  m_Center: {x: 0.000000059604645, y: 0, z: -0.00000008940697}
---- !u!1 &1687101261560852242
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 377487265314945344}
-  - component: {fileID: 6822513350628080072}
-  - component: {fileID: 6739960153126183626}
-  - component: {fileID: 8765868915607131294}
-  m_Layer: 0
-  m_Name: Z
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &377487265314945344
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1687101261560852242}
-  m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068}
-  m_LocalPosition: {x: 0, y: 0, z: 0.1}
-  m_LocalScale: {x: 0.020000001, y: 0.05000001, z: 0.019999998}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 4532241398218188797}
-  m_RootOrder: 3
-  m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
---- !u!33 &6822513350628080072
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1687101261560852242}
-  m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0}
---- !u!23 &6739960153126183626
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1687101261560852242}
-  m_Enabled: 1
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 2
-  m_RayTraceProcedural: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: 1b6b868784cd25c46a90fe7b882fddb2, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  m_AdditionalVertexStreams: {fileID: 0}
---- !u!136 &8765868915607131294
-CapsuleCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1687101261560852242}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  m_Radius: 0.5000001
-  m_Height: 2
-  m_Direction: 1
-  m_Center: {x: 0.000000059604645, y: 0, z: -0.00000008940697}
---- !u!1 &1823986580348874447
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1436432047471570793}
-  - component: {fileID: 5158975352210721371}
-  - component: {fileID: 4673833591676428792}
-  - component: {fileID: 961187375770271614}
-  m_Layer: 0
-  m_Name: X
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &1436432047471570793
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1823986580348874447}
-  m_LocalRotation: {x: -0, y: -0, z: 0.7071068, w: 0.7071068}
-  m_LocalPosition: {x: 0.1, y: 0, z: 0}
-  m_LocalScale: {x: 0.019999998, y: 0.05000001, z: 0.020000001}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 4532241398218188797}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90}
---- !u!33 &5158975352210721371
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1823986580348874447}
-  m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0}
---- !u!23 &4673833591676428792
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1823986580348874447}
-  m_Enabled: 1
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 2
-  m_RayTraceProcedural: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: 0c6a9f85031693343a9e37c4a08627e9, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  m_AdditionalVertexStreams: {fileID: 0}
---- !u!136 &961187375770271614
-CapsuleCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1823986580348874447}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  m_Radius: 0.5000001
-  m_Height: 2
-  m_Direction: 1
-  m_Center: {x: 0.000000059604645, y: 0, z: -0.00000008940697}
---- !u!1 &4451045791079530586
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 2888022835692577799}
-  - component: {fileID: 3434672324534858807}
-  - component: {fileID: 420668000673399792}
-  m_Layer: 5
-  m_Name: Text
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &2888022835692577799
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4451045791079530586}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0.001, y: 0.001, z: 0.001}
-  m_ConstrainProportionsScale: 1
-  m_Children: []
-  m_Father: {fileID: 33536572583887604}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: -0.025}
-  m_SizeDelta: {x: 250, y: 50}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &3434672324534858807
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4451045791079530586}
-  m_CullTransparentMesh: 1
---- !u!114 &420668000673399792
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4451045791079530586}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_text: 'Name:
-
-    UUID:'
-  m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
-  m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
-  m_fontSharedMaterials: []
-  m_fontMaterial: {fileID: 0}
-  m_fontMaterials: []
-  m_fontColor32:
-    serializedVersion: 2
-    rgba: 4294967295
-  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
-  m_enableVertexGradient: 0
-  m_colorMode: 3
-  m_fontColorGradient:
-    topLeft: {r: 1, g: 1, b: 1, a: 1}
-    topRight: {r: 1, g: 1, b: 1, a: 1}
-    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
-    bottomRight: {r: 1, g: 1, b: 1, a: 1}
-  m_fontColorGradientPreset: {fileID: 0}
-  m_spriteAsset: {fileID: 0}
-  m_tintAllSprites: 0
-  m_StyleSheet: {fileID: 0}
-  m_TextStyleHashCode: -1183493901
-  m_overrideHtmlColors: 0
-  m_faceColor:
-    serializedVersion: 2
-    rgba: 4294967295
-  m_fontSize: 16
-  m_fontSizeBase: 16
-  m_fontWeight: 400
-  m_enableAutoSizing: 0
-  m_fontSizeMin: 18
-  m_fontSizeMax: 72
-  m_fontStyle: 0
-  m_HorizontalAlignment: 1
-  m_VerticalAlignment: 256
-  m_textAlignment: 65535
-  m_characterSpacing: 0
-  m_wordSpacing: 0
-  m_lineSpacing: 0
-  m_lineSpacingMax: 0
-  m_paragraphSpacing: 0
-  m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
-  m_wordWrappingRatios: 0.4
-  m_overflowMode: 0
-  m_linkedTextComponent: {fileID: 0}
-  parentLinkedComponent: {fileID: 0}
-  m_enableKerning: 1
-  m_enableExtraPadding: 0
-  checkPaddingRequired: 0
-  m_isRichText: 1
-  m_parseCtrlCharacters: 1
-  m_isOrthographic: 1
-  m_isCullingEnabled: 0
-  m_horizontalMapping: 0
-  m_verticalMapping: 0
-  m_uvLineOffset: 0
-  m_geometrySortingOrder: 0
-  m_IsTextObjectScaleStatic: 0
-  m_VertexBufferAutoSizeReduction: 0
-  m_useMaxVisibleDescender: 1
-  m_pageToDisplay: 1
-  m_margin: {x: 0, y: 0, z: 0, w: 0}
-  m_isUsingLegacyAnimationComponent: 0
-  m_isVolumetricText: 0
-  m_hasFontAssetChanged: 0
-  m_baseMaterial: {fileID: 0}
-  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
---- !u!1 &5897666007833324009
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 8156859587808685068}
-  - component: {fileID: 1360188677730577841}
-  - component: {fileID: 3860478840123770047}
-  m_Layer: 5
-  m_Name: Headline
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &8156859587808685068
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5897666007833324009}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0.001, y: 0.001, z: 0.001}
-  m_ConstrainProportionsScale: 1
-  m_Children: []
-  m_Father: {fileID: 33536572583887604}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0.02}
-  m_SizeDelta: {x: 250, y: 25}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &1360188677730577841
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5897666007833324009}
-  m_CullTransparentMesh: 1
---- !u!114 &3860478840123770047
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5897666007833324009}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_text: AR Trackable
-  m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
-  m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
-  m_fontSharedMaterials: []
-  m_fontMaterial: {fileID: 0}
-  m_fontMaterials: []
-  m_fontColor32:
-    serializedVersion: 2
-    rgba: 4294967295
-  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
-  m_enableVertexGradient: 0
-  m_colorMode: 3
-  m_fontColorGradient:
-    topLeft: {r: 1, g: 1, b: 1, a: 1}
-    topRight: {r: 1, g: 1, b: 1, a: 1}
-    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
-    bottomRight: {r: 1, g: 1, b: 1, a: 1}
-  m_fontColorGradientPreset: {fileID: 0}
-  m_spriteAsset: {fileID: 0}
-  m_tintAllSprites: 0
-  m_StyleSheet: {fileID: 0}
-  m_TextStyleHashCode: -1183493901
-  m_overrideHtmlColors: 0
-  m_faceColor:
-    serializedVersion: 2
-    rgba: 4294967295
-  m_fontSize: 24
-  m_fontSizeBase: 24
-  m_fontWeight: 400
-  m_enableAutoSizing: 0
-  m_fontSizeMin: 18
-  m_fontSizeMax: 72
-  m_fontStyle: 1
-  m_HorizontalAlignment: 1
-  m_VerticalAlignment: 256
-  m_textAlignment: 65535
-  m_characterSpacing: 0
-  m_wordSpacing: 0
-  m_lineSpacing: 0
-  m_lineSpacingMax: 0
-  m_paragraphSpacing: 0
-  m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
-  m_wordWrappingRatios: 0.4
-  m_overflowMode: 0
-  m_linkedTextComponent: {fileID: 0}
-  parentLinkedComponent: {fileID: 0}
-  m_enableKerning: 1
-  m_enableExtraPadding: 0
-  checkPaddingRequired: 0
-  m_isRichText: 1
-  m_parseCtrlCharacters: 1
-  m_isOrthographic: 1
-  m_isCullingEnabled: 0
-  m_horizontalMapping: 0
-  m_verticalMapping: 0
-  m_uvLineOffset: 0
-  m_geometrySortingOrder: 0
-  m_IsTextObjectScaleStatic: 0
-  m_VertexBufferAutoSizeReduction: 0
-  m_useMaxVisibleDescender: 1
-  m_pageToDisplay: 1
-  m_margin: {x: 0, y: 0, z: 0, w: 0}
-  m_isUsingLegacyAnimationComponent: 0
-  m_isVolumetricText: 0
-  m_hasFontAssetChanged: 0
-  m_baseMaterial: {fileID: 0}
-  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
---- !u!1 &8182691244837652424
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 4532241398218188797}
-  m_Layer: 0
-  m_Name: Axe
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &4532241398218188797
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8182691244837652424}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 8225488253825437765}
-  - {fileID: 1436432047471570793}
-  - {fileID: 788171341007892784}
-  - {fileID: 377487265314945344}
-  m_Father: {fileID: 1814829793678878270}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &8225488253825437761
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 8225488253825437765}
-  - component: {fileID: 8225488253825437764}
-  - component: {fileID: 8225488253825437763}
-  - component: {fileID: 8225488253825437762}
-  m_Layer: 0
-  m_Name: Center
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &8225488253825437765
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8225488253825437761}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
-  m_ConstrainProportionsScale: 1
-  m_Children: []
-  m_Father: {fileID: 4532241398218188797}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!33 &8225488253825437764
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8225488253825437761}
-  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
---- !u!23 &8225488253825437763
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8225488253825437761}
-  m_Enabled: 1
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 2
-  m_RayTraceProcedural: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: 4f607925b7a7fcc44806b35f5aa087a4, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  m_AdditionalVertexStreams: {fileID: 0}
---- !u!65 &8225488253825437762
-BoxCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8225488253825437761}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 2
-  m_Size: {x: 1, y: 1, z: 1}
-  m_Center: {x: 0, y: 0, z: 0}
---- !u!1 &8292506020522815698
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 33536572583887604}
-  - component: {fileID: 1417027443369488948}
-  - component: {fileID: 1035955511594240086}
-  - component: {fileID: 5661858723465099382}
-  m_Layer: 5
-  m_Name: Canvas
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &33536572583887604
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8292506020522815698}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 8156859587808685068}
-  - {fileID: 2888022835692577799}
-  m_Father: {fileID: 1814829793678878270}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0.1263, y: -0.1}
-  m_SizeDelta: {x: 640, y: 480}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!223 &1417027443369488948
-Canvas:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8292506020522815698}
-  m_Enabled: 1
-  serializedVersion: 3
-  m_RenderMode: 2
-  m_Camera: {fileID: 0}
-  m_PlaneDistance: 100
-  m_PixelPerfect: 0
-  m_ReceivesEvents: 1
-  m_OverrideSorting: 0
-  m_OverridePixelPerfect: 0
-  m_SortingBucketNormalizedSize: 0
-  m_AdditionalShaderChannelsFlag: 25
-  m_SortingLayerID: 0
-  m_SortingOrder: 0
-  m_TargetDisplay: 0
---- !u!114 &1035955511594240086
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8292506020522815698}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_UiScaleMode: 0
-  m_ReferencePixelsPerUnit: 100
-  m_ScaleFactor: 1
-  m_ReferenceResolution: {x: 800, y: 600}
-  m_ScreenMatchMode: 0
-  m_MatchWidthOrHeight: 0
-  m_PhysicalUnit: 3
-  m_FallbackScreenDPI: 96
-  m_DefaultSpriteDPI: 96
-  m_DynamicPixelsPerUnit: 1
-  m_PresetInfoIsWorld: 1
---- !u!114 &5661858723465099382
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8292506020522815698}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_IgnoreReversedGraphics: 1
-  m_BlockingObjects: 0
-  m_BlockingMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Prefabs/ARFTrackable.prefab.meta b/Assets/ETSI.ARF/ARF World Storage API/Prefabs/ARFTrackable.prefab.meta
deleted file mode 100644
index 817771efe87d4afef926c78c799ea1ed2df89c57..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/Prefabs/ARFTrackable.prefab.meta	
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 889bc3e43608e504c977b93ba5f8ed37
-PrefabImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Prefabs/ARFWorldAnchor.prefab b/Assets/ETSI.ARF/ARF World Storage API/Prefabs/ARFWorldAnchor.prefab
deleted file mode 100644
index cea4dce362ad7454861c898d27598b7341617802..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/Prefabs/ARFWorldAnchor.prefab	
+++ /dev/null
@@ -1,835 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!1 &1058305942658709743
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 4263110725940009300}
-  - component: {fileID: 4129045750120536829}
-  - component: {fileID: 6557221987491350997}
-  m_Layer: 5
-  m_Name: Headline
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &4263110725940009300
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1058305942658709743}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0.001, y: 0.001, z: 0.001}
-  m_ConstrainProportionsScale: 1
-  m_Children: []
-  m_Father: {fileID: 1497700213276983046}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0.02}
-  m_SizeDelta: {x: 250, y: 25}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &4129045750120536829
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1058305942658709743}
-  m_CullTransparentMesh: 1
---- !u!114 &6557221987491350997
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1058305942658709743}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_text: AR World Anchor
-  m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
-  m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
-  m_fontSharedMaterials: []
-  m_fontMaterial: {fileID: 0}
-  m_fontMaterials: []
-  m_fontColor32:
-    serializedVersion: 2
-    rgba: 4294967295
-  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
-  m_enableVertexGradient: 0
-  m_colorMode: 3
-  m_fontColorGradient:
-    topLeft: {r: 1, g: 1, b: 1, a: 1}
-    topRight: {r: 1, g: 1, b: 1, a: 1}
-    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
-    bottomRight: {r: 1, g: 1, b: 1, a: 1}
-  m_fontColorGradientPreset: {fileID: 0}
-  m_spriteAsset: {fileID: 0}
-  m_tintAllSprites: 0
-  m_StyleSheet: {fileID: 0}
-  m_TextStyleHashCode: -1183493901
-  m_overrideHtmlColors: 0
-  m_faceColor:
-    serializedVersion: 2
-    rgba: 4294967295
-  m_fontSize: 24
-  m_fontSizeBase: 24
-  m_fontWeight: 400
-  m_enableAutoSizing: 0
-  m_fontSizeMin: 18
-  m_fontSizeMax: 72
-  m_fontStyle: 1
-  m_HorizontalAlignment: 1
-  m_VerticalAlignment: 256
-  m_textAlignment: 65535
-  m_characterSpacing: 0
-  m_wordSpacing: 0
-  m_lineSpacing: 0
-  m_lineSpacingMax: 0
-  m_paragraphSpacing: 0
-  m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
-  m_wordWrappingRatios: 0.4
-  m_overflowMode: 0
-  m_linkedTextComponent: {fileID: 0}
-  parentLinkedComponent: {fileID: 0}
-  m_enableKerning: 1
-  m_enableExtraPadding: 0
-  checkPaddingRequired: 0
-  m_isRichText: 1
-  m_parseCtrlCharacters: 1
-  m_isOrthographic: 1
-  m_isCullingEnabled: 0
-  m_horizontalMapping: 0
-  m_verticalMapping: 0
-  m_uvLineOffset: 0
-  m_geometrySortingOrder: 0
-  m_IsTextObjectScaleStatic: 0
-  m_VertexBufferAutoSizeReduction: 0
-  m_useMaxVisibleDescender: 1
-  m_pageToDisplay: 1
-  m_margin: {x: 0, y: 0, z: 0, w: 0}
-  m_isUsingLegacyAnimationComponent: 0
-  m_isVolumetricText: 0
-  m_hasFontAssetChanged: 0
-  m_baseMaterial: {fileID: 0}
-  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
---- !u!1 &1525499792725534490
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 6503384942250313519}
-  m_Layer: 0
-  m_Name: Axe
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &6503384942250313519
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1525499792725534490}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 1622323168209334423}
-  - {fileID: 8595771872739495867}
-  - {fileID: 7950346510699467234}
-  - {fileID: 7032495084649945490}
-  m_Father: {fileID: 9046317383172441836}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &1622323168209334419
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1622323168209334423}
-  - component: {fileID: 1622323168209334422}
-  - component: {fileID: 1622323168209334417}
-  - component: {fileID: 1622323168209334416}
-  m_Layer: 0
-  m_Name: Center
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &1622323168209334423
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1622323168209334419}
-  m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
-  m_ConstrainProportionsScale: 1
-  m_Children: []
-  m_Father: {fileID: 6503384942250313519}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
---- !u!33 &1622323168209334422
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1622323168209334419}
-  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
---- !u!23 &1622323168209334417
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1622323168209334419}
-  m_Enabled: 1
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 2
-  m_RayTraceProcedural: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: 730ea8fe50af5874fb3b990c534eaebc, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  m_AdditionalVertexStreams: {fileID: 0}
---- !u!65 &1622323168209334416
-BoxCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1622323168209334419}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 2
-  m_Size: {x: 1, y: 1, z: 1}
-  m_Center: {x: 0, y: 0, z: 0}
---- !u!1 &4529171925897838154
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 2044833251513730170}
-  - component: {fileID: 8475275463028488054}
-  - component: {fileID: 3041298355498540117}
-  m_Layer: 5
-  m_Name: Text
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &2044833251513730170
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4529171925897838154}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0.001, y: 0.001, z: 0.001}
-  m_ConstrainProportionsScale: 1
-  m_Children: []
-  m_Father: {fileID: 1497700213276983046}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: -0.025}
-  m_SizeDelta: {x: 250, y: 50}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &8475275463028488054
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4529171925897838154}
-  m_CullTransparentMesh: 1
---- !u!114 &3041298355498540117
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4529171925897838154}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_text: 'Name:
-
-    UUID:'
-  m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
-  m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
-  m_fontSharedMaterials: []
-  m_fontMaterial: {fileID: 0}
-  m_fontMaterials: []
-  m_fontColor32:
-    serializedVersion: 2
-    rgba: 4294967295
-  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
-  m_enableVertexGradient: 0
-  m_colorMode: 3
-  m_fontColorGradient:
-    topLeft: {r: 1, g: 1, b: 1, a: 1}
-    topRight: {r: 1, g: 1, b: 1, a: 1}
-    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
-    bottomRight: {r: 1, g: 1, b: 1, a: 1}
-  m_fontColorGradientPreset: {fileID: 0}
-  m_spriteAsset: {fileID: 0}
-  m_tintAllSprites: 0
-  m_StyleSheet: {fileID: 0}
-  m_TextStyleHashCode: -1183493901
-  m_overrideHtmlColors: 0
-  m_faceColor:
-    serializedVersion: 2
-    rgba: 4294967295
-  m_fontSize: 16
-  m_fontSizeBase: 16
-  m_fontWeight: 400
-  m_enableAutoSizing: 0
-  m_fontSizeMin: 18
-  m_fontSizeMax: 72
-  m_fontStyle: 0
-  m_HorizontalAlignment: 1
-  m_VerticalAlignment: 256
-  m_textAlignment: 65535
-  m_characterSpacing: 0
-  m_wordSpacing: 0
-  m_lineSpacing: 0
-  m_lineSpacingMax: 0
-  m_paragraphSpacing: 0
-  m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
-  m_wordWrappingRatios: 0.4
-  m_overflowMode: 0
-  m_linkedTextComponent: {fileID: 0}
-  parentLinkedComponent: {fileID: 0}
-  m_enableKerning: 1
-  m_enableExtraPadding: 0
-  checkPaddingRequired: 0
-  m_isRichText: 1
-  m_parseCtrlCharacters: 1
-  m_isOrthographic: 1
-  m_isCullingEnabled: 0
-  m_horizontalMapping: 0
-  m_verticalMapping: 0
-  m_uvLineOffset: 0
-  m_geometrySortingOrder: 0
-  m_IsTextObjectScaleStatic: 0
-  m_VertexBufferAutoSizeReduction: 0
-  m_useMaxVisibleDescender: 1
-  m_pageToDisplay: 1
-  m_margin: {x: 0, y: 0, z: 0, w: 0}
-  m_isUsingLegacyAnimationComponent: 0
-  m_isVolumetricText: 0
-  m_hasFontAssetChanged: 0
-  m_baseMaterial: {fileID: 0}
-  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
---- !u!1 &8344222362070912960
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 7032495084649945490}
-  - component: {fileID: 4182441150992537882}
-  - component: {fileID: 4119753123192799768}
-  - component: {fileID: 2090784007532835916}
-  m_Layer: 0
-  m_Name: Z
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &7032495084649945490
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8344222362070912960}
-  m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068}
-  m_LocalPosition: {x: 0, y: 0, z: 0.1}
-  m_LocalScale: {x: 0.020000001, y: 0.05000001, z: 0.019999998}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 6503384942250313519}
-  m_RootOrder: 3
-  m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
---- !u!33 &4182441150992537882
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8344222362070912960}
-  m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0}
---- !u!23 &4119753123192799768
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8344222362070912960}
-  m_Enabled: 1
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 2
-  m_RayTraceProcedural: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: 1b6b868784cd25c46a90fe7b882fddb2, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  m_AdditionalVertexStreams: {fileID: 0}
---- !u!136 &2090784007532835916
-CapsuleCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8344222362070912960}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  m_Radius: 0.5000001
-  m_Height: 2
-  m_Direction: 1
-  m_Center: {x: 0.000000059604645, y: 0, z: -0.00000008940697}
---- !u!1 &8473238451594182910
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 9046317383172441836}
-  m_Layer: 0
-  m_Name: ARFWorldAnchor
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &9046317383172441836
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8473238451594182910}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 6503384942250313519}
-  - {fileID: 1497700213276983046}
-  m_Father: {fileID: 0}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &8638588117357457033
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 7950346510699467234}
-  - component: {fileID: 2164195824166614473}
-  - component: {fileID: 6793727845488397396}
-  - component: {fileID: 7677843500006282907}
-  m_Layer: 0
-  m_Name: Y
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &7950346510699467234
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8638588117357457033}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0.1, z: 0}
-  m_LocalScale: {x: 0.020000001, y: 0.05, z: 0.020000001}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 6503384942250313519}
-  m_RootOrder: 2
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!33 &2164195824166614473
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8638588117357457033}
-  m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0}
---- !u!23 &6793727845488397396
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8638588117357457033}
-  m_Enabled: 1
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 2
-  m_RayTraceProcedural: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: 19de5bd9483daf448a5fab21d3eecba3, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  m_AdditionalVertexStreams: {fileID: 0}
---- !u!136 &7677843500006282907
-CapsuleCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8638588117357457033}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  m_Radius: 0.5000001
-  m_Height: 2
-  m_Direction: 1
-  m_Center: {x: 0.000000059604645, y: 0, z: -0.00000008940697}
---- !u!1 &8828373246506081872
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1497700213276983046}
-  - component: {fileID: 8595258003796922682}
-  - component: {fileID: 3895121440785909528}
-  - component: {fileID: 2278103916936109689}
-  m_Layer: 5
-  m_Name: Canvas
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &1497700213276983046
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8828373246506081872}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 4263110725940009300}
-  - {fileID: 2044833251513730170}
-  m_Father: {fileID: 9046317383172441836}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0.1263, y: -0.1}
-  m_SizeDelta: {x: 640, y: 480}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!223 &8595258003796922682
-Canvas:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8828373246506081872}
-  m_Enabled: 1
-  serializedVersion: 3
-  m_RenderMode: 2
-  m_Camera: {fileID: 0}
-  m_PlaneDistance: 100
-  m_PixelPerfect: 0
-  m_ReceivesEvents: 1
-  m_OverrideSorting: 0
-  m_OverridePixelPerfect: 0
-  m_SortingBucketNormalizedSize: 0
-  m_AdditionalShaderChannelsFlag: 25
-  m_SortingLayerID: 0
-  m_SortingOrder: 0
-  m_TargetDisplay: 0
---- !u!114 &3895121440785909528
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8828373246506081872}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_UiScaleMode: 0
-  m_ReferencePixelsPerUnit: 100
-  m_ScaleFactor: 1
-  m_ReferenceResolution: {x: 800, y: 600}
-  m_ScreenMatchMode: 0
-  m_MatchWidthOrHeight: 0
-  m_PhysicalUnit: 3
-  m_FallbackScreenDPI: 96
-  m_DefaultSpriteDPI: 96
-  m_DynamicPixelsPerUnit: 1
-  m_PresetInfoIsWorld: 1
---- !u!114 &2278103916936109689
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8828373246506081872}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_IgnoreReversedGraphics: 1
-  m_BlockingObjects: 0
-  m_BlockingMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
---- !u!1 &9076285480843021853
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 8595771872739495867}
-  - component: {fileID: 2539246307318246025}
-  - component: {fileID: 2628309207522230570}
-  - component: {fileID: 7634649738335838124}
-  m_Layer: 0
-  m_Name: X
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &8595771872739495867
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 9076285480843021853}
-  m_LocalRotation: {x: -0, y: -0, z: 0.7071068, w: 0.7071068}
-  m_LocalPosition: {x: 0.1, y: 0, z: 0}
-  m_LocalScale: {x: 0.019999998, y: 0.05000001, z: 0.020000001}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 6503384942250313519}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90}
---- !u!33 &2539246307318246025
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 9076285480843021853}
-  m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0}
---- !u!23 &2628309207522230570
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 9076285480843021853}
-  m_Enabled: 1
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 2
-  m_RayTraceProcedural: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: 0c6a9f85031693343a9e37c4a08627e9, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  m_AdditionalVertexStreams: {fileID: 0}
---- !u!136 &7634649738335838124
-CapsuleCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 9076285480843021853}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  m_Radius: 0.5000001
-  m_Height: 2
-  m_Direction: 1
-  m_Center: {x: 0.000000059604645, y: 0, z: -0.00000008940697}
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Prefabs/ARFWorldAnchor.prefab.meta b/Assets/ETSI.ARF/ARF World Storage API/Prefabs/ARFWorldAnchor.prefab.meta
deleted file mode 100644
index 898f39e353c4a7269fbdc67c8fc42c2c4997d253..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/Prefabs/ARFWorldAnchor.prefab.meta	
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 832a64407eb5c8249bb8e4a074649918
-PrefabImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Prefabs/ARFWorldLink.prefab b/Assets/ETSI.ARF/ARF World Storage API/Prefabs/ARFWorldLink.prefab
deleted file mode 100644
index 077a9e1a8f869fcdfd180ebcb87153a84a6a8dc2..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/Prefabs/ARFWorldLink.prefab	
+++ /dev/null
@@ -1,555 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!1 &1239500166128132140
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1814829793678878270}
-  - component: {fileID: 2766171691247251799}
-  m_Layer: 0
-  m_Name: ARFWorldLink
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &1814829793678878270
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1239500166128132140}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 4532241398218188797}
-  - {fileID: 33536572583887604}
-  m_Father: {fileID: 0}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &2766171691247251799
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1239500166128132140}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 33fce8a1d8d349d47b8565dfe031b6b1, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  fromElement: {fileID: 0}
-  toElement: {fileID: 0}
---- !u!1 &4451045791079530586
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 2888022835692577799}
-  - component: {fileID: 3434672324534858807}
-  - component: {fileID: 420668000673399792}
-  m_Layer: 5
-  m_Name: Text
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &2888022835692577799
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4451045791079530586}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0.001, y: 0.001, z: 0.001}
-  m_ConstrainProportionsScale: 1
-  m_Children: []
-  m_Father: {fileID: 33536572583887604}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: -0.025}
-  m_SizeDelta: {x: 250, y: 50}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &3434672324534858807
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4451045791079530586}
-  m_CullTransparentMesh: 1
---- !u!114 &420668000673399792
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4451045791079530586}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_text: 'UUID:
-
-    From:
-
-    To:'
-  m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
-  m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
-  m_fontSharedMaterials: []
-  m_fontMaterial: {fileID: 0}
-  m_fontMaterials: []
-  m_fontColor32:
-    serializedVersion: 2
-    rgba: 4294967295
-  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
-  m_enableVertexGradient: 0
-  m_colorMode: 3
-  m_fontColorGradient:
-    topLeft: {r: 1, g: 1, b: 1, a: 1}
-    topRight: {r: 1, g: 1, b: 1, a: 1}
-    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
-    bottomRight: {r: 1, g: 1, b: 1, a: 1}
-  m_fontColorGradientPreset: {fileID: 0}
-  m_spriteAsset: {fileID: 0}
-  m_tintAllSprites: 0
-  m_StyleSheet: {fileID: 0}
-  m_TextStyleHashCode: -1183493901
-  m_overrideHtmlColors: 0
-  m_faceColor:
-    serializedVersion: 2
-    rgba: 4294967295
-  m_fontSize: 16
-  m_fontSizeBase: 16
-  m_fontWeight: 400
-  m_enableAutoSizing: 0
-  m_fontSizeMin: 18
-  m_fontSizeMax: 72
-  m_fontStyle: 0
-  m_HorizontalAlignment: 1
-  m_VerticalAlignment: 256
-  m_textAlignment: 65535
-  m_characterSpacing: 0
-  m_wordSpacing: 0
-  m_lineSpacing: 0
-  m_lineSpacingMax: 0
-  m_paragraphSpacing: 0
-  m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
-  m_wordWrappingRatios: 0.4
-  m_overflowMode: 0
-  m_linkedTextComponent: {fileID: 0}
-  parentLinkedComponent: {fileID: 0}
-  m_enableKerning: 1
-  m_enableExtraPadding: 0
-  checkPaddingRequired: 0
-  m_isRichText: 1
-  m_parseCtrlCharacters: 1
-  m_isOrthographic: 1
-  m_isCullingEnabled: 0
-  m_horizontalMapping: 0
-  m_verticalMapping: 0
-  m_uvLineOffset: 0
-  m_geometrySortingOrder: 0
-  m_IsTextObjectScaleStatic: 0
-  m_VertexBufferAutoSizeReduction: 0
-  m_useMaxVisibleDescender: 1
-  m_pageToDisplay: 1
-  m_margin: {x: 0, y: 0, z: 0, w: 0}
-  m_isUsingLegacyAnimationComponent: 0
-  m_isVolumetricText: 0
-  m_hasFontAssetChanged: 0
-  m_baseMaterial: {fileID: 0}
-  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
---- !u!1 &5897666007833324009
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 8156859587808685068}
-  - component: {fileID: 1360188677730577841}
-  - component: {fileID: 3860478840123770047}
-  m_Layer: 5
-  m_Name: Headline
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &8156859587808685068
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5897666007833324009}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0.001, y: 0.001, z: 0.001}
-  m_ConstrainProportionsScale: 1
-  m_Children: []
-  m_Father: {fileID: 33536572583887604}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0.02}
-  m_SizeDelta: {x: 250, y: 25}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &1360188677730577841
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5897666007833324009}
-  m_CullTransparentMesh: 1
---- !u!114 &3860478840123770047
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5897666007833324009}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_text: AR World Link
-  m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
-  m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
-  m_fontSharedMaterials: []
-  m_fontMaterial: {fileID: 0}
-  m_fontMaterials: []
-  m_fontColor32:
-    serializedVersion: 2
-    rgba: 4294967295
-  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
-  m_enableVertexGradient: 0
-  m_colorMode: 3
-  m_fontColorGradient:
-    topLeft: {r: 1, g: 1, b: 1, a: 1}
-    topRight: {r: 1, g: 1, b: 1, a: 1}
-    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
-    bottomRight: {r: 1, g: 1, b: 1, a: 1}
-  m_fontColorGradientPreset: {fileID: 0}
-  m_spriteAsset: {fileID: 0}
-  m_tintAllSprites: 0
-  m_StyleSheet: {fileID: 0}
-  m_TextStyleHashCode: -1183493901
-  m_overrideHtmlColors: 0
-  m_faceColor:
-    serializedVersion: 2
-    rgba: 4294967295
-  m_fontSize: 24
-  m_fontSizeBase: 24
-  m_fontWeight: 400
-  m_enableAutoSizing: 0
-  m_fontSizeMin: 18
-  m_fontSizeMax: 72
-  m_fontStyle: 1
-  m_HorizontalAlignment: 1
-  m_VerticalAlignment: 256
-  m_textAlignment: 65535
-  m_characterSpacing: 0
-  m_wordSpacing: 0
-  m_lineSpacing: 0
-  m_lineSpacingMax: 0
-  m_paragraphSpacing: 0
-  m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
-  m_wordWrappingRatios: 0.4
-  m_overflowMode: 0
-  m_linkedTextComponent: {fileID: 0}
-  parentLinkedComponent: {fileID: 0}
-  m_enableKerning: 1
-  m_enableExtraPadding: 0
-  checkPaddingRequired: 0
-  m_isRichText: 1
-  m_parseCtrlCharacters: 1
-  m_isOrthographic: 1
-  m_isCullingEnabled: 0
-  m_horizontalMapping: 0
-  m_verticalMapping: 0
-  m_uvLineOffset: 0
-  m_geometrySortingOrder: 0
-  m_IsTextObjectScaleStatic: 0
-  m_VertexBufferAutoSizeReduction: 0
-  m_useMaxVisibleDescender: 1
-  m_pageToDisplay: 1
-  m_margin: {x: 0, y: 0, z: 0, w: 0}
-  m_isUsingLegacyAnimationComponent: 0
-  m_isVolumetricText: 0
-  m_hasFontAssetChanged: 0
-  m_baseMaterial: {fileID: 0}
-  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
---- !u!1 &8182691244837652424
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 4532241398218188797}
-  m_Layer: 0
-  m_Name: Axe
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &4532241398218188797
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8182691244837652424}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 8225488253825437765}
-  m_Father: {fileID: 1814829793678878270}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &8225488253825437761
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 8225488253825437765}
-  - component: {fileID: 8225488253825437764}
-  - component: {fileID: 8225488253825437763}
-  - component: {fileID: 8225488253825437762}
-  m_Layer: 0
-  m_Name: Center
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &8225488253825437765
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8225488253825437761}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
-  m_ConstrainProportionsScale: 1
-  m_Children: []
-  m_Father: {fileID: 4532241398218188797}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!33 &8225488253825437764
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8225488253825437761}
-  m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
---- !u!23 &8225488253825437763
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8225488253825437761}
-  m_Enabled: 1
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 2
-  m_RayTraceProcedural: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: ce02d83032448a945ac827316ba8bb87, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  m_AdditionalVertexStreams: {fileID: 0}
---- !u!65 &8225488253825437762
-BoxCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8225488253825437761}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 2
-  m_Size: {x: 1, y: 1, z: 1}
-  m_Center: {x: 0, y: 0, z: 0}
---- !u!1 &8292506020522815698
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 33536572583887604}
-  - component: {fileID: 1417027443369488948}
-  - component: {fileID: 1035955511594240086}
-  - component: {fileID: 5661858723465099382}
-  m_Layer: 5
-  m_Name: Canvas
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &33536572583887604
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8292506020522815698}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 8156859587808685068}
-  - {fileID: 2888022835692577799}
-  m_Father: {fileID: 1814829793678878270}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0.1263, y: -0.1}
-  m_SizeDelta: {x: 640, y: 480}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!223 &1417027443369488948
-Canvas:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8292506020522815698}
-  m_Enabled: 1
-  serializedVersion: 3
-  m_RenderMode: 2
-  m_Camera: {fileID: 0}
-  m_PlaneDistance: 100
-  m_PixelPerfect: 0
-  m_ReceivesEvents: 1
-  m_OverrideSorting: 0
-  m_OverridePixelPerfect: 0
-  m_SortingBucketNormalizedSize: 0
-  m_AdditionalShaderChannelsFlag: 25
-  m_SortingLayerID: 0
-  m_SortingOrder: 0
-  m_TargetDisplay: 0
---- !u!114 &1035955511594240086
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8292506020522815698}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_UiScaleMode: 0
-  m_ReferencePixelsPerUnit: 100
-  m_ScaleFactor: 1
-  m_ReferenceResolution: {x: 800, y: 600}
-  m_ScreenMatchMode: 0
-  m_MatchWidthOrHeight: 0
-  m_PhysicalUnit: 3
-  m_FallbackScreenDPI: 96
-  m_DefaultSpriteDPI: 96
-  m_DynamicPixelsPerUnit: 1
-  m_PresetInfoIsWorld: 1
---- !u!114 &5661858723465099382
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8292506020522815698}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_IgnoreReversedGraphics: 1
-  m_BlockingObjects: 0
-  m_BlockingMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Prefabs/ARFWorldLink.prefab.meta b/Assets/ETSI.ARF/ARF World Storage API/Prefabs/ARFWorldLink.prefab.meta
deleted file mode 100644
index 7c41f4e2831d8613ffa1308ed382a5742f1dc4a6..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/Prefabs/ARFWorldLink.prefab.meta	
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: fbd37f7ee889c994a913eeca05e0501f
-PrefabImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Resources.meta b/Assets/ETSI.ARF/ARF World Storage API/Resources.meta
deleted file mode 100644
index f531d88e65aa5e54b557807af106d7dcee571057..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/Resources.meta	
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: f07b85312ef176543b32402edd2bdb8a
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Resources/ARFPrefabs.asset b/Assets/ETSI.ARF/ARF World Storage API/Resources/ARFPrefabs.asset
deleted file mode 100644
index 9190b5a8381d85742ca69a44a7d107638837f8c9..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/Resources/ARFPrefabs.asset	
+++ /dev/null
@@ -1,17 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 1aec4cd1383f70e4092183ea55088e8e, type: 3}
-  m_Name: ARFPrefabs
-  m_EditorClassIdentifier: 
-  trackablePrefab: {fileID: 1239500166128132140, guid: 889bc3e43608e504c977b93ba5f8ed37, type: 3}
-  worldAnchorPrefab: {fileID: 8473238451594182910, guid: 832a64407eb5c8249bb8e4a074649918, type: 3}
-  worldLinkPrefab: {fileID: 1239500166128132140, guid: fbd37f7ee889c994a913eeca05e0501f, type: 3}
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Resources/ARFPrefabs.asset.meta b/Assets/ETSI.ARF/ARF World Storage API/Resources/ARFPrefabs.asset.meta
deleted file mode 100644
index a377b92ac1ae4d71f01bfa5f1ceb36f054ee85f2..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/Resources/ARFPrefabs.asset.meta	
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: cc22d9e73b4dcca4da1f7bdd0321a3d2
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Scenes.meta b/Assets/ETSI.ARF/ARF World Storage API/Scenes.meta
deleted file mode 100644
index 4ef537ecd24a770de9c33e0a3d5cfbb958e7eaea..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/Scenes.meta	
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: bee2e150130771041a1a97b017e971db
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Scripts.meta b/Assets/ETSI.ARF/ARF World Storage API/Scripts.meta
deleted file mode 100644
index f83558eeb0821a2d003f25f60b169f900fff6d17..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/Scripts.meta	
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: be2764d34364d6e4e8b4811c9fe72a5b
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Scripts/AttachToWorldAnchor.cs b/Assets/ETSI.ARF/ARF World Storage API/Scripts/AttachToWorldAnchor.cs
deleted file mode 100644
index 852b8a70bad36898f89de6bbf8d8c2b13e282197..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/Scripts/AttachToWorldAnchor.cs	
+++ /dev/null
@@ -1,29 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-namespace ETSI.ARF.WorldStorage.UI
-{
-    [ExecuteAlways]
-    public class AttachToWorldAnchor : MonoBehaviour
-    {
-        public GameObject worldAnchor;
-        public bool autoUpdate = true;
-
-        private void Update()
-        {
-            if (autoUpdate && worldAnchor != null)
-            {
-                transform.position = worldAnchor.transform.position;
-                transform.rotation = worldAnchor.transform.rotation;
-            }
-        }
-
-        void OnDrawGizmos()
-        {
-#if UNITY_EDITOR
-            // do something...
-#endif
-        }
-    }
-}
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Scripts/AttachToWorldAnchor.cs.meta b/Assets/ETSI.ARF/ARF World Storage API/Scripts/AttachToWorldAnchor.cs.meta
deleted file mode 100644
index b5689716424bf2feeab8ca414beedd05241f4b7c..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/Scripts/AttachToWorldAnchor.cs.meta	
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 53275cee00d69114f926dc2b69bb4e53
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Scripts/Data.cs b/Assets/ETSI.ARF/ARF World Storage API/Scripts/Data.cs
deleted file mode 100644
index 57da6033dbdfadb3fb32292f5bfa190ac5c25c72..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/Scripts/Data.cs	
+++ /dev/null
@@ -1,16 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using ETSI.ARF.OpenAPI.WorldStorage;
-
-namespace ETSI.ARF.OpenAPI
-{
-    public struct Data<T>
-    {
-        public Dictionary<Guid, T> list;
-
-        public int Count => list.Count;
-        public int PreCount { get; set; }
-    };
-
-}
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Scripts/Data.cs.meta b/Assets/ETSI.ARF/ARF World Storage API/Scripts/Data.cs.meta
deleted file mode 100644
index f62618b865aee4674e9641852369ff1ab976d4d4..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/Scripts/Data.cs.meta	
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: eb8e8851570d3a14883c7798cbe1e1da
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Scripts/LinkVisual.cs b/Assets/ETSI.ARF/ARF World Storage API/Scripts/LinkVisual.cs
deleted file mode 100644
index 2acf9d72cebd314fa57aa35d79bc8eba105ca5d6..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/Scripts/LinkVisual.cs	
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-namespace ETSI.ARF.WorldStorage.UI
-{
-    [ExecuteAlways]
-    public class LinkVisual : MonoBehaviour
-    {
-        public GameObject fromElement, toElement;
-
-
-        private void Update()
-        {
-#if UNITY_EDITOR
-            if (fromElement != null && toElement != null) transform.position = (fromElement.transform.position + toElement.transform.position) / 2;
-#endif
-        }
-
-        void OnDrawGizmos()
-        {
-#if UNITY_EDITOR
-            if (fromElement != null && toElement != null)
-            {
-                // Draws a blue line from this transform to the target
-                Gizmos.color = Color.blue;
-                Gizmos.DrawLine(fromElement.transform.position, toElement.transform.position);
-            }
-            else
-            {
-                Debug.Log("Rien à tracer");
-            }
-        }
-#endif
-    }
-}
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Scripts/LinkVisual.cs.meta b/Assets/ETSI.ARF/ARF World Storage API/Scripts/LinkVisual.cs.meta
deleted file mode 100644
index 07696e60173b3a64dcd58a8938004f264be883b8..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/Scripts/LinkVisual.cs.meta	
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 33fce8a1d8d349d47b8565dfe031b6b1
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Scripts/WorldStorageCollections.cs b/Assets/ETSI.ARF/ARF World Storage API/Scripts/WorldStorageCollections.cs
deleted file mode 100644
index e144bd4fb10d8ad097ab363109dfbbc364ca7a8c..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/Scripts/WorldStorageCollections.cs	
+++ /dev/null
@@ -1,26 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using ETSI.ARF.OpenAPI.WorldStorage;
-using UnityEngine;
-using System.IO;
-using ETSI.ARF.OpenAPI;
-
-namespace ETSI.ARF.WorldStorage
-{
-    public class WorldStorageCollections
-    {
-        // MongoDB collections
-        // Contains list after response from REST server
-        public Data<Trackable> trackables = new Data<Trackable>();
-        public Data<WorldAnchor> worldAnchors = new Data<WorldAnchor>();
-        public Data<WorldLink> worldLinks = new Data<WorldLink>();
-
-        public WorldStorageCollections()
-        {
-            trackables.list = new Dictionary<Guid, Trackable>();
-            worldAnchors.list = new Dictionary<Guid, WorldAnchor>();
-            worldLinks.list = new Dictionary<Guid, WorldLink>();
-        }
-    }
-}
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Scripts/WorldStorageCollections.cs.meta b/Assets/ETSI.ARF/ARF World Storage API/Scripts/WorldStorageCollections.cs.meta
deleted file mode 100644
index c15e91143d1b7ec33f314deec6ac390a28469738..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/Scripts/WorldStorageCollections.cs.meta	
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: a5b322b539094934193f20b797fab02a
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Scripts/WorldStorageRequest.cs b/Assets/ETSI.ARF/ARF World Storage API/Scripts/WorldStorageRequest.cs
deleted file mode 100644
index cdda36ce34012a18789cadf9d15f5a6e4b4f6a4d..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/Scripts/WorldStorageRequest.cs	
+++ /dev/null
@@ -1,153 +0,0 @@
-// The Fraunhofer HHI Unity Framework
-//  ___________                          .__            _____                ___ ___    ___ ___ .___ 
-//  \_   _____/___________   __ __  ____ |  |__   _____/ ____\___________   /   |   \  /   |   \|   |
-//   |    __) \_  __ \__  \ |  |  \/    \|  |  \ /  _ \   __\/ __ \_  __ \ /    ~    \/    ~    \   |
-//   |     \   |  | \// __ \|  |  /   |  \   Y  (  <_> )  | \  ___/|  | \/ \    Y    /\    Y    /   |
-//   \___  /   |__|  (____  /____/|___|  /___|  /\____/|__|  \___  >__|     \___|_  /  \___|_  /|___|
-//       \/               \/           \/     \/                 \/               \/         \/      
-// (C) Fraunhofer HHI, 2024
-
-using System;
-using System.IO;
-using System.Net;
-using System.Collections.Generic;
-using System.Threading;
-using System.Drawing;
-using System.Threading.Tasks;
-using UnityEngine;
-
-using ETSI.ARF.OpenAPI;
-using ETSI.ARF.OpenAPI.WorldStorage;
-using ETSI.ARF.WorldStorage.REST;
-
-namespace ETSI.ARF.WorldStorage
-{
-    /// <summary>
-    /// Manager class for OpenAPI REST calls.
-    /// This class insert create a response object with cancellation token for all call.
-    /// Also usefull for measuring the request-response time.
-    /// </summary>
-    public class WorldStorageRequest : WorldStorageCollections
-    {
-        private WorldStorageServer wsServer;
-        private WorldStorageClient apiClient;
-        private string serverUri;
-
-        public string URI => serverUri;
-        public WorldStorageClient Client => apiClient;
-
-        public WorldStorageRequest(WorldStorageServer server) : base()
-        {
-            wsServer = server;
-            serverUri = wsServer.URI;
-            var httpClient = new UnityWebRequestHttpClient(serverUri);
-            apiClient = new WorldStorageClient(httpClient);
-        }
-        
-        public WorldStorageRequest(string uri) : base()
-        {
-            wsServer = new WorldStorageServer();
-            wsServer.basePath = uri;
-            wsServer.port = 0;
-            serverUri = uri;
-            var httpClient = new UnityWebRequestHttpClient(serverUri);
-            apiClient = new WorldStorageClient(httpClient);
-        }
-
-        //
-        // Callback method
-        // Call the callback method defined by the calling class when the result is there.
-        //
-        #region Callbacks
-        private void ReceiveTextCallback(Task<string> t, object id)
-        {
-            if (t.IsCompleted)
-            {
-                string res = t.Result;
-
-                ResponseObject<string> o = (ResponseObject<string>)id;
-                o.responseTime = DateTime.Now;
-                o.result = res;
-                Debug.Log($"[REST] Server Response = {o.result} (#{o.transactionId}, {o.message})");
-
-                o.callback?.Invoke(o);
-            }
-            else Debug.Log("[REST] OpenAPI Timeout!");
-        }
-
-        private void ReceiveTrackableCallback(Task<Trackable> t, object id)
-        {
-            if (t.IsCompleted)
-            {
-                ResponseObject<Trackable> o = (ResponseObject<Trackable>)id;
-                o.responseTime = DateTime.Now;
-                o.result = t.Result;
-                Debug.Log($"[REST] Server Response = Got asset (#{o.transactionId}, {o.message})");
-
-                o.callback?.Invoke(o);
-            }
-            else Debug.Log("[REST] OpenAPI Timeout!");
-        }
-        #endregion
-
-        //
-        // Admin requests
-        //
-        #region Handle admin requests
-        public string Ping() => apiClient.GetPing();
-
-        public ResponseObject<string> PingAsync(Action<ResponseObject<string>> func)
-        {
-            return AdminRequest.PingAsync(wsServer, func);
-        }
-
-        public string Status() => apiClient.GetAdmin();
-
-        public ResponseObject<string> StatusAsync(Action<ResponseObject<string>> func)
-        {
-            return AdminRequest.AdminAsync(wsServer, func);
-        }
-
-        public string Version() => apiClient.GetVersion();
-        public Task<string> GetVersion() => apiClient.GetVersionAsync();
-
-        public ResponseObject<string> VersionAsync(Action<ResponseObject<string>> func)
-        {
-            return AdminRequest.VersionAsync(wsServer, func);
-        }
-        #endregion
-
-        //
-        // TRACKABLES
-        //
-        #region Trackables
-
-        //public Task<int> GetNumOfAssets() => apiClient.NumOfAssetsAsync();
-        //public bool IsAssetExists(Guid id) => apiClient.IsAssetId(id);
-        public ResponseObject<string> AddTrackableAsync(Action<ResponseObject<string>> func, Trackable trackable)
-        {
-            return TrackableRequest.CreateTrackableAsync(wsServer, trackable, func);
-        }
-
-        public ResponseObject<string> DeleteTrackableAsync(Action<ResponseObject<string>> func, Guid id)
-        {
-            return TrackableRequest.DeleteTrackableAsync(wsServer, id, func);
-        }
-
-        public ResponseObject<string> ModifyTrackableAsync(Action<ResponseObject<string>> func, Trackable trackable)
-        {
-            return TrackableRequest.UpdateTrackableAsync(wsServer, trackable, func);
-        }
-
-        public ResponseObject<Trackable> GetTrackableByIdAsync(Action<ResponseObject<Trackable>> func, Guid id)
-        {
-            return TrackableRequest.GetTrackableAsync(wsServer, id, func);
-        }
-
-        public ResponseObject<List<Trackable>> GetTrackableListAsync(Action<ResponseObject<List<Trackable>>> func, int? max = 1)
-        {
-            return TrackableRequest.GetTrackablesAsync(wsServer, func);
-        }
-        #endregion
-    }
-}
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Scripts/WorldStorageRequest.cs.meta b/Assets/ETSI.ARF/ARF World Storage API/Scripts/WorldStorageRequest.cs.meta
deleted file mode 100644
index 78ca79bd06d57eb53cbbc82f3320fd48674dee8f..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/Scripts/WorldStorageRequest.cs.meta	
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 7dc0c152448d1cc41ade67c36e145ff2
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/ETSI.ARF/ARF World Storage API/csc.rsp b/Assets/ETSI.ARF/ARF World Storage API/csc.rsp
deleted file mode 100644
index 42cb45b466677f7eff4e30a6ea8cce7f460421b9..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/csc.rsp	
+++ /dev/null
@@ -1 +0,0 @@
--r:System.ComponentModel.DataAnnotations.dll
\ No newline at end of file
diff --git a/Assets/ETSI.ARF/ARF World Storage API/csc.rsp.meta b/Assets/ETSI.ARF/ARF World Storage API/csc.rsp.meta
deleted file mode 100644
index c1c3d665fa2d77a8235eafeef0699d394e3a9a8f..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/ARF World Storage API/csc.rsp.meta	
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 227b79b2283f2354f811787d81f2e1c3
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/ETSI.ARF/Materials.meta b/Assets/ETSI.ARF/Materials.meta
deleted file mode 100644
index c610e73c04f98a5d43fb41e5c49f2be11fcfdb81..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/Materials.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 5687f50b6a7fe4e4ab0ab249f6e9aee0
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/ETSI.ARF/Scenes.meta b/Assets/ETSI.ARF/Scenes.meta
deleted file mode 100644
index 1abaa61a5c1931cf4560b2ac8e92f6a2ea3354ff..0000000000000000000000000000000000000000
--- a/Assets/ETSI.ARF/Scenes.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: eabab3d802b335146a16615051dbd543
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/ETSI.ARF/GUI.meta b/Assets/GUI.meta
similarity index 100%
rename from Assets/ETSI.ARF/GUI.meta
rename to Assets/GUI.meta
diff --git a/Assets/ETSI.ARF/GUI/Buttons.meta b/Assets/GUI/Buttons.meta
similarity index 100%
rename from Assets/ETSI.ARF/GUI/Buttons.meta
rename to Assets/GUI/Buttons.meta
diff --git a/Assets/ETSI.ARF/GUI/Buttons/HalfRounded20px@2x_Down.png b/Assets/GUI/Buttons/HalfRounded20px@2x_Down.png
similarity index 100%
rename from Assets/ETSI.ARF/GUI/Buttons/HalfRounded20px@2x_Down.png
rename to Assets/GUI/Buttons/HalfRounded20px@2x_Down.png
diff --git a/Assets/ETSI.ARF/GUI/Buttons/HalfRounded20px@2x_Down.png.meta b/Assets/GUI/Buttons/HalfRounded20px@2x_Down.png.meta
similarity index 100%
rename from Assets/ETSI.ARF/GUI/Buttons/HalfRounded20px@2x_Down.png.meta
rename to Assets/GUI/Buttons/HalfRounded20px@2x_Down.png.meta
diff --git a/Assets/ETSI.ARF/GUI/Buttons/HalfRounded20px@2x_Up.png b/Assets/GUI/Buttons/HalfRounded20px@2x_Up.png
similarity index 100%
rename from Assets/ETSI.ARF/GUI/Buttons/HalfRounded20px@2x_Up.png
rename to Assets/GUI/Buttons/HalfRounded20px@2x_Up.png
diff --git a/Assets/ETSI.ARF/GUI/Buttons/HalfRounded20px@2x_Up.png.meta b/Assets/GUI/Buttons/HalfRounded20px@2x_Up.png.meta
similarity index 100%
rename from Assets/ETSI.ARF/GUI/Buttons/HalfRounded20px@2x_Up.png.meta
rename to Assets/GUI/Buttons/HalfRounded20px@2x_Up.png.meta
diff --git a/Assets/ETSI.ARF/GUI/Buttons/Rounded20px@2x.png b/Assets/GUI/Buttons/Rounded20px@2x.png
similarity index 100%
rename from Assets/ETSI.ARF/GUI/Buttons/Rounded20px@2x.png
rename to Assets/GUI/Buttons/Rounded20px@2x.png
diff --git a/Assets/ETSI.ARF/GUI/Buttons/Rounded20px@2x.png.meta b/Assets/GUI/Buttons/Rounded20px@2x.png.meta
similarity index 100%
rename from Assets/ETSI.ARF/GUI/Buttons/Rounded20px@2x.png.meta
rename to Assets/GUI/Buttons/Rounded20px@2x.png.meta
diff --git a/Assets/ETSI.ARF/GUI/Checkbox.meta b/Assets/GUI/Checkbox.meta
similarity index 100%
rename from Assets/ETSI.ARF/GUI/Checkbox.meta
rename to Assets/GUI/Checkbox.meta
diff --git a/Assets/ETSI.ARF/GUI/Checkbox/BackgroundSimpleRound.png b/Assets/GUI/Checkbox/BackgroundSimpleRound.png
similarity index 100%
rename from Assets/ETSI.ARF/GUI/Checkbox/BackgroundSimpleRound.png
rename to Assets/GUI/Checkbox/BackgroundSimpleRound.png
diff --git a/Assets/ETSI.ARF/GUI/Checkbox/BackgroundSimpleRound.png.meta b/Assets/GUI/Checkbox/BackgroundSimpleRound.png.meta
similarity index 100%
rename from Assets/ETSI.ARF/GUI/Checkbox/BackgroundSimpleRound.png.meta
rename to Assets/GUI/Checkbox/BackgroundSimpleRound.png.meta
diff --git a/Assets/ETSI.ARF/GUI/Checkbox/ButtonWithBorder.png b/Assets/GUI/Checkbox/ButtonWithBorder.png
similarity index 100%
rename from Assets/ETSI.ARF/GUI/Checkbox/ButtonWithBorder.png
rename to Assets/GUI/Checkbox/ButtonWithBorder.png
diff --git a/Assets/ETSI.ARF/GUI/Checkbox/ButtonWithBorder.png.meta b/Assets/GUI/Checkbox/ButtonWithBorder.png.meta
similarity index 100%
rename from Assets/ETSI.ARF/GUI/Checkbox/ButtonWithBorder.png.meta
rename to Assets/GUI/Checkbox/ButtonWithBorder.png.meta
diff --git a/Assets/ETSI.ARF/GUI/Checkbox/Checkbox.prefab b/Assets/GUI/Checkbox/Checkbox.prefab
similarity index 100%
rename from Assets/ETSI.ARF/GUI/Checkbox/Checkbox.prefab
rename to Assets/GUI/Checkbox/Checkbox.prefab
diff --git a/Assets/ETSI.ARF/GUI/Checkbox/Checkbox.prefab.meta b/Assets/GUI/Checkbox/Checkbox.prefab.meta
similarity index 100%
rename from Assets/ETSI.ARF/GUI/Checkbox/Checkbox.prefab.meta
rename to Assets/GUI/Checkbox/Checkbox.prefab.meta
diff --git a/Assets/ETSI.ARF/GUI/Checkbox/CheckboxNew.prefab b/Assets/GUI/Checkbox/CheckboxNew.prefab
similarity index 100%
rename from Assets/ETSI.ARF/GUI/Checkbox/CheckboxNew.prefab
rename to Assets/GUI/Checkbox/CheckboxNew.prefab
diff --git a/Assets/ETSI.ARF/GUI/Checkbox/CheckboxNew.prefab.meta b/Assets/GUI/Checkbox/CheckboxNew.prefab.meta
similarity index 100%
rename from Assets/ETSI.ARF/GUI/Checkbox/CheckboxNew.prefab.meta
rename to Assets/GUI/Checkbox/CheckboxNew.prefab.meta
diff --git a/Assets/ETSI.ARF/GUI/Icons.meta b/Assets/GUI/Icons.meta
similarity index 100%
rename from Assets/ETSI.ARF/GUI/Icons.meta
rename to Assets/GUI/Icons.meta
diff --git a/Assets/ETSI.ARF/GUI/Icons/AppDummy.png b/Assets/GUI/Icons/AppDummy.png
similarity index 100%
rename from Assets/ETSI.ARF/GUI/Icons/AppDummy.png
rename to Assets/GUI/Icons/AppDummy.png
diff --git a/Assets/ETSI.ARF/GUI/Icons/AppDummy.png.meta b/Assets/GUI/Icons/AppDummy.png.meta
similarity index 100%
rename from Assets/ETSI.ARF/GUI/Icons/AppDummy.png.meta
rename to Assets/GUI/Icons/AppDummy.png.meta
diff --git a/Assets/ETSI.ARF/GUI/Icons/Clouds.png b/Assets/GUI/Icons/Clouds.png
similarity index 100%
rename from Assets/ETSI.ARF/GUI/Icons/Clouds.png
rename to Assets/GUI/Icons/Clouds.png
diff --git a/Assets/ETSI.ARF/GUI/Icons/Clouds.png.meta b/Assets/GUI/Icons/Clouds.png.meta
similarity index 100%
rename from Assets/ETSI.ARF/GUI/Icons/Clouds.png.meta
rename to Assets/GUI/Icons/Clouds.png.meta
diff --git a/Assets/ETSI.ARF/GUI/Icons/Cube.prefab b/Assets/GUI/Icons/Cube.prefab
similarity index 100%
rename from Assets/ETSI.ARF/GUI/Icons/Cube.prefab
rename to Assets/GUI/Icons/Cube.prefab
diff --git a/Assets/ETSI.ARF/GUI/Icons/Cube.prefab.meta b/Assets/GUI/Icons/Cube.prefab.meta
similarity index 100%
rename from Assets/ETSI.ARF/GUI/Icons/Cube.prefab.meta
rename to Assets/GUI/Icons/Cube.prefab.meta
diff --git a/Assets/ETSI.ARF/GUI/Icons/CustomMenu.png b/Assets/GUI/Icons/CustomMenu.png
similarity index 100%
rename from Assets/ETSI.ARF/GUI/Icons/CustomMenu.png
rename to Assets/GUI/Icons/CustomMenu.png
diff --git a/Assets/ETSI.ARF/GUI/Icons/CustomMenu.png.meta b/Assets/GUI/Icons/CustomMenu.png.meta
similarity index 100%
rename from Assets/ETSI.ARF/GUI/Icons/CustomMenu.png.meta
rename to Assets/GUI/Icons/CustomMenu.png.meta
diff --git a/Assets/ETSI.ARF/GUI/Icons/DB.png b/Assets/GUI/Icons/DB.png
similarity index 100%
rename from Assets/ETSI.ARF/GUI/Icons/DB.png
rename to Assets/GUI/Icons/DB.png
diff --git a/Assets/ETSI.ARF/GUI/Icons/DB.png.meta b/Assets/GUI/Icons/DB.png.meta
similarity index 100%
rename from Assets/ETSI.ARF/GUI/Icons/DB.png.meta
rename to Assets/GUI/Icons/DB.png.meta
diff --git a/Assets/ETSI.ARF/GUI/Icons/Edit.png b/Assets/GUI/Icons/Edit.png
similarity index 100%
rename from Assets/ETSI.ARF/GUI/Icons/Edit.png
rename to Assets/GUI/Icons/Edit.png
diff --git a/Assets/ETSI.ARF/GUI/Icons/Edit.png.meta b/Assets/GUI/Icons/Edit.png.meta
similarity index 100%
rename from Assets/ETSI.ARF/GUI/Icons/Edit.png.meta
rename to Assets/GUI/Icons/Edit.png.meta
diff --git a/Assets/ETSI.ARF/GUI/Icons/Exclamation-mark.png b/Assets/GUI/Icons/Exclamation-mark.png
similarity index 100%
rename from Assets/ETSI.ARF/GUI/Icons/Exclamation-mark.png
rename to Assets/GUI/Icons/Exclamation-mark.png
diff --git a/Assets/ETSI.ARF/GUI/Icons/Exclamation-mark.png.meta b/Assets/GUI/Icons/Exclamation-mark.png.meta
similarity index 100%
rename from Assets/ETSI.ARF/GUI/Icons/Exclamation-mark.png.meta
rename to Assets/GUI/Icons/Exclamation-mark.png.meta
diff --git a/Assets/ETSI.ARF/GUI/Icons/Exit.png b/Assets/GUI/Icons/Exit.png
similarity index 100%
rename from Assets/ETSI.ARF/GUI/Icons/Exit.png
rename to Assets/GUI/Icons/Exit.png
diff --git a/Assets/ETSI.ARF/GUI/Icons/Exit.png.meta b/Assets/GUI/Icons/Exit.png.meta
similarity index 100%
rename from Assets/ETSI.ARF/GUI/Icons/Exit.png.meta
rename to Assets/GUI/Icons/Exit.png.meta
diff --git a/Assets/ETSI.ARF/GUI/Icons/Gear 1.png b/Assets/GUI/Icons/Gear 1.png
similarity index 100%
rename from Assets/ETSI.ARF/GUI/Icons/Gear 1.png
rename to Assets/GUI/Icons/Gear 1.png
diff --git a/Assets/ETSI.ARF/GUI/Icons/Gear 1.png.meta b/Assets/GUI/Icons/Gear 1.png.meta
similarity index 100%
rename from Assets/ETSI.ARF/GUI/Icons/Gear 1.png.meta
rename to Assets/GUI/Icons/Gear 1.png.meta
diff --git a/Assets/ETSI.ARF/GUI/Icons/Pin.png b/Assets/GUI/Icons/Pin.png
similarity index 100%
rename from Assets/ETSI.ARF/GUI/Icons/Pin.png
rename to Assets/GUI/Icons/Pin.png
diff --git a/Assets/ETSI.ARF/GUI/Icons/Pin.png.meta b/Assets/GUI/Icons/Pin.png.meta
similarity index 100%
rename from Assets/ETSI.ARF/GUI/Icons/Pin.png.meta
rename to Assets/GUI/Icons/Pin.png.meta
diff --git a/Assets/ETSI.ARF/GUI/Icons/Save.png b/Assets/GUI/Icons/Save.png
similarity index 100%
rename from Assets/ETSI.ARF/GUI/Icons/Save.png
rename to Assets/GUI/Icons/Save.png
diff --git a/Assets/ETSI.ARF/GUI/Icons/Save.png.meta b/Assets/GUI/Icons/Save.png.meta
similarity index 100%
rename from Assets/ETSI.ARF/GUI/Icons/Save.png.meta
rename to Assets/GUI/Icons/Save.png.meta
diff --git a/Assets/ETSI.ARF/GUI/Icons/circular01.png b/Assets/GUI/Icons/circular01.png
similarity index 100%
rename from Assets/ETSI.ARF/GUI/Icons/circular01.png
rename to Assets/GUI/Icons/circular01.png
diff --git a/Assets/ETSI.ARF/GUI/Icons/circular01.png.meta b/Assets/GUI/Icons/circular01.png.meta
similarity index 100%
rename from Assets/ETSI.ARF/GUI/Icons/circular01.png.meta
rename to Assets/GUI/Icons/circular01.png.meta
diff --git a/Assets/ETSI.ARF/GUI/Icons/icon-locked.png b/Assets/GUI/Icons/icon-locked.png
similarity index 100%
rename from Assets/ETSI.ARF/GUI/Icons/icon-locked.png
rename to Assets/GUI/Icons/icon-locked.png
diff --git a/Assets/ETSI.ARF/GUI/Icons/icon-locked.png.meta b/Assets/GUI/Icons/icon-locked.png.meta
similarity index 100%
rename from Assets/ETSI.ARF/GUI/Icons/icon-locked.png.meta
rename to Assets/GUI/Icons/icon-locked.png.meta
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Materials.meta b/Assets/Materials.meta
similarity index 100%
rename from Assets/ETSI.ARF/ARF World Storage API/Materials.meta
rename to Assets/Materials.meta
diff --git a/Assets/ETSI.ARF/Materials/Back Portrait.mat b/Assets/Materials/Back Portrait.mat
similarity index 100%
rename from Assets/ETSI.ARF/Materials/Back Portrait.mat
rename to Assets/Materials/Back Portrait.mat
diff --git a/Assets/ETSI.ARF/Materials/Back Portrait.mat.meta b/Assets/Materials/Back Portrait.mat.meta
similarity index 100%
rename from Assets/ETSI.ARF/Materials/Back Portrait.mat.meta
rename to Assets/Materials/Back Portrait.mat.meta
diff --git a/Assets/ETSI.ARF/Materials/Blue Metal.mat b/Assets/Materials/Blue Metal.mat
similarity index 100%
rename from Assets/ETSI.ARF/Materials/Blue Metal.mat
rename to Assets/Materials/Blue Metal.mat
diff --git a/Assets/ETSI.ARF/Materials/Blue Metal.mat.meta b/Assets/Materials/Blue Metal.mat.meta
similarity index 100%
rename from Assets/ETSI.ARF/Materials/Blue Metal.mat.meta
rename to Assets/Materials/Blue Metal.mat.meta
diff --git a/Assets/ETSI.ARF/Materials/Blue.mat b/Assets/Materials/Blue.mat
similarity index 100%
rename from Assets/ETSI.ARF/Materials/Blue.mat
rename to Assets/Materials/Blue.mat
diff --git a/Assets/ETSI.ARF/Materials/Blue.mat.meta b/Assets/Materials/Blue.mat.meta
similarity index 100%
rename from Assets/ETSI.ARF/Materials/Blue.mat.meta
rename to Assets/Materials/Blue.mat.meta
diff --git a/Assets/ETSI.ARF/Materials/GridGreyWhite.mat b/Assets/Materials/GridGreyWhite.mat
similarity index 100%
rename from Assets/ETSI.ARF/Materials/GridGreyWhite.mat
rename to Assets/Materials/GridGreyWhite.mat
diff --git a/Assets/ETSI.ARF/Materials/GridGreyWhite.mat.meta b/Assets/Materials/GridGreyWhite.mat.meta
similarity index 100%
rename from Assets/ETSI.ARF/Materials/GridGreyWhite.mat.meta
rename to Assets/Materials/GridGreyWhite.mat.meta
diff --git a/Assets/ETSI.ARF/Materials/GridRedWhite.mat b/Assets/Materials/GridRedWhite.mat
similarity index 100%
rename from Assets/ETSI.ARF/Materials/GridRedWhite.mat
rename to Assets/Materials/GridRedWhite.mat
diff --git a/Assets/ETSI.ARF/Materials/GridRedWhite.mat.meta b/Assets/Materials/GridRedWhite.mat.meta
similarity index 100%
rename from Assets/ETSI.ARF/Materials/GridRedWhite.mat.meta
rename to Assets/Materials/GridRedWhite.mat.meta
diff --git a/Assets/ETSI.ARF/Materials/MultiChecked.mat b/Assets/Materials/MultiChecked.mat
similarity index 100%
rename from Assets/ETSI.ARF/Materials/MultiChecked.mat
rename to Assets/Materials/MultiChecked.mat
diff --git a/Assets/ETSI.ARF/Materials/MultiChecked.mat.meta b/Assets/Materials/MultiChecked.mat.meta
similarity index 100%
rename from Assets/ETSI.ARF/Materials/MultiChecked.mat.meta
rename to Assets/Materials/MultiChecked.mat.meta
diff --git a/Assets/ETSI.ARF/Materials/Orange.mat b/Assets/Materials/Orange.mat
similarity index 100%
rename from Assets/ETSI.ARF/Materials/Orange.mat
rename to Assets/Materials/Orange.mat
diff --git a/Assets/ETSI.ARF/Materials/Orange.mat.meta b/Assets/Materials/Orange.mat.meta
similarity index 100%
rename from Assets/ETSI.ARF/Materials/Orange.mat.meta
rename to Assets/Materials/Orange.mat.meta
diff --git a/Assets/ETSI.ARF/Materials/Red Metal.mat b/Assets/Materials/Red Metal.mat
similarity index 100%
rename from Assets/ETSI.ARF/Materials/Red Metal.mat
rename to Assets/Materials/Red Metal.mat
diff --git a/Assets/ETSI.ARF/Materials/Red Metal.mat.meta b/Assets/Materials/Red Metal.mat.meta
similarity index 100%
rename from Assets/ETSI.ARF/Materials/Red Metal.mat.meta
rename to Assets/Materials/Red Metal.mat.meta
diff --git a/Assets/ETSI.ARF/Materials/Red.mat b/Assets/Materials/Red.mat
similarity index 100%
rename from Assets/ETSI.ARF/Materials/Red.mat
rename to Assets/Materials/Red.mat
diff --git a/Assets/ETSI.ARF/Materials/Red.mat.meta b/Assets/Materials/Red.mat.meta
similarity index 100%
rename from Assets/ETSI.ARF/Materials/Red.mat.meta
rename to Assets/Materials/Red.mat.meta
diff --git a/Assets/ETSI.ARF/Materials/SpeedMetals.mat b/Assets/Materials/SpeedMetals.mat
similarity index 100%
rename from Assets/ETSI.ARF/Materials/SpeedMetals.mat
rename to Assets/Materials/SpeedMetals.mat
diff --git a/Assets/ETSI.ARF/Materials/SpeedMetals.mat.meta b/Assets/Materials/SpeedMetals.mat.meta
similarity index 100%
rename from Assets/ETSI.ARF/Materials/SpeedMetals.mat.meta
rename to Assets/Materials/SpeedMetals.mat.meta
diff --git a/Assets/ETSI.ARF/Materials/Yellow Metal.mat b/Assets/Materials/Yellow Metal.mat
similarity index 100%
rename from Assets/ETSI.ARF/Materials/Yellow Metal.mat
rename to Assets/Materials/Yellow Metal.mat
diff --git a/Assets/ETSI.ARF/Materials/Yellow Metal.mat.meta b/Assets/Materials/Yellow Metal.mat.meta
similarity index 100%
rename from Assets/ETSI.ARF/Materials/Yellow Metal.mat.meta
rename to Assets/Materials/Yellow Metal.mat.meta
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Materials/grey.mat b/Assets/Materials/grey.mat
similarity index 100%
rename from Assets/ETSI.ARF/ARF World Storage API/Materials/grey.mat
rename to Assets/Materials/grey.mat
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Materials/grey.mat.meta b/Assets/Materials/grey.mat.meta
similarity index 100%
rename from Assets/ETSI.ARF/ARF World Storage API/Materials/grey.mat.meta
rename to Assets/Materials/grey.mat.meta
diff --git a/Assets/ETSI.ARF/Materials/grid_grey&white.mat b/Assets/Materials/grid_grey&white.mat
similarity index 100%
rename from Assets/ETSI.ARF/Materials/grid_grey&white.mat
rename to Assets/Materials/grid_grey&white.mat
diff --git a/Assets/ETSI.ARF/Materials/grid_grey&white.mat.meta b/Assets/Materials/grid_grey&white.mat.meta
similarity index 100%
rename from Assets/ETSI.ARF/Materials/grid_grey&white.mat.meta
rename to Assets/Materials/grid_grey&white.mat.meta
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Materials/ground_stone_ground.jpg b/Assets/Materials/ground_stone_ground.jpg
similarity index 100%
rename from Assets/ETSI.ARF/ARF World Storage API/Materials/ground_stone_ground.jpg
rename to Assets/Materials/ground_stone_ground.jpg
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Materials/ground_stone_ground.jpg.meta b/Assets/Materials/ground_stone_ground.jpg.meta
similarity index 100%
rename from Assets/ETSI.ARF/ARF World Storage API/Materials/ground_stone_ground.jpg.meta
rename to Assets/Materials/ground_stone_ground.jpg.meta
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Materials/ground_stone_ground.mat b/Assets/Materials/ground_stone_ground.mat
similarity index 100%
rename from Assets/ETSI.ARF/ARF World Storage API/Materials/ground_stone_ground.mat
rename to Assets/Materials/ground_stone_ground.mat
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Materials/ground_stone_ground.mat.meta b/Assets/Materials/ground_stone_ground.mat.meta
similarity index 100%
rename from Assets/ETSI.ARF/ARF World Storage API/Materials/ground_stone_ground.mat.meta
rename to Assets/Materials/ground_stone_ground.mat.meta
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Materials/statue.mat b/Assets/Materials/statue.mat
similarity index 100%
rename from Assets/ETSI.ARF/ARF World Storage API/Materials/statue.mat
rename to Assets/Materials/statue.mat
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Materials/statue.mat.meta b/Assets/Materials/statue.mat.meta
similarity index 100%
rename from Assets/ETSI.ARF/ARF World Storage API/Materials/statue.mat.meta
rename to Assets/Materials/statue.mat.meta
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Materials/wall.mat b/Assets/Materials/wall.mat
similarity index 100%
rename from Assets/ETSI.ARF/ARF World Storage API/Materials/wall.mat
rename to Assets/Materials/wall.mat
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Materials/wall.mat.meta b/Assets/Materials/wall.mat.meta
similarity index 100%
rename from Assets/ETSI.ARF/ARF World Storage API/Materials/wall.mat.meta
rename to Assets/Materials/wall.mat.meta
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Models.meta b/Assets/Models.meta
similarity index 100%
rename from Assets/ETSI.ARF/ARF World Storage API/Models.meta
rename to Assets/Models.meta
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Models/knabe_simplified.obj b/Assets/Models/knabe_simplified.obj
similarity index 100%
rename from Assets/ETSI.ARF/ARF World Storage API/Models/knabe_simplified.obj
rename to Assets/Models/knabe_simplified.obj
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Models/knabe_simplified.obj.meta b/Assets/Models/knabe_simplified.obj.meta
similarity index 100%
rename from Assets/ETSI.ARF/ARF World Storage API/Models/knabe_simplified.obj.meta
rename to Assets/Models/knabe_simplified.obj.meta
diff --git a/Assets/ETSI.ARF/Prefabs.meta b/Assets/Prefabs.meta
similarity index 100%
rename from Assets/ETSI.ARF/Prefabs.meta
rename to Assets/Prefabs.meta
diff --git a/Assets/ETSI.ARF/Prefabs/Entry.prefab b/Assets/Prefabs/Entry.prefab
similarity index 100%
rename from Assets/ETSI.ARF/Prefabs/Entry.prefab
rename to Assets/Prefabs/Entry.prefab
diff --git a/Assets/ETSI.ARF/Prefabs/Entry.prefab.meta b/Assets/Prefabs/Entry.prefab.meta
similarity index 100%
rename from Assets/ETSI.ARF/Prefabs/Entry.prefab.meta
rename to Assets/Prefabs/Entry.prefab.meta
diff --git a/Assets/ETSI.ARF/Prefabs/EntryHandler.cs b/Assets/Prefabs/EntryHandler.cs
similarity index 100%
rename from Assets/ETSI.ARF/Prefabs/EntryHandler.cs
rename to Assets/Prefabs/EntryHandler.cs
diff --git a/Assets/ETSI.ARF/Prefabs/EntryHandler.cs.meta b/Assets/Prefabs/EntryHandler.cs.meta
similarity index 100%
rename from Assets/ETSI.ARF/Prefabs/EntryHandler.cs.meta
rename to Assets/Prefabs/EntryHandler.cs.meta
diff --git a/Assets/ETSI.ARF/Prefabs/Monitor Server.prefab b/Assets/Prefabs/Monitor Server.prefab
similarity index 91%
rename from Assets/ETSI.ARF/Prefabs/Monitor Server.prefab
rename to Assets/Prefabs/Monitor Server.prefab
index cb2c1becab7e81589369248d146a010b54178bc6..be4a122ad261b51c419fdd281eb0b32de5466a98 100644
--- a/Assets/ETSI.ARF/Prefabs/Monitor Server.prefab	
+++ b/Assets/Prefabs/Monitor Server.prefab	
@@ -48,6 +48,36 @@ PrefabInstance:
       propertyPath: m_Name
       value: Monitor Server
       objectReference: {fileID: 0}
+    - target: {fileID: 2396108624338673315, guid: 32db196abc79c03418ce7689ee059061,
+        type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2396108624338673315, guid: 32db196abc79c03418ce7689ee059061,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3125550876157095326, guid: 32db196abc79c03418ce7689ee059061,
+        type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3125550876157095326, guid: 32db196abc79c03418ce7689ee059061,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3125550876157095326, guid: 32db196abc79c03418ce7689ee059061,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3450597744907078845, guid: 32db196abc79c03418ce7689ee059061,
+        type: 3}
+      propertyPath: m_Size
+      value: 0.9558824
+      objectReference: {fileID: 0}
     - target: {fileID: 3661075027237127527, guid: 32db196abc79c03418ce7689ee059061,
         type: 3}
       propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
@@ -257,6 +287,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   isDebugMessage: 0
   autoUpdate: 0
+  seconds: 5
   startClosed: 0
   startHeight: 0
   busy: {fileID: 2438302738158184294}
diff --git a/Assets/ETSI.ARF/Prefabs/Monitor Server.prefab.meta b/Assets/Prefabs/Monitor Server.prefab.meta
similarity index 100%
rename from Assets/ETSI.ARF/Prefabs/Monitor Server.prefab.meta
rename to Assets/Prefabs/Monitor Server.prefab.meta
diff --git a/Assets/ETSI.ARF/Prefabs/Monitor World Storage.prefab b/Assets/Prefabs/Monitor World Storage.prefab
similarity index 100%
rename from Assets/ETSI.ARF/Prefabs/Monitor World Storage.prefab
rename to Assets/Prefabs/Monitor World Storage.prefab
diff --git a/Assets/ETSI.ARF/Prefabs/Monitor World Storage.prefab.meta b/Assets/Prefabs/Monitor World Storage.prefab.meta
similarity index 100%
rename from Assets/ETSI.ARF/Prefabs/Monitor World Storage.prefab.meta
rename to Assets/Prefabs/Monitor World Storage.prefab.meta
diff --git a/Assets/ETSI.ARF/Prefabs/Monitor.prefab b/Assets/Prefabs/Monitor.prefab
similarity index 100%
rename from Assets/ETSI.ARF/Prefabs/Monitor.prefab
rename to Assets/Prefabs/Monitor.prefab
diff --git a/Assets/ETSI.ARF/Prefabs/Monitor.prefab.meta b/Assets/Prefabs/Monitor.prefab.meta
similarity index 100%
rename from Assets/ETSI.ARF/Prefabs/Monitor.prefab.meta
rename to Assets/Prefabs/Monitor.prefab.meta
diff --git a/Assets/ETSI.ARF/Prefabs/MonitorBase.cs b/Assets/Prefabs/MonitorBase.cs
similarity index 100%
rename from Assets/ETSI.ARF/Prefabs/MonitorBase.cs
rename to Assets/Prefabs/MonitorBase.cs
diff --git a/Assets/ETSI.ARF/Prefabs/MonitorBase.cs.meta b/Assets/Prefabs/MonitorBase.cs.meta
similarity index 100%
rename from Assets/ETSI.ARF/Prefabs/MonitorBase.cs.meta
rename to Assets/Prefabs/MonitorBase.cs.meta
diff --git a/Assets/ETSI.ARF/Prefabs/MonitorServer.cs b/Assets/Prefabs/MonitorServer.cs
similarity index 100%
rename from Assets/ETSI.ARF/Prefabs/MonitorServer.cs
rename to Assets/Prefabs/MonitorServer.cs
diff --git a/Assets/ETSI.ARF/Prefabs/MonitorServer.cs.meta b/Assets/Prefabs/MonitorServer.cs.meta
similarity index 100%
rename from Assets/ETSI.ARF/Prefabs/MonitorServer.cs.meta
rename to Assets/Prefabs/MonitorServer.cs.meta
diff --git a/Assets/ETSI.ARF/Prefabs/MonitorWorldStorage.cs b/Assets/Prefabs/MonitorWorldStorage.cs
similarity index 100%
rename from Assets/ETSI.ARF/Prefabs/MonitorWorldStorage.cs
rename to Assets/Prefabs/MonitorWorldStorage.cs
diff --git a/Assets/ETSI.ARF/Prefabs/MonitorWorldStorage.cs.meta b/Assets/Prefabs/MonitorWorldStorage.cs.meta
similarity index 100%
rename from Assets/ETSI.ARF/Prefabs/MonitorWorldStorage.cs.meta
rename to Assets/Prefabs/MonitorWorldStorage.cs.meta
diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity
deleted file mode 100644
index 9c5c0d071f470016b3a5319f9a252c06939a976c..0000000000000000000000000000000000000000
--- a/Assets/Scenes/SampleScene.unity
+++ /dev/null
@@ -1,301 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!29 &1
-OcclusionCullingSettings:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_OcclusionBakeSettings:
-    smallestOccluder: 5
-    smallestHole: 0.25
-    backfaceThreshold: 100
-  m_SceneGUID: 00000000000000000000000000000000
-  m_OcclusionCullingData: {fileID: 0}
---- !u!104 &2
-RenderSettings:
-  m_ObjectHideFlags: 0
-  serializedVersion: 9
-  m_Fog: 0
-  m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
-  m_FogMode: 3
-  m_FogDensity: 0.01
-  m_LinearFogStart: 0
-  m_LinearFogEnd: 300
-  m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
-  m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
-  m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
-  m_AmbientIntensity: 1
-  m_AmbientMode: 0
-  m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
-  m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0}
-  m_HaloStrength: 0.5
-  m_FlareStrength: 1
-  m_FlareFadeSpeed: 3
-  m_HaloTexture: {fileID: 0}
-  m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0}
-  m_DefaultReflectionMode: 0
-  m_DefaultReflectionResolution: 128
-  m_ReflectionBounces: 1
-  m_ReflectionIntensity: 1
-  m_CustomReflection: {fileID: 0}
-  m_Sun: {fileID: 705507994}
-  m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
-  m_UseRadianceAmbientProbe: 0
---- !u!157 &3
-LightmapSettings:
-  m_ObjectHideFlags: 0
-  serializedVersion: 12
-  m_GIWorkflowMode: 1
-  m_GISettings:
-    serializedVersion: 2
-    m_BounceScale: 1
-    m_IndirectOutputScale: 1
-    m_AlbedoBoost: 1
-    m_EnvironmentLightingMode: 0
-    m_EnableBakedLightmaps: 1
-    m_EnableRealtimeLightmaps: 0
-  m_LightmapEditorSettings:
-    serializedVersion: 12
-    m_Resolution: 2
-    m_BakeResolution: 40
-    m_AtlasSize: 1024
-    m_AO: 0
-    m_AOMaxDistance: 1
-    m_CompAOExponent: 1
-    m_CompAOExponentDirect: 0
-    m_ExtractAmbientOcclusion: 0
-    m_Padding: 2
-    m_LightmapParameters: {fileID: 0}
-    m_LightmapsBakeMode: 1
-    m_TextureCompression: 1
-    m_FinalGather: 0
-    m_FinalGatherFiltering: 1
-    m_FinalGatherRayCount: 256
-    m_ReflectionCompression: 2
-    m_MixedBakeMode: 2
-    m_BakeBackend: 1
-    m_PVRSampling: 1
-    m_PVRDirectSampleCount: 32
-    m_PVRSampleCount: 500
-    m_PVRBounces: 2
-    m_PVREnvironmentSampleCount: 500
-    m_PVREnvironmentReferencePointCount: 2048
-    m_PVRFilteringMode: 2
-    m_PVRDenoiserTypeDirect: 0
-    m_PVRDenoiserTypeIndirect: 0
-    m_PVRDenoiserTypeAO: 0
-    m_PVRFilterTypeDirect: 0
-    m_PVRFilterTypeIndirect: 0
-    m_PVRFilterTypeAO: 0
-    m_PVREnvironmentMIS: 0
-    m_PVRCulling: 1
-    m_PVRFilteringGaussRadiusDirect: 1
-    m_PVRFilteringGaussRadiusIndirect: 5
-    m_PVRFilteringGaussRadiusAO: 2
-    m_PVRFilteringAtrousPositionSigmaDirect: 0.5
-    m_PVRFilteringAtrousPositionSigmaIndirect: 2
-    m_PVRFilteringAtrousPositionSigmaAO: 1
-    m_ExportTrainingData: 0
-    m_TrainingDataDestination: TrainingData
-    m_LightProbeSampleCountMultiplier: 4
-  m_LightingDataAsset: {fileID: 0}
-  m_LightingSettings: {fileID: 0}
---- !u!196 &4
-NavMeshSettings:
-  serializedVersion: 2
-  m_ObjectHideFlags: 0
-  m_BuildSettings:
-    serializedVersion: 2
-    agentTypeID: 0
-    agentRadius: 0.5
-    agentHeight: 2
-    agentSlope: 45
-    agentClimb: 0.4
-    ledgeDropHeight: 0
-    maxJumpAcrossDistance: 0
-    minRegionArea: 2
-    manualCellSize: 0
-    cellSize: 0.16666667
-    manualTileSize: 0
-    tileSize: 256
-    accuratePlacement: 0
-    maxJobWorkers: 0
-    preserveTilesOutsideBounds: 0
-    debug:
-      m_Flags: 0
-  m_NavMeshData: {fileID: 0}
---- !u!1 &705507993
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 705507995}
-  - component: {fileID: 705507994}
-  m_Layer: 0
-  m_Name: Directional Light
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!108 &705507994
-Light:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 705507993}
-  m_Enabled: 1
-  serializedVersion: 10
-  m_Type: 1
-  m_Shape: 0
-  m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
-  m_Intensity: 1
-  m_Range: 10
-  m_SpotAngle: 30
-  m_InnerSpotAngle: 21.80208
-  m_CookieSize: 10
-  m_Shadows:
-    m_Type: 2
-    m_Resolution: -1
-    m_CustomResolution: -1
-    m_Strength: 1
-    m_Bias: 0.05
-    m_NormalBias: 0.4
-    m_NearPlane: 0.2
-    m_CullingMatrixOverride:
-      e00: 1
-      e01: 0
-      e02: 0
-      e03: 0
-      e10: 0
-      e11: 1
-      e12: 0
-      e13: 0
-      e20: 0
-      e21: 0
-      e22: 1
-      e23: 0
-      e30: 0
-      e31: 0
-      e32: 0
-      e33: 1
-    m_UseCullingMatrixOverride: 0
-  m_Cookie: {fileID: 0}
-  m_DrawHalo: 0
-  m_Flare: {fileID: 0}
-  m_RenderMode: 0
-  m_CullingMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_RenderingLayerMask: 1
-  m_Lightmapping: 1
-  m_LightShadowCasterMode: 0
-  m_AreaSize: {x: 1, y: 1}
-  m_BounceIntensity: 1
-  m_ColorTemperature: 6570
-  m_UseColorTemperature: 0
-  m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
-  m_UseBoundingSphereOverride: 0
-  m_UseViewFrustumForShadowCasterCull: 1
-  m_ShadowRadius: 0
-  m_ShadowAngle: 0
---- !u!4 &705507995
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 705507993}
-  m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}
-  m_LocalPosition: {x: 0, y: 3, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
---- !u!1 &963194225
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 963194228}
-  - component: {fileID: 963194227}
-  - component: {fileID: 963194226}
-  m_Layer: 0
-  m_Name: Main Camera
-  m_TagString: MainCamera
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!81 &963194226
-AudioListener:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 963194225}
-  m_Enabled: 1
---- !u!20 &963194227
-Camera:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 963194225}
-  m_Enabled: 1
-  serializedVersion: 2
-  m_ClearFlags: 1
-  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
-  m_projectionMatrixMode: 1
-  m_GateFitMode: 2
-  m_FOVAxisMode: 0
-  m_SensorSize: {x: 36, y: 24}
-  m_LensShift: {x: 0, y: 0}
-  m_FocalLength: 50
-  m_NormalizedViewPortRect:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1
-    height: 1
-  near clip plane: 0.3
-  far clip plane: 1000
-  field of view: 60
-  orthographic: 0
-  orthographic size: 5
-  m_Depth: -1
-  m_CullingMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_RenderingPath: -1
-  m_TargetTexture: {fileID: 0}
-  m_TargetDisplay: 0
-  m_TargetEye: 3
-  m_HDR: 1
-  m_AllowMSAA: 1
-  m_AllowDynamicResolution: 0
-  m_ForceIntoRT: 0
-  m_OcclusionCulling: 1
-  m_StereoConvergence: 10
-  m_StereoSeparation: 0.022
---- !u!4 &963194228
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 963194225}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 1, z: -10}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
diff --git a/Assets/Scenes/SampleScene.unity.meta b/Assets/Scenes/SampleScene.unity.meta
deleted file mode 100644
index 952bd1e9e110583d94b471a30ff4ddd69f4aee7d..0000000000000000000000000000000000000000
--- a/Assets/Scenes/SampleScene.unity.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 9fc0d4010bbf28b4594072e72b8655ab
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/ETSI.ARF/Scenes/WorldStorageSample.unity b/Assets/Scenes/WorldStorageSample.unity
similarity index 100%
rename from Assets/ETSI.ARF/Scenes/WorldStorageSample.unity
rename to Assets/Scenes/WorldStorageSample.unity
diff --git a/Assets/ETSI.ARF/Scenes/WorldStorageSample.unity.meta b/Assets/Scenes/WorldStorageSample.unity.meta
similarity index 100%
rename from Assets/ETSI.ARF/Scenes/WorldStorageSample.unity.meta
rename to Assets/Scenes/WorldStorageSample.unity.meta
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Scenes/WorldStorageSample.unity b/Assets/Scenes/WorldStorageSampleStatue.unity
similarity index 100%
rename from Assets/ETSI.ARF/ARF World Storage API/Scenes/WorldStorageSample.unity
rename to Assets/Scenes/WorldStorageSampleStatue.unity
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Scenes/WorldStorageSample.unity.meta b/Assets/Scenes/WorldStorageSampleStatue.unity.meta
similarity index 100%
rename from Assets/ETSI.ARF/ARF World Storage API/Scenes/WorldStorageSample.unity.meta
rename to Assets/Scenes/WorldStorageSampleStatue.unity.meta
diff --git a/Assets/ETSI.ARF/Scripts.meta b/Assets/Scripts.meta
similarity index 100%
rename from Assets/ETSI.ARF/Scripts.meta
rename to Assets/Scripts.meta
diff --git a/Assets/ETSI.ARF/Scripts/ARFDatamanager.cs b/Assets/Scripts/ARFDatamanager.cs
similarity index 100%
rename from Assets/ETSI.ARF/Scripts/ARFDatamanager.cs
rename to Assets/Scripts/ARFDatamanager.cs
diff --git a/Assets/ETSI.ARF/Scripts/ARFDatamanager.cs.meta b/Assets/Scripts/ARFDatamanager.cs.meta
similarity index 100%
rename from Assets/ETSI.ARF/Scripts/ARFDatamanager.cs.meta
rename to Assets/Scripts/ARFDatamanager.cs.meta
diff --git a/Assets/ETSI.ARF/Scripts/ConsoleLogFile.cs b/Assets/Scripts/ConsoleLogFile.cs
similarity index 100%
rename from Assets/ETSI.ARF/Scripts/ConsoleLogFile.cs
rename to Assets/Scripts/ConsoleLogFile.cs
diff --git a/Assets/ETSI.ARF/Scripts/ConsoleLogFile.cs.meta b/Assets/Scripts/ConsoleLogFile.cs.meta
similarity index 100%
rename from Assets/ETSI.ARF/Scripts/ConsoleLogFile.cs.meta
rename to Assets/Scripts/ConsoleLogFile.cs.meta
diff --git a/Assets/ETSI.ARF/Scripts/SimpleClientDemo.cs b/Assets/Scripts/SimpleClientDemo.cs
similarity index 100%
rename from Assets/ETSI.ARF/Scripts/SimpleClientDemo.cs
rename to Assets/Scripts/SimpleClientDemo.cs
diff --git a/Assets/ETSI.ARF/Scripts/SimpleClientDemo.cs.meta b/Assets/Scripts/SimpleClientDemo.cs.meta
similarity index 100%
rename from Assets/ETSI.ARF/Scripts/SimpleClientDemo.cs.meta
rename to Assets/Scripts/SimpleClientDemo.cs.meta
diff --git a/Assets/ETSI.ARF/Textures.meta b/Assets/Textures.meta
similarity index 100%
rename from Assets/ETSI.ARF/Textures.meta
rename to Assets/Textures.meta
diff --git a/Assets/ETSI.ARF/Textures/Back.png b/Assets/Textures/Back.png
similarity index 100%
rename from Assets/ETSI.ARF/Textures/Back.png
rename to Assets/Textures/Back.png
diff --git a/Assets/ETSI.ARF/Textures/Back.png.meta b/Assets/Textures/Back.png.meta
similarity index 100%
rename from Assets/ETSI.ARF/Textures/Back.png.meta
rename to Assets/Textures/Back.png.meta
diff --git a/Assets/ETSI.ARF/Textures/BackPortrait No Transp.png b/Assets/Textures/BackPortrait No Transp.png
similarity index 100%
rename from Assets/ETSI.ARF/Textures/BackPortrait No Transp.png
rename to Assets/Textures/BackPortrait No Transp.png
diff --git a/Assets/ETSI.ARF/Textures/BackPortrait No Transp.png.meta b/Assets/Textures/BackPortrait No Transp.png.meta
similarity index 100%
rename from Assets/ETSI.ARF/Textures/BackPortrait No Transp.png.meta
rename to Assets/Textures/BackPortrait No Transp.png.meta
diff --git a/Assets/ETSI.ARF/Textures/BackPortrait.png b/Assets/Textures/BackPortrait.png
similarity index 100%
rename from Assets/ETSI.ARF/Textures/BackPortrait.png
rename to Assets/Textures/BackPortrait.png
diff --git a/Assets/ETSI.ARF/Textures/BackPortrait.png.meta b/Assets/Textures/BackPortrait.png.meta
similarity index 100%
rename from Assets/ETSI.ARF/Textures/BackPortrait.png.meta
rename to Assets/Textures/BackPortrait.png.meta
diff --git a/Assets/ETSI.ARF/Textures/BackPortraitWhite.png b/Assets/Textures/BackPortraitWhite.png
similarity index 100%
rename from Assets/ETSI.ARF/Textures/BackPortraitWhite.png
rename to Assets/Textures/BackPortraitWhite.png
diff --git a/Assets/ETSI.ARF/Textures/BackPortraitWhite.png.meta b/Assets/Textures/BackPortraitWhite.png.meta
similarity index 100%
rename from Assets/ETSI.ARF/Textures/BackPortraitWhite.png.meta
rename to Assets/Textures/BackPortraitWhite.png.meta
diff --git a/Assets/ETSI.ARF/Textures/BackRound with Border.png b/Assets/Textures/BackRound with Border.png
similarity index 100%
rename from Assets/ETSI.ARF/Textures/BackRound with Border.png
rename to Assets/Textures/BackRound with Border.png
diff --git a/Assets/ETSI.ARF/Textures/BackRound with Border.png.meta b/Assets/Textures/BackRound with Border.png.meta
similarity index 100%
rename from Assets/ETSI.ARF/Textures/BackRound with Border.png.meta
rename to Assets/Textures/BackRound with Border.png.meta
diff --git a/Assets/ETSI.ARF/Textures/BackWhite.png b/Assets/Textures/BackWhite.png
similarity index 100%
rename from Assets/ETSI.ARF/Textures/BackWhite.png
rename to Assets/Textures/BackWhite.png
diff --git a/Assets/ETSI.ARF/Textures/BackWhite.png.meta b/Assets/Textures/BackWhite.png.meta
similarity index 100%
rename from Assets/ETSI.ARF/Textures/BackWhite.png.meta
rename to Assets/Textures/BackWhite.png.meta
diff --git a/Assets/ETSI.ARF/Textures/Fill.png b/Assets/Textures/Fill.png
similarity index 100%
rename from Assets/ETSI.ARF/Textures/Fill.png
rename to Assets/Textures/Fill.png
diff --git a/Assets/ETSI.ARF/Textures/Fill.png.meta b/Assets/Textures/Fill.png.meta
similarity index 100%
rename from Assets/ETSI.ARF/Textures/Fill.png.meta
rename to Assets/Textures/Fill.png.meta
diff --git a/Assets/ETSI.ARF/Textures/FillWhite.png b/Assets/Textures/FillWhite.png
similarity index 100%
rename from Assets/ETSI.ARF/Textures/FillWhite.png
rename to Assets/Textures/FillWhite.png
diff --git a/Assets/ETSI.ARF/Textures/FillWhite.png.meta b/Assets/Textures/FillWhite.png.meta
similarity index 100%
rename from Assets/ETSI.ARF/Textures/FillWhite.png.meta
rename to Assets/Textures/FillWhite.png.meta
diff --git a/Assets/ETSI.ARF/Textures/etsi_logo.png b/Assets/Textures/etsi_logo.png
similarity index 100%
rename from Assets/ETSI.ARF/Textures/etsi_logo.png
rename to Assets/Textures/etsi_logo.png
diff --git a/Assets/ETSI.ARF/Textures/etsi_logo.png.meta b/Assets/Textures/etsi_logo.png.meta
similarity index 100%
rename from Assets/ETSI.ARF/Textures/etsi_logo.png.meta
rename to Assets/Textures/etsi_logo.png.meta
diff --git a/Assets/ETSI.ARF/Textures/grid_black&white.jpg b/Assets/Textures/grid_black&white.jpg
similarity index 100%
rename from Assets/ETSI.ARF/Textures/grid_black&white.jpg
rename to Assets/Textures/grid_black&white.jpg
diff --git a/Assets/ETSI.ARF/Textures/grid_black&white.jpg.meta b/Assets/Textures/grid_black&white.jpg.meta
similarity index 100%
rename from Assets/ETSI.ARF/Textures/grid_black&white.jpg.meta
rename to Assets/Textures/grid_black&white.jpg.meta
diff --git a/Assets/ETSI.ARF/Textures/grid_grey&white.jpg b/Assets/Textures/grid_grey&white.jpg
similarity index 100%
rename from Assets/ETSI.ARF/Textures/grid_grey&white.jpg
rename to Assets/Textures/grid_grey&white.jpg
diff --git a/Assets/ETSI.ARF/Textures/grid_grey&white.jpg.meta b/Assets/Textures/grid_grey&white.jpg.meta
similarity index 100%
rename from Assets/ETSI.ARF/Textures/grid_grey&white.jpg.meta
rename to Assets/Textures/grid_grey&white.jpg.meta
diff --git a/Assets/ETSI.ARF/Textures/grid_white&red.jpg b/Assets/Textures/grid_white&red.jpg
similarity index 100%
rename from Assets/ETSI.ARF/Textures/grid_white&red.jpg
rename to Assets/Textures/grid_white&red.jpg
diff --git a/Assets/ETSI.ARF/Textures/grid_white&red.jpg.meta b/Assets/Textures/grid_white&red.jpg.meta
similarity index 100%
rename from Assets/ETSI.ARF/Textures/grid_white&red.jpg.meta
rename to Assets/Textures/grid_white&red.jpg.meta
diff --git a/Assets/ETSI.ARF/Textures/gridinv257.psd b/Assets/Textures/gridinv257.psd
similarity index 100%
rename from Assets/ETSI.ARF/Textures/gridinv257.psd
rename to Assets/Textures/gridinv257.psd
diff --git a/Assets/ETSI.ARF/Textures/gridinv257.psd.meta b/Assets/Textures/gridinv257.psd.meta
similarity index 100%
rename from Assets/ETSI.ARF/Textures/gridinv257.psd.meta
rename to Assets/Textures/gridinv257.psd.meta
diff --git a/Assets/ETSI.ARF/ARF World Storage API/World Storage.meta b/Assets/World Storage.meta
similarity index 100%
rename from Assets/ETSI.ARF/ARF World Storage API/World Storage.meta
rename to Assets/World Storage.meta
diff --git a/Assets/ETSI.ARF/ARF World Storage API/World Storage/Depreciated.meta b/Assets/World Storage/Depreciated.meta
similarity index 100%
rename from Assets/ETSI.ARF/ARF World Storage API/World Storage/Depreciated.meta
rename to Assets/World Storage/Depreciated.meta
diff --git a/Assets/ETSI.ARF/ARF World Storage API/World Storage/Depreciated/HHI Server - detlef dev.asset b/Assets/World Storage/Depreciated/HHI Server - detlef dev.asset
similarity index 100%
rename from Assets/ETSI.ARF/ARF World Storage API/World Storage/Depreciated/HHI Server - detlef dev.asset
rename to Assets/World Storage/Depreciated/HHI Server - detlef dev.asset
diff --git a/Assets/ETSI.ARF/ARF World Storage API/World Storage/Depreciated/HHI Server - detlef dev.asset.meta b/Assets/World Storage/Depreciated/HHI Server - detlef dev.asset.meta
similarity index 100%
rename from Assets/ETSI.ARF/ARF World Storage API/World Storage/Depreciated/HHI Server - detlef dev.asset.meta
rename to Assets/World Storage/Depreciated/HHI Server - detlef dev.asset.meta
diff --git a/Assets/ETSI.ARF/ARF World Storage API/World Storage/Depreciated/HHI Server STF620.asset b/Assets/World Storage/Depreciated/HHI Server STF620.asset
similarity index 100%
rename from Assets/ETSI.ARF/ARF World Storage API/World Storage/Depreciated/HHI Server STF620.asset
rename to Assets/World Storage/Depreciated/HHI Server STF620.asset
diff --git a/Assets/ETSI.ARF/ARF World Storage API/World Storage/Depreciated/HHI Server STF620.asset.meta b/Assets/World Storage/Depreciated/HHI Server STF620.asset.meta
similarity index 100%
rename from Assets/ETSI.ARF/ARF World Storage API/World Storage/Depreciated/HHI Server STF620.asset.meta
rename to Assets/World Storage/Depreciated/HHI Server STF620.asset.meta
diff --git a/Assets/ETSI.ARF/ARF World Storage API/World Storage/HHI Server - sylvain dev.asset b/Assets/World Storage/HHI Server - sylvain dev.asset
similarity index 100%
rename from Assets/ETSI.ARF/ARF World Storage API/World Storage/HHI Server - sylvain dev.asset
rename to Assets/World Storage/HHI Server - sylvain dev.asset
diff --git a/Assets/ETSI.ARF/ARF World Storage API/World Storage/HHI Server - sylvain dev.asset.meta b/Assets/World Storage/HHI Server - sylvain dev.asset.meta
similarity index 100%
rename from Assets/ETSI.ARF/ARF World Storage API/World Storage/HHI Server - sylvain dev.asset.meta
rename to Assets/World Storage/HHI Server - sylvain dev.asset.meta
diff --git a/Assets/ETSI.ARF/ARF World Storage API/World Storage/HHI Server STF669.asset b/Assets/World Storage/HHI Server STF669.asset
similarity index 100%
rename from Assets/ETSI.ARF/ARF World Storage API/World Storage/HHI Server STF669.asset
rename to Assets/World Storage/HHI Server STF669.asset
diff --git a/Assets/ETSI.ARF/ARF World Storage API/World Storage/HHI Server STF669.asset.meta b/Assets/World Storage/HHI Server STF669.asset.meta
similarity index 100%
rename from Assets/ETSI.ARF/ARF World Storage API/World Storage/HHI Server STF669.asset.meta
rename to Assets/World Storage/HHI Server STF669.asset.meta
diff --git a/Assets/ETSI.ARF/ARF World Storage API/World Storage/LocalHost8080.asset b/Assets/World Storage/LocalHost8080.asset
similarity index 94%
rename from Assets/ETSI.ARF/ARF World Storage API/World Storage/LocalHost8080.asset
rename to Assets/World Storage/LocalHost8080.asset
index d00574d15efa157ab1299a9cf17b9e26af1de824..8f9c9b3f1fcd04795463c402815baa92640e8fdf 100644
--- a/Assets/ETSI.ARF/ARF World Storage API/World Storage/LocalHost8080.asset	
+++ b/Assets/World Storage/LocalHost8080.asset	
@@ -14,6 +14,6 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   serverName: Local hosted World Storage
   company: b<>com
-  basePath: http://10.55.11.9
+  basePath: http://localhost
   port: 8080
   currentUser: {fileID: 11400000, guid: c0696089e4a855b46ad490437919b1e8, type: 2}
diff --git a/Assets/ETSI.ARF/ARF World Storage API/World Storage/LocalHost8080.asset.meta b/Assets/World Storage/LocalHost8080.asset.meta
similarity index 100%
rename from Assets/ETSI.ARF/ARF World Storage API/World Storage/LocalHost8080.asset.meta
rename to Assets/World Storage/LocalHost8080.asset.meta
diff --git a/Assets/ETSI.ARF/ARF World Storage API/World Storage/LocalHost8081.asset b/Assets/World Storage/LocalHost8081.asset
similarity index 100%
rename from Assets/ETSI.ARF/ARF World Storage API/World Storage/LocalHost8081.asset
rename to Assets/World Storage/LocalHost8081.asset
diff --git a/Assets/ETSI.ARF/ARF World Storage API/World Storage/LocalHost8081.asset.meta b/Assets/World Storage/LocalHost8081.asset.meta
similarity index 100%
rename from Assets/ETSI.ARF/ARF World Storage API/World Storage/LocalHost8081.asset.meta
rename to Assets/World Storage/LocalHost8081.asset.meta
diff --git a/Assets/ETSI.ARF/ARF World Storage API/World Storage/User Demo.asset b/Assets/World Storage/User Demo.asset
similarity index 100%
rename from Assets/ETSI.ARF/ARF World Storage API/World Storage/User Demo.asset
rename to Assets/World Storage/User Demo.asset
diff --git a/Assets/ETSI.ARF/ARF World Storage API/World Storage/User Demo.asset.meta b/Assets/World Storage/User Demo.asset.meta
similarity index 100%
rename from Assets/ETSI.ARF/ARF World Storage API/World Storage/User Demo.asset.meta
rename to Assets/World Storage/User Demo.asset.meta
diff --git a/Assets/ETSI.ARF/ARF World Storage API/World Storage/User Nathan.asset b/Assets/World Storage/User Nathan.asset
similarity index 100%
rename from Assets/ETSI.ARF/ARF World Storage API/World Storage/User Nathan.asset
rename to Assets/World Storage/User Nathan.asset
diff --git a/Assets/ETSI.ARF/ARF World Storage API/World Storage/User Nathan.asset.meta b/Assets/World Storage/User Nathan.asset.meta
similarity index 100%
rename from Assets/ETSI.ARF/ARF World Storage API/World Storage/User Nathan.asset.meta
rename to Assets/World Storage/User Nathan.asset.meta
diff --git a/Assets/ETSI.ARF/ARF World Storage API/World Storage/User Sylvain.asset b/Assets/World Storage/User Sylvain.asset
similarity index 100%
rename from Assets/ETSI.ARF/ARF World Storage API/World Storage/User Sylvain.asset
rename to Assets/World Storage/User Sylvain.asset
diff --git a/Assets/ETSI.ARF/ARF World Storage API/World Storage/User Sylvain.asset.meta b/Assets/World Storage/User Sylvain.asset.meta
similarity index 100%
rename from Assets/ETSI.ARF/ARF World Storage API/World Storage/User Sylvain.asset.meta
rename to Assets/World Storage/User Sylvain.asset.meta