diff --git a/User Manual/5-input-and-output-files/VECTO.md b/User Manual/5-input-and-output-files/VECTO.md
new file mode 100644
index 0000000000000000000000000000000000000000..4d801b605065ccc2c10ace46cfac61c4c25579c0
--- /dev/null
+++ b/User Manual/5-input-and-output-files/VECTO.md
@@ -0,0 +1,65 @@
+## Vecto Job File
+
+File for the definition of an job in vecto. A job contains everything what is needed to run a simulation. Can be created with the [Job Editor](#job-editor).
+
+- File format is JSON.
+- Filetype ending is ".vecto"
+
+**Example:**
+
+ {
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "3/4/2015 2:09:13 PM",
+ "AppVersion": "2.0.4-beta3",
+ "FileVersion": 2
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "VehicleFile": "24t Coach.vveh",
+ "EngineFile": "24t Coach.veng",
+ "GearboxFile": "24t Coach.vgbx",
+ "Cycles": [
+ "LOT2_rural Engine Only.vdri"
+ ],
+ "Aux": [
+ {
+ "ID": "ALT1",
+ "Type": "Alternator",
+ "Path": "24t_Coach_ALT.vaux",
+ "Technology": ""
+ },
+ {
+ "ID": "ALT2",
+ "Type": "Alternator",
+ "Path": "24t_Coach_ALT.vaux",
+ "Technology": ""
+ },
+ {
+ "ID": "ALT3",
+ "Type": "Alternator",
+ "Path": "24t_Coach_ALT.vaux",
+ "Technology": ""
+ }
+ ],
+ "VACC": "Coach.vacc",
+ "EngineOnlyMode": true,
+ "StartStop": {
+ "Enabled": false,
+ "MaxSpeed": 5.0,
+ "MinTime": 0.0,
+ "Delay": 0
+ },
+ "LAC": {
+ "Enabled": true,
+ "Dec": -0.5,
+ "MinSpeed": 50.0
+ },
+ "OverSpeedEcoRoll": {
+ "Mode": "OverSpeed",
+ "MinSpeed": 70.0,
+ "OverSpeed": 5.0,
+ "UnderSpeed": 5.0
+ }
+ }
+ }
\ No newline at end of file
diff --git a/User Manual/5-input-and-output-files/VENG.md b/User Manual/5-input-and-output-files/VENG.md
new file mode 100644
index 0000000000000000000000000000000000000000..768576b80640a2d7b0a1b14436fc26b247d3a1f7
--- /dev/null
+++ b/User Manual/5-input-and-output-files/VENG.md
@@ -0,0 +1,29 @@
+## Engine File
+
+File for the definition of an engine in Vecto. Can be created with the [Engine Editor](#engine-editor).
+
+- File format is JSON.
+- Filetype ending is ".veng"
+
+**Example:**
+
+ {
+ "Header": {
+ "CreatedBy": "Raphael Luz IVT TU-Graz (14fea510-e457-4bf6-860f-a9514dc327f1)",
+ "Date": "25.06.2015 11:23:22",
+ "AppVersion": "2.2 beta",
+ "FileVersion": 3
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "ModelName": "Generic 24t Coach",
+ "Displacement": 12730.0,
+ "IdlingSpeed": 560.0,
+ "Inertia": 3.8,
+ "FullLoadCurve": "24t Coach.vfld",
+ "FuelMap": "24t Coach.vmap",
+ "WHTC-Urban": 0.0,
+ "WHTC-Rural": 0.0,
+ "WHTC-Motorway": 0.0
+ }
+ }
\ No newline at end of file
diff --git a/User Manual/5-input-and-output-files/VGBX.md b/User Manual/5-input-and-output-files/VGBX.md
new file mode 100644
index 0000000000000000000000000000000000000000..6a0c42685a800be00217cdb36767cca72dfb9d11
--- /dev/null
+++ b/User Manual/5-input-and-output-files/VGBX.md
@@ -0,0 +1,99 @@
+##Gearbox File
+
+File for the definition of a gearbox in Vecto. Can be created with the [Gearbox Editor](#gearbox-editor).
+
+- File format is JSON.
+- Filetype ending is ".vgbx"
+
+**Example:**
+
+ {
+ "Header": {
+ "CreatedBy": "Raphael Luz IVT TU-Graz (14fea510-e457-4bf6-860f-a9514dc327f1)",
+ "Date": "25.06.2015 11:23:31",
+ "AppVersion": "2.2 beta",
+ "FileVersion": 5
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "ModelName": "Generic 24t Coach",
+ "Inertia": 0.0,
+ "TracInt": 1.0,
+ "Gears": [
+ {
+ "Ratio": 3.240355,
+ "LossMap": "Axle.vtlm"
+ },
+ {
+ "Ratio": 6.38,
+ "LossMap": "Indirect Gear.vtlm",
+ "TCactive": false,
+ "ShiftPolygon": "ShiftPolygons.vgbs",
+ "FullLoadCurve": "<NOFILE>"
+ },
+ {
+ "Ratio": 4.63,
+ "LossMap": "Indirect Gear.vtlm",
+ "TCactive": false,
+ "ShiftPolygon": "ShiftPolygons.vgbs",
+ "FullLoadCurve": "<NOFILE>"
+ },
+ {
+ "Ratio": 3.44,
+ "LossMap": "Indirect Gear.vtlm",
+ "TCactive": false,
+ "ShiftPolygon": "ShiftPolygons.vgbs",
+ "FullLoadCurve": "<NOFILE>"
+ },
+ {
+ "Ratio": 2.59,
+ "LossMap": "Indirect Gear.vtlm",
+ "TCactive": false,
+ "ShiftPolygon": "ShiftPolygons.vgbs",
+ "FullLoadCurve": "<NOFILE>"
+ },
+ {
+ "Ratio": 1.86,
+ "LossMap": "Indirect Gear.vtlm",
+ "TCactive": false,
+ "ShiftPolygon": "ShiftPolygons.vgbs",
+ "FullLoadCurve": "<NOFILE>"
+ },
+ {
+ "Ratio": 1.35,
+ "LossMap": "Indirect Gear.vtlm",
+ "TCactive": false,
+ "ShiftPolygon": "ShiftPolygons.vgbs",
+ "FullLoadCurve": "<NOFILE>"
+ },
+ {
+ "Ratio": 1.0,
+ "LossMap": "Direct Gear.vtlm",
+ "TCactive": false,
+ "ShiftPolygon": "ShiftPolygons.vgbs",
+ "FullLoadCurve": "<NOFILE>"
+ },
+ {
+ "Ratio": 0.76,
+ "LossMap": "Indirect Gear.vtlm",
+ "TCactive": false,
+ "ShiftPolygon": "ShiftPolygons.vgbs",
+ "FullLoadCurve": "<NOFILE>"
+ }
+ ],
+ "TqReserve": 20.0,
+ "SkipGears": true,
+ "ShiftTime": 2,
+ "EaryShiftUp": true,
+ "StartTqReserve": 20.0,
+ "StartSpeed": 2.0,
+ "StartAcc": 0.6,
+ "GearboxType": "AMT",
+ "TorqueConverter": {
+ "Enabled": false,
+ "File": "<NOFILE>",
+ "RefRPM": 0.0,
+ "Inertia": 0.0
+ }
+ }
+ }
\ No newline at end of file
diff --git a/User Manual/5-input-and-output-files/VVEH.md b/User Manual/5-input-and-output-files/VVEH.md
new file mode 100644
index 0000000000000000000000000000000000000000..08632da032cf2f64054ca00f337d669a1087a609
--- /dev/null
+++ b/User Manual/5-input-and-output-files/VVEH.md
@@ -0,0 +1,64 @@
+##Vehicle File
+
+File for the definition of a vehicle in vecto. Can be created with the [Vehicle Editor](#vehicle-editor).
+
+- File format is JSON.
+- Filetype ending is ".vveh"
+
+**Example:**
+
+ {
+ "Header": {
+ "CreatedBy": "Raphael Luz IVT TU-Graz (14fea510-e457-4bf6-860f-a9514dc327f1)",
+ "Date": "02.07.2015 13:55:46",
+ "AppVersion": "2.2 beta-2",
+ "FileVersion": 7
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "VehCat": "Coach",
+ "CurbWeight": 15700.0,
+ "CurbWeightExtra": 0.0,
+ "Loading": 3300.0,
+ "MassMax": 24.0,
+ "CdA": 3.2634,
+ "rdyn": 520.0,
+ "Rim": "-",
+ "CdCorrMode": "CdOfVeng",
+ "CdCorrFile": "24t Coach.vcdv",
+ "Retarder": {
+ "Type": "Secondary",
+ "Ratio": 1.0,
+ "File": "Retarder.vrlm"
+ },
+ "AxleConfig": {
+ "Type": "6x2",
+ "Axles": [
+ {
+ "Inertia": 21.66667,
+ "Wheels": "-",
+ "AxleWeightShare": 0.4375,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 62538.75
+ },
+ {
+ "Inertia": 10.83333,
+ "Wheels": "-",
+ "AxleWeightShare": 0.375,
+ "TwinTyres": true,
+ "RRCISO": 0.0065,
+ "FzISO": 52532.55
+ },
+ {
+ "Inertia": 21.66667,
+ "Wheels": "-",
+ "AxleWeightShare": 0.1875,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 62538.75
+ }
+ ]
+ }
+ }
+ }
diff --git a/User Manual/convert.bat b/User Manual/convert.bat
index 6bc8a6496b24b587b07761d341bcbd33ecb220a9..a61867e7f04ebe63a86669799530967f85ad9bef 100644
--- a/User Manual/convert.bat
+++ b/User Manual/convert.bat
@@ -18,7 +18,3 @@ echo Generated outputfile: help.html
REM pandoc -s -S --toc --toc-depth=2 -N %LIST% -o help.docx
REM pandoc -s -S --toc --toc-depth=2 -N %LIST% -o help.pdf
REM pandoc -s -S --toc --toc-depth=2 -N %LIST% -o help.latex
-
-
-
-pause
\ No newline at end of file
diff --git a/User Manual/files.txt b/User Manual/files.txt
index 7c4d560cce766a73bf8941af176e34f1f903c8e2..abd642f4793b1b2d9f1005480a44516feae05b66 100644
--- a/User Manual/files.txt
+++ b/User Manual/files.txt
@@ -29,15 +29,15 @@
4-command-line-arguments/cmd.md
5-input-and-output-files/input-output.md
5-input-and-output-files/CSV.md
-1-user-interface/VECTO-Editor.md
-1-user-interface/VEH-Editor.md
+5-input-and-output-files/VECTO.md
+5-input-and-output-files/VVEH.md
5-input-and-output-files/VCDV.md
5-input-and-output-files/VCDB.md
5-input-and-output-files/VRLM.md
-1-user-interface/ENG-Editor.md
+5-input-and-output-files/VENG.md
5-input-and-output-files/VFLD.md
5-input-and-output-files/VMAP.md
-1-user-interface/GBX-Editor.md
+5-input-and-output-files/VGBX.md
5-input-and-output-files/VGBS.md
5-input-and-output-files/VTLM.md
5-input-and-output-files/VTCC.md