diff --git a/solution/tc_project_app/GlobalTextList.TcGTLO b/solution/tc_project_app/GlobalTextList.TcGTLO
index c1bb3b1..550df53 100644
--- a/solution/tc_project_app/GlobalTextList.TcGTLO
+++ b/solution/tc_project_app/GlobalTextList.TcGTLO
@@ -5,6 +5,11 @@
       <Data>
         <o xml:space="preserve" t="GlobalTextListObject">
           <l n="TextList" t="ArrayList" cet="TextListRow">
+            <o>
+              <v n="TextID">"947"</v>
+              <v n="TextDefault">"   LocalMode"</v>
+              <l n="LanguageTexts" t="ArrayList" />
+            </o>
             <o>
               <v n="TextID">"951"</v>
               <v n="TextDefault">"%2.2f"</v>
@@ -105,6 +110,16 @@
               <v n="TextDefault">"bCommandAborted"</v>
               <l n="LanguageTexts" t="ArrayList" />
             </o>
+            <o>
+              <v n="TextID">"786"</v>
+              <v n="TextDefault">"Bwd Enable"</v>
+              <l n="LanguageTexts" t="ArrayList" />
+            </o>
+            <o>
+              <v n="TextID">"571"</v>
+              <v n="TextDefault">"BWD Limit"</v>
+              <l n="LanguageTexts" t="ArrayList" />
+            </o>
             <o>
               <v n="TextID">"986"</v>
               <v n="TextDefault">"ehomeDirect"</v>
@@ -230,6 +245,16 @@
               <v n="TextDefault">"fVelocity"</v>
               <l n="LanguageTexts" t="ArrayList" />
             </o>
+            <o>
+              <v n="TextID">"668"</v>
+              <v n="TextDefault">"Fwd Enable"</v>
+              <l n="LanguageTexts" t="ArrayList" />
+            </o>
+            <o>
+              <v n="TextID">"737"</v>
+              <v n="TextDefault">"FWD Limit"</v>
+              <l n="LanguageTexts" t="ArrayList" />
+            </o>
             <o>
               <v n="TextID">"688"</v>
               <v n="TextDefault">"fWriteAxisParameter"</v>
@@ -270,6 +295,16 @@
               <v n="TextDefault">"homeSensorPos"</v>
               <l n="LanguageTexts" t="ArrayList" />
             </o>
+            <o>
+              <v n="TextID">"784"</v>
+              <v n="TextDefault">"Interlock Bwd"</v>
+              <l n="LanguageTexts" t="ArrayList" />
+            </o>
+            <o>
+              <v n="TextID">"505"</v>
+              <v n="TextDefault">"Interlock Fwd"</v>
+              <l n="LanguageTexts" t="ArrayList" />
+            </o>
             <o>
               <v n="TextID">"116"</v>
               <v n="TextDefault">"jogBw"</v>
@@ -280,6 +315,16 @@
               <v n="TextDefault">"jogFw"</v>
               <l n="LanguageTexts" t="ArrayList" />
             </o>
+            <o>
+              <v n="TextID">"167"</v>
+              <v n="TextDefault">"Limit Bwd"</v>
+              <l n="LanguageTexts" t="ArrayList" />
+            </o>
+            <o>
+              <v n="TextID">"11"</v>
+              <v n="TextDefault">"Limit Fwd"</v>
+              <l n="LanguageTexts" t="ArrayList" />
+            </o>
             <o>
               <v n="TextID">"298"</v>
               <v n="TextDefault">"masterGear"</v>
