diff --git a/tags/Simulation/Buttons.json b/tags/Simulation/Buttons.json
new file mode 100644
index 0000000..93901bc
--- /dev/null
+++ b/tags/Simulation/Buttons.json
@@ -0,0 +1,106 @@
+{
+  "name": "Buttons",
+  "tagType": "Folder",
+  "tags": [
+    {
+      "name": "UL1_3_JR_PB1",
+      "typeId": "Station",
+      "tagType": "UdtInstance",
+      "tags": [
+        {
+          "name": "STATE",
+          "tagType": "AtomicTag"
+        },
+        {
+          "name": "Maintenance",
+          "tagType": "Folder",
+          "tags": [
+            {
+              "name": "Start_PB",
+              "tagType": "AtomicTag"
+            },
+            {
+              "name": "Stop_PB",
+              "tagType": "AtomicTag"
+            }
+          ]
+        },
+        {
+          "name": "Alarm",
+          "tagType": "Folder",
+          "tags": [
+            {
+              "name": "Estopped",
+              "tagType": "AtomicTag"
+            },
+            {
+              "name": "Stopped",
+              "tagType": "AtomicTag"
+            },
+            {
+              "alarms": [
+                {
+                  "setpointA": 1.0,
+                  "name": "Pressed"
+                }
+              ],
+              "tagGroup": "Alarm",
+              "name": "Pressed",
+              "tagType": "AtomicTag"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name": "UL1_3_JR_PB2",
+      "typeId": "Station",
+      "tagType": "UdtInstance",
+      "tags": [
+        {
+          "name": "Alarm",
+          "tagType": "Folder",
+          "tags": [
+            {
+              "name": "Estopped",
+              "tagType": "AtomicTag"
+            },
+            {
+              "alarms": [
+                {
+                  "setpointA": 1.0,
+                  "name": "Pressed"
+                }
+              ],
+              "tagGroup": "Alarm",
+              "name": "Pressed",
+              "tagType": "AtomicTag"
+            },
+            {
+              "name": "Stopped",
+              "tagType": "AtomicTag"
+            }
+          ]
+        },
+        {
+          "name": "Maintenance",
+          "tagType": "Folder",
+          "tags": [
+            {
+              "name": "Start_PB",
+              "tagType": "AtomicTag"
+            },
+            {
+              "name": "Stop_PB",
+              "tagType": "AtomicTag"
+            }
+          ]
+        },
+        {
+          "name": "STATE",
+          "tagType": "AtomicTag"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/tags/Simulation_tags.json b/tags/Simulation/Main.json
similarity index 100%
rename from tags/Simulation_tags.json
rename to tags/Simulation/Main.json