diff --git a/solution/tc_project_app/POUs/Application Specific/Applications/Application_Template.TcPOU b/solution/tc_project_app/POUs/Application_Specific/Applications/Application_Template.TcPOU
similarity index 100%
rename from solution/tc_project_app/POUs/Application Specific/Applications/Application_Template.TcPOU
rename to solution/tc_project_app/POUs/Application_Specific/Applications/Application_Template.TcPOU
diff --git a/solution/tc_project_app/POUs/Application Specific/Axes/Axis_Template.TcPOU b/solution/tc_project_app/POUs/Application_Specific/Axes/Axis_Template.TcPOU
similarity index 90%
rename from solution/tc_project_app/POUs/Application Specific/Axes/Axis_Template.TcPOU
rename to solution/tc_project_app/POUs/Application_Specific/Axes/Axis_Template.TcPOU
index d37b2de..dfff176 100644
--- a/solution/tc_project_app/POUs/Application Specific/Axes/Axis_Template.TcPOU	
+++ b/solution/tc_project_app/POUs/Application_Specific/Axes/Axis_Template.TcPOU
@@ -10,7 +10,6 @@ END_VAR
       <ST><![CDATA[//Initial parameters of an Axis
 (*IF _TaskInfo[fbGetCurTaskIndex.index].FirstCycle THEN
     //Initial default values:
-    GVL.astAxes[1].stControl.fVelocity := GVL.astAxes[1].stConfig.fVelocityDefaultSlow;
     GVL.astAxes[1].stConfig.eHomeSeq := 0;
     GVL.astAxes[1].stConfig.fHomePosition := 0.0;
     GVL.astAxes[1].stConfig.fHomeFinishDistance := 0.0;
@@ -24,7 +23,6 @@ END_IF*)
       <LineId Id="20" Count="0" />
       <LineId Id="5" Count="0" />
       <LineId Id="13" Count="0" />
-      <LineId Id="15" Count="0" />
       <LineId Id="17" Count="2" />
       <LineId Id="14" Count="0" />
       <LineId Id="22" Count="0" />
diff --git a/solution/tc_project_app/tc_mca_std_lib b/solution/tc_project_app/tc_mca_std_lib
index 7e93c0d..bc5e78c 160000
--- a/solution/tc_project_app/tc_mca_std_lib
+++ b/solution/tc_project_app/tc_mca_std_lib
@@ -1 +1 @@
-Subproject commit 7e93c0d9ce769167525fd94a5d6fcb53764de897
+Subproject commit bc5e78c637180c1baec5294f4974dbd5dd4a9bed
diff --git a/solution/tc_project_app/tc_project_app.plcproj b/solution/tc_project_app/tc_project_app.plcproj
index 48db3f3..2d792b5 100644
--- a/solution/tc_project_app/tc_project_app.plcproj
+++ b/solution/tc_project_app/tc_project_app.plcproj
@@ -27,10 +27,10 @@
     <Compile Include="PlcTask.TcTTO">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="POUs\Application Specific\Applications\Application_Template.TcPOU">
+    <Compile Include="POUs\Application_Specific\Applications\Application_Template.TcPOU">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="POUs\Application Specific\Axes\Axis_Template.TcPOU">
+    <Compile Include="POUs\Application_Specific\Axes\Axis_Template.TcPOU">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="POUs\MAIN.TcPOU">
@@ -113,9 +113,8 @@
   <ItemGroup>
     <Folder Include="DUTs" />
     <Folder Include="GVLs" />
-    <Folder Include="POUs\Application Specific" />
-    <Folder Include="POUs\Application Specific\Applications" />
-    <Folder Include="POUs\Application Specific\Axes" />
+    <Folder Include="POUs\Application_Specific\Applications" />
+    <Folder Include="POUs\Application_Specific\Axes" />
     <Folder Include="tc_mca_std_lib\POUs\Motion\Homing" />
     <Folder Include="tc_mca_std_lib\VISUs" />
     <Folder Include="tc_mca_std_lib" />
@@ -124,6 +123,7 @@
     <Folder Include="tc_mca_std_lib\POUs" />
     <Folder Include="tc_mca_std_lib\POUs\Motion" />
     <Folder Include="POUs" />
+    <Folder Include="POUs\Application_Specific" />
   </ItemGroup>
   <ItemGroup>
     <PlaceholderReference Include="System_VisuElemMeter">