diff --git a/GUI/src/main/java/cz/fidentis/analyst/registration/ModelRotationAnimator.java b/GUI/src/main/java/cz/fidentis/analyst/registration/ModelRotationAnimator.java
index 0185c0149521e779965638eea12f3a534f4724a3..0ca7f89cbfe2b5fab7f83215e55ba7e6a7832a69 100644
--- a/GUI/src/main/java/cz/fidentis/analyst/registration/ModelRotationAnimator.java
+++ b/GUI/src/main/java/cz/fidentis/analyst/registration/ModelRotationAnimator.java
@@ -2,7 +2,6 @@ package cz.fidentis.analyst.registration;
 
 import cz.fidentis.analyst.gui.canvas.Direction;
 import com.jogamp.opengl.util.FPSAnimator;
-import cz.fidentis.analyst.gui.tab.PostRegistrationCP;
 import java.util.Timer;
 import java.util.TimerTask;
 
diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/tab/PostRegistrationCP.form b/GUI/src/main/java/cz/fidentis/analyst/registration/PostRegistrationCP.form
similarity index 86%
rename from GUI/src/main/java/cz/fidentis/analyst/gui/tab/PostRegistrationCP.form
rename to GUI/src/main/java/cz/fidentis/analyst/registration/PostRegistrationCP.form
index b263fb3124f20b47dac5c55d5fcade6c740535d7..28e193c2a3f5c80f2526c86d2868a89de4d1e7a5 100644
--- a/GUI/src/main/java/cz/fidentis/analyst/gui/tab/PostRegistrationCP.form
+++ b/GUI/src/main/java/cz/fidentis/analyst/registration/PostRegistrationCP.form
@@ -64,7 +64,7 @@
           <Font name="Tahoma" size="14" style="1"/>
         </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.registrationAdjustmentLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.registrationAdjustmentLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
@@ -83,7 +83,7 @@
               <Group type="102" attributes="0">
                   <EmptySpace max="-2" attributes="0"/>
                   <Group type="103" groupAlignment="0" max="-2" attributes="0">
-                      <Component id="jSeparator1" pref="371" max="32767" attributes="0"/>
+                      <Component id="jSeparator1" max="32767" attributes="0"/>
                       <Component id="jSeparator4" alignment="0" max="32767" attributes="0"/>
                       <Component id="jSeparator8" alignment="0" max="32767" attributes="0"/>
                       <Component id="visualizationLabel" alignment="0" min="-2" max="-2" attributes="0"/>
@@ -130,7 +130,7 @@
               <Font name="Tahoma" size="12" style="1"/>
             </Property>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.visualizationLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.visualizationLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
         </Component>
@@ -150,7 +150,7 @@
                       <Group type="103" groupAlignment="0" attributes="0">
                           <Component id="primaryLabel" alignment="0" min="-2" pref="58" max="-2" attributes="0"/>
                           <Component id="modelLabel" alignment="0" min="-2" max="-2" attributes="0"/>
-                          <Component id="secondaryLabel" alignment="0" pref="66" max="32767" attributes="0"/>
+                          <Component id="secondaryLabel" alignment="0" max="32767" attributes="0"/>
                       </Group>
                       <EmptySpace type="separate" max="-2" attributes="0"/>
                       <Group type="103" groupAlignment="0" attributes="0">
@@ -280,14 +280,14 @@
                   <Font name="Tahoma" size="11" style="3"/>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.modelLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.modelLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
               </Properties>
             </Component>
             <Component class="javax.swing.JLabel" name="pointsLabel">
               <Properties>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.pointsLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.pointsLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
               </Properties>
             </Component>
@@ -297,10 +297,10 @@
                   <Font name="Tahoma" size="11" style="1"/>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.transparencyButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.transparencyButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
                 <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.transparencyButton.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.transparencyButton.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
                 <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
                   <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
@@ -310,10 +310,6 @@
                 <Property name="cursor" type="java.awt.Cursor" editor="org.netbeans.modules.form.editors2.CursorEditor">
                   <Color id="Default Cursor"/>
                 </Property>
-                <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
-                  <Insets value="[0, 0, 0, 0]"/>
-                </Property>
-                <Property name="opaque" type="boolean" value="false"/>
               </Properties>
               <Events>
                 <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="transparencyButtonActionPerformed"/>
@@ -322,7 +318,7 @@
             <Component class="javax.swing.JLabel" name="linesLabel">
               <Properties>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.linesLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.linesLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
               </Properties>
             </Component>
@@ -332,10 +328,10 @@
                   <Font name="Tahoma" size="11" style="1"/>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.colorButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.colorButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
                 <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.colorButton.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.colorButton.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
                 <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
                   <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
@@ -347,10 +343,6 @@
                 </Property>
                 <Property name="horizontalTextPosition" type="int" value="0"/>
                 <Property name="iconTextGap" type="int" value="0"/>
-                <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
-                  <Insets value="[0, 0, 0, 0]"/>
-                </Property>
-                <Property name="opaque" type="boolean" value="false"/>
               </Properties>
               <Events>
                 <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="colorButtonActionPerformed"/>
@@ -359,7 +351,7 @@
             <Component class="javax.swing.JLabel" name="fillLabel">
               <Properties>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.fillLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.fillLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
               </Properties>
             </Component>
@@ -369,16 +361,15 @@
                   <Font name="Tahoma" size="11" style="1"/>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.renderModeLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.renderModeLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
               </Properties>
             </Component>
             <Component class="javax.swing.JCheckBox" name="secondaryHighlightsCB">
               <Properties>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.secondaryHighlightsCB.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.secondaryHighlightsCB.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
-                <Property name="opaque" type="boolean" value="false"/>
               </Properties>
               <Events>
                 <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="secondaryHighlightsCBActionPerformed"/>
@@ -387,9 +378,8 @@
             <Component class="javax.swing.JCheckBox" name="primaryHighlightsCB">
               <Properties>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.primaryHighlightsCB.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.primaryHighlightsCB.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
-                <Property name="opaque" type="boolean" value="false"/>
               </Properties>
               <Events>
                 <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="primaryHighlightsCBActionPerformed"/>
@@ -401,7 +391,7 @@
                   <Font name="Tahoma" size="11" style="1"/>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.highlightsLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.highlightsLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
               </Properties>
             </Component>
@@ -411,7 +401,7 @@
                   <Font name="Tahoma" size="11" style="1"/>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.primaryLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.primaryLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
               </Properties>
             </Component>
@@ -421,10 +411,10 @@
                   <Font name="Tahoma" size="11" style="1"/>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.secondaryLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.secondaryLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
                 <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.secondaryLabel.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.secondaryLabel.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
               </Properties>
             </Component>
@@ -436,13 +426,12 @@
                 <Property name="orientation" type="int" value="1"/>
                 <Property name="paintTicks" type="boolean" value="true"/>
                 <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.transparencySlider.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.transparencySlider.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
                 <Property name="value" type="int" value="10"/>
                 <Property name="cursor" type="java.awt.Cursor" editor="org.netbeans.modules.form.editors2.CursorEditor">
                   <Color id="Hand Cursor"/>
                 </Property>
-                <Property name="opaque" type="boolean" value="false"/>
               </Properties>
               <Events>
                 <EventHandler event="stateChanged" listener="javax.swing.event.ChangeListener" parameters="javax.swing.event.ChangeEvent" handler="transparencySliderStateChanged"/>
@@ -456,7 +445,7 @@
                   </Border>
                 </Property>
                 <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.secondaryColorPanel.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.secondaryColorPanel.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
                 <Property name="cursor" type="java.awt.Cursor" editor="org.netbeans.modules.form.editors2.CursorEditor">
                   <Color id="Hand Cursor"/>
@@ -490,7 +479,7 @@
                   </Border>
                 </Property>
                 <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.primaryColorPanel.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.primaryColorPanel.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
                 <Property name="cursor" type="java.awt.Cursor" editor="org.netbeans.modules.form.editors2.CursorEditor">
                   <Color id="Hand Cursor"/>
@@ -522,12 +511,8 @@
                   <ComponentRef name="primaryRenderModeGroup"/>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.primaryLinesRB.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.primaryLinesRB.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
-                <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
-                  <Insets value="[0, 0, 0, 0]"/>
-                </Property>
-                <Property name="opaque" type="boolean" value="false"/>
               </Properties>
               <Events>
                 <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="primaryLinesRBActionPerformed"/>
@@ -539,12 +524,8 @@
                   <ComponentRef name="secondaryRenerModeGroup"/>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.secondaryFillRB.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
-                </Property>
-                <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
-                  <Insets value="[0, 0, 0, 0]"/>
+                  <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.secondaryFillRB.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
-                <Property name="opaque" type="boolean" value="false"/>
               </Properties>
               <Events>
                 <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="secondaryFillRBActionPerformed"/>
@@ -556,12 +537,8 @@
                   <ComponentRef name="primaryRenderModeGroup"/>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.primaryPointsRB.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
-                </Property>
-                <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
-                  <Insets value="[0, 0, 0, 0]"/>
+                  <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.primaryPointsRB.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
-                <Property name="opaque" type="boolean" value="false"/>
               </Properties>
               <Events>
                 <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="primaryPointsRBActionPerformed"/>
@@ -573,12 +550,8 @@
                   <ComponentRef name="secondaryRenerModeGroup"/>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.secondaryPointsRB.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.secondaryPointsRB.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
-                <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
-                  <Insets value="[0, 0, 0, 0]"/>
-                </Property>
-                <Property name="opaque" type="boolean" value="false"/>
               </Properties>
               <Events>
                 <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="secondaryPointsRBActionPerformed"/>
@@ -590,12 +563,8 @@
                   <ComponentRef name="secondaryRenerModeGroup"/>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.secondaryLinesRB.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
-                </Property>
-                <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
-                  <Insets value="[0, 0, 0, 0]"/>
+                  <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.secondaryLinesRB.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
-                <Property name="opaque" type="boolean" value="false"/>
               </Properties>
               <Events>
                 <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="secondaryLinesRBActionPerformed"/>
@@ -607,12 +576,8 @@
                   <ComponentRef name="primaryRenderModeGroup"/>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.primaryFillRB.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.primaryFillRB.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
-                <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
-                  <Insets value="[0, 0, 0, 0]"/>
-                </Property>
-                <Property name="opaque" type="boolean" value="false"/>
               </Properties>
               <Events>
                 <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="primaryFillRBActionPerformed"/>
@@ -657,10 +622,10 @@
             <Component class="javax.swing.JButton" name="profileButton">
               <Properties>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.profileButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.profileButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
                 <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.profileButton.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.profileButton.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
                 <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
                   <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
@@ -670,10 +635,6 @@
                 <Property name="cursor" type="java.awt.Cursor" editor="org.netbeans.modules.form.editors2.CursorEditor">
                   <Color id="Default Cursor"/>
                 </Property>
-                <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
-                  <Insets value="[0, 0, 0, 0]"/>
-                </Property>
-                <Property name="opaque" type="boolean" value="false"/>
               </Properties>
               <Events>
                 <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="profileButtonActionPerformed"/>
@@ -682,10 +643,10 @@
             <Component class="javax.swing.JButton" name="frontButton">
               <Properties>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.frontButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.frontButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
                 <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.frontButton.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.frontButton.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
                 <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
                   <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
@@ -695,10 +656,6 @@
                 <Property name="cursor" type="java.awt.Cursor" editor="org.netbeans.modules.form.editors2.CursorEditor">
                   <Color id="Default Cursor"/>
                 </Property>
-                <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
-                  <Insets value="[0, 0, 0, 0]"/>
-                </Property>
-                <Property name="opaque" type="boolean" value="false"/>
               </Properties>
               <Events>
                 <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="frontButtonActionPerformed"/>
@@ -710,14 +667,14 @@
                   <Font name="Tahoma" size="11" style="3"/>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.viewLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.viewLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
               </Properties>
             </Component>
             <Component class="javax.swing.JToggleButton" name="backfaceButton">
               <Properties>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.backfaceButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.backfaceButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
                 <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
                   <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
@@ -773,16 +730,13 @@
             <Component class="javax.swing.JToggleButton" name="featurePointsButton">
               <Properties>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.featurePointsButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.featurePointsButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
                 <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
                   <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
                     <TitledBorder/>
                   </Border>
                 </Property>
-                <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
-                  <Insets value="[0, 0, 0, 0]"/>
-                </Property>
               </Properties>
               <Events>
                 <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="featurePointsButtonActionPerformed"/>
@@ -794,7 +748,7 @@
                   <Image iconType="3" name="/subtract-line.png"/>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.thresholdDownButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.thresholdDownButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
                 <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
                   <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
@@ -805,16 +759,12 @@
                   <Color id="Default Cursor"/>
                 </Property>
                 <Property name="enabled" type="boolean" value="false"/>
-                <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
-                  <Insets value="[0, 0, 0, 0]"/>
-                </Property>
                 <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
                   <Dimension value="[24, 24]"/>
                 </Property>
                 <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
                   <Dimension value="[24, 24]"/>
                 </Property>
-                <Property name="opaque" type="boolean" value="false"/>
                 <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
                   <Dimension value="[24, 24]"/>
                 </Property>
@@ -829,7 +779,7 @@
                   <Image iconType="3" name="/add-line.png"/>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.thersholdUpButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.thersholdUpButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
                 <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
                   <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
@@ -840,9 +790,6 @@
                   <Color id="Default Cursor"/>
                 </Property>
                 <Property name="enabled" type="boolean" value="false"/>
-                <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
-                  <Insets value="[0, 0, 0, 0]"/>
-                </Property>
                 <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
                   <Dimension value="[24, 24]"/>
                 </Property>
@@ -863,7 +810,7 @@
                   <Font name="Tahoma" size="11" style="1"/>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.thersholdButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.thersholdButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
                 <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
                   <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
@@ -871,7 +818,6 @@
                   </Border>
                 </Property>
                 <Property name="enabled" type="boolean" value="false"/>
-                <Property name="opaque" type="boolean" value="false"/>
               </Properties>
               <Events>
                 <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="thersholdButtonActionPerformed"/>
@@ -894,7 +840,7 @@
                   <Font name="Tahoma" size="11" style="3"/>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.featurePointsLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.featurePointsLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
               </Properties>
             </Component>
@@ -945,7 +891,7 @@
                                   </Group>
                               </Group>
                           </Group>
-                          <EmptySpace min="0" pref="9" max="32767" attributes="0"/>
+                          <EmptySpace min="0" pref="5" max="32767" attributes="0"/>
                       </Group>
                   </Group>
                   <EmptySpace max="-2" attributes="0"/>
@@ -986,7 +932,7 @@
                               <Component id="shiftPanel" min="-2" max="-2" attributes="0"/>
                               <Component id="resetAllButton" alignment="0" min="-2" max="-2" attributes="0"/>
                           </Group>
-                          <EmptySpace pref="9" max="32767" attributes="0"/>
+                          <EmptySpace max="32767" attributes="0"/>
                       </Group>
                   </Group>
                   <Component id="jSeparator5" min="-2" pref="10" max="-2" attributes="0"/>
@@ -1001,7 +947,7 @@
               <Font name="Tahoma" size="12" style="1"/>
             </Property>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.transformationLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.transformationLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
         </Component>
@@ -1115,10 +1061,10 @@
                   <Image iconType="3" name="/restart-line.png"/>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.translationButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.translationButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
                 <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.translationButton.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.translationButton.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
                 <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
                   <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
@@ -1131,7 +1077,6 @@
                 <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
                   <Insets value="[2, 2, 2, 2]"/>
                 </Property>
-                <Property name="opaque" type="boolean" value="false"/>
               </Properties>
               <Events>
                 <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="translationButtonActionPerformed"/>
@@ -1143,7 +1088,7 @@
                   <Font name="Tahoma" size="11" style="3"/>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.jLabel2.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.jLabel2.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
               </Properties>
             </Component>
@@ -1153,7 +1098,7 @@
                   <Image iconType="3" name="/arrow-right-s-line.png"/>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.rightTranslationXButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.rightTranslationXButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
                 <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
                   <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
@@ -1172,7 +1117,6 @@
                 <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
                   <Dimension value="[24, 24]"/>
                 </Property>
-                <Property name="opaque" type="boolean" value="false"/>
                 <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
                   <Dimension value="[24, 24]"/>
                 </Property>
@@ -1188,7 +1132,7 @@
                   <Format subtype="0" type="0"/>
                 </Property>
                 <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.translationXFTF.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.translationXFTF.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
                 <Property name="cursor" type="java.awt.Cursor" editor="org.netbeans.modules.form.editors2.CursorEditor">
                   <Color id="Text Cursor"/>
@@ -1204,7 +1148,7 @@
                   <Image iconType="3" name="/arrow-left-s-line.png"/>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.leftTranslationYButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.leftTranslationYButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
                 <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
                   <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
@@ -1217,7 +1161,6 @@
                 <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
                   <Insets value="[2, 2, 2, 2]"/>
                 </Property>
-                <Property name="opaque" type="boolean" value="false"/>
                 <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
                   <Dimension value="[24, 24]"/>
                 </Property>
@@ -1243,7 +1186,7 @@
                   <Image iconType="3" name="/arrow-right-s-line.png"/>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.rightTranslationYButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.rightTranslationYButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
                 <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
                   <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
@@ -1256,7 +1199,6 @@
                 <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
                   <Insets value="[2, 2, 2, 2]"/>
                 </Property>
-                <Property name="opaque" type="boolean" value="false"/>
                 <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
                   <Dimension value="[24, 24]"/>
                 </Property>
@@ -1272,7 +1214,7 @@
                   <Font name="Tahoma" size="11" style="1"/>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.translXLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.translXLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
               </Properties>
             </Component>
@@ -1292,7 +1234,7 @@
                   <Font name="Tahoma" size="11" style="1"/>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.translZLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.translZLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
               </Properties>
             </Component>
@@ -1302,7 +1244,7 @@
                   <Font name="Tahoma" size="11" style="1"/>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.translYLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.translYLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
               </Properties>
             </Component>
@@ -1312,7 +1254,7 @@
                   <Image iconType="3" name="/arrow-right-s-line.png"/>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.rightTranslationZButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.rightTranslationZButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
                 <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
                   <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
@@ -1325,7 +1267,6 @@
                 <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
                   <Insets value="[2, 2, 2, 2]"/>
                 </Property>
-                <Property name="opaque" type="boolean" value="false"/>
                 <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
                   <Dimension value="[24, 24]"/>
                 </Property>
@@ -1341,7 +1282,7 @@
                   <Image iconType="3" name="/arrow-left-s-line.png"/>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.leftTranslationXButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.leftTranslationXButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
                 <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
                   <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
@@ -1360,7 +1301,6 @@
                 <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
                   <Dimension value="[24, 24]"/>
                 </Property>
-                <Property name="opaque" type="boolean" value="false"/>
                 <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
                   <Dimension value="[24, 24]"/>
                 </Property>
@@ -1376,7 +1316,7 @@
                   <Image iconType="3" name="/arrow-left-s-line.png"/>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.leftTranslationZButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.leftTranslationZButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
                 <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
                   <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
@@ -1389,7 +1329,6 @@
                 <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
                   <Insets value="[2, 2, 2, 2]"/>
                 </Property>
-                <Property name="opaque" type="boolean" value="false"/>
                 <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
                   <Dimension value="[24, 24]"/>
                 </Property>
@@ -1512,7 +1451,7 @@
                   <Image iconType="3" name="/arrow-left-s-line.png"/>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.leftRotationYButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.leftRotationYButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
                 <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
                   <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
@@ -1531,7 +1470,6 @@
                 <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
                   <Dimension value="[24, 24]"/>
                 </Property>
-                <Property name="opaque" type="boolean" value="false"/>
                 <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
                   <Dimension value="[24, 24]"/>
                 </Property>
@@ -1547,7 +1485,7 @@
                   <Image iconType="3" name="/arrow-left-s-line.png"/>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.leftRotationXButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.leftRotationXButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
                 <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
                   <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
@@ -1560,7 +1498,6 @@
                 <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
                   <Insets value="[2, 2, 2, 2]"/>
                 </Property>
-                <Property name="opaque" type="boolean" value="false"/>
                 <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
                   <Dimension value="[24, 24]"/>
                 </Property>
@@ -1576,7 +1513,7 @@
                   <Font name="Tahoma" size="11" style="1"/>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.rotatZLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.rotatZLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
               </Properties>
             </Component>
@@ -1586,7 +1523,7 @@
                   <Font name="Tahoma" size="11" style="1"/>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.rotatYLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.rotatYLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
               </Properties>
             </Component>
@@ -1596,7 +1533,7 @@
                   <Font name="Tahoma" size="11" style="1"/>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.rotatXLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.rotatXLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
               </Properties>
             </Component>
@@ -1606,10 +1543,10 @@
                   <Image iconType="3" name="/restart-line.png"/>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.rotationButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.rotationButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
                 <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.rotationButton.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.rotationButton.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
                 <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
                   <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
@@ -1622,7 +1559,6 @@
                 <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
                   <Insets value="[2, 2, 2, 2]"/>
                 </Property>
-                <Property name="opaque" type="boolean" value="false"/>
               </Properties>
               <Events>
                 <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="rotationButtonActionPerformed"/>
@@ -1654,7 +1590,7 @@
                   <Image iconType="3" name="/arrow-right-s-line.png"/>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.rightRotationZButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.rightRotationZButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
                 <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
                   <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
@@ -1673,7 +1609,6 @@
                 <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
                   <Dimension value="[24, 24]"/>
                 </Property>
-                <Property name="opaque" type="boolean" value="false"/>
                 <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
                   <Dimension value="[24, 24]"/>
                 </Property>
@@ -1689,7 +1624,7 @@
                   <Image iconType="3" name="/arrow-right-s-line.png"/>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.rightRotationYButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.rightRotationYButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
                 <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
                   <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
@@ -1708,7 +1643,6 @@
                 <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
                   <Dimension value="[24, 24]"/>
                 </Property>
-                <Property name="opaque" type="boolean" value="false"/>
                 <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
                   <Dimension value="[24, 24]"/>
                 </Property>
@@ -1724,7 +1658,7 @@
                   <Image iconType="3" name="/arrow-left-s-line.png"/>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.leftRotationZButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.leftRotationZButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
                 <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
                   <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
@@ -1743,7 +1677,6 @@
                 <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
                   <Dimension value="[24, 24]"/>
                 </Property>
-                <Property name="opaque" type="boolean" value="false"/>
                 <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
                   <Dimension value="[24, 24]"/>
                 </Property>
@@ -1759,7 +1692,7 @@
                   <Image iconType="3" name="/arrow-right-s-line.png"/>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.rightRotationXButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.rightRotationXButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
                 <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
                   <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
@@ -1778,7 +1711,6 @@
                 <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
                   <Dimension value="[24, 24]"/>
                 </Property>
-                <Property name="opaque" type="boolean" value="false"/>
                 <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
                   <Dimension value="[24, 24]"/>
                 </Property>
@@ -1794,7 +1726,7 @@
                   <Format subtype="0" type="0"/>
                 </Property>
                 <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.rotationXFTF.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.rotationXFTF.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
               </Properties>
               <Events>
@@ -1807,7 +1739,7 @@
                   <Font name="Tahoma" size="11" style="3"/>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.jLabel3.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.jLabel3.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
               </Properties>
             </Component>
@@ -1874,7 +1806,7 @@
                   <Font name="Tahoma" size="11" style="3"/>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.jLabel4.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.jLabel4.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
               </Properties>
             </Component>
@@ -1884,7 +1816,7 @@
                   <Image iconType="3" name="/add-line.png"/>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.scalePlusButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.scalePlusButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
                 <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
                   <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
@@ -1903,7 +1835,6 @@
                 <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
                   <Dimension value="[24, 24]"/>
                 </Property>
-                <Property name="opaque" type="boolean" value="false"/>
                 <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
                   <Dimension value="[24, 24]"/>
                 </Property>
@@ -1919,7 +1850,7 @@
                   <Image iconType="3" name="/subtract-line.png"/>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.scaleMinusButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.scaleMinusButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
                 <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
                   <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
@@ -1938,7 +1869,6 @@
                 <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
                   <Dimension value="[24, 24]"/>
                 </Property>
-                <Property name="opaque" type="boolean" value="false"/>
                 <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
                   <Dimension value="[24, 24]"/>
                 </Property>
@@ -1954,7 +1884,7 @@
                   <Format subtype="0" type="0"/>
                 </Property>
                 <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.scaleFTF.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.scaleFTF.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
               </Properties>
               <Events>
@@ -1967,10 +1897,10 @@
                   <Image iconType="3" name="/restart-line.png"/>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.scaleButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.scaleButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
                 <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.scaleButton.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.scaleButton.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
                 <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
                   <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
@@ -1983,7 +1913,6 @@
                 <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
                   <Insets value="[2, 2, 2, 2]"/>
                 </Property>
-                <Property name="opaque" type="boolean" value="false"/>
               </Properties>
               <Events>
                 <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="scaleButtonActionPerformed"/>
@@ -1997,10 +1926,10 @@
               <Image iconType="3" name="/refresh-line.png"/>
             </Property>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.resetAllButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.resetAllButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
             <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.resetAllButton.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.resetAllButton.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
             <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
               <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
@@ -2063,10 +1992,10 @@
                   <Font name="Tahoma" size="11" style="1"/>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.shiftLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.shiftLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
                 <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.shiftLabel.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.shiftLabel.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
               </Properties>
             </Component>
@@ -2076,12 +2005,11 @@
                   <ComponentRef name="precisionGroup"/>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.lowShiftRB.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.lowShiftRB.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
                 <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.lowShiftRB.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.lowShiftRB.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
-                <Property name="opaque" type="boolean" value="false"/>
               </Properties>
               <Events>
                 <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="lowShiftRBActionPerformed"/>
@@ -2093,12 +2021,11 @@
                   <ComponentRef name="precisionGroup"/>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.highShiftRB.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.highShiftRB.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
                 <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.highShiftRB.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.highShiftRB.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
-                <Property name="opaque" type="boolean" value="false"/>
               </Properties>
               <Events>
                 <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="highShiftRBActionPerformed"/>
@@ -2114,10 +2041,10 @@
         <Component class="javax.swing.JButton" name="applyButton">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.applyButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.applyButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
             <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.applyButton.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="cz/fidentis/analyst/registration/Bundle.properties" key="PostRegistrationCP.applyButton.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
             <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
               <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
@@ -2127,10 +2054,6 @@
             <Property name="cursor" type="java.awt.Cursor" editor="org.netbeans.modules.form.editors2.CursorEditor">
               <Color id="Hand Cursor"/>
             </Property>
-            <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
-              <Insets value="[0, 0, 0, 0]"/>
-            </Property>
-            <Property name="opaque" type="boolean" value="false"/>
           </Properties>
           <Events>
             <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="applyButtonActionPerformed"/>
diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/tab/PostRegistrationCP.java b/GUI/src/main/java/cz/fidentis/analyst/registration/PostRegistrationCP.java
similarity index 96%
rename from GUI/src/main/java/cz/fidentis/analyst/gui/tab/PostRegistrationCP.java
rename to GUI/src/main/java/cz/fidentis/analyst/registration/PostRegistrationCP.java
index 24ad63516e2283f27cf4e71ea42d7f96657df725..28531f50fc68bee2aef7791f641b5c00b8ff57b4 100644
--- a/GUI/src/main/java/cz/fidentis/analyst/gui/tab/PostRegistrationCP.java
+++ b/GUI/src/main/java/cz/fidentis/analyst/registration/PostRegistrationCP.java
@@ -1,13 +1,13 @@
-package cz.fidentis.analyst.gui.tab;
+package cz.fidentis.analyst.registration;
 
 import cz.fidentis.analyst.gui.canvas.Direction;
-import cz.fidentis.analyst.registration.RegistrationCPEventListener;
+import cz.fidentis.analyst.registration.PostRegistrationListener;
 import cz.fidentis.analyst.registration.ModelRotationAnimator;
 import java.awt.Color;
 import javax.swing.JColorChooser;
 
 /**
- * Panel used to interactivly visualize two face and adjust their registration.
+ * Panel used to interactively visualize two face and adjust their registration.
  * 
  * @author Richard Pajersky
  */
@@ -17,7 +17,7 @@ public class PostRegistrationCP extends javax.swing.JPanel {
      * Listener which translates executed actions 
      * into {@link cz.fidentis.analyst.gui.scene.DrawableMesh}
      */
-    private RegistrationCPEventListener listener;
+    private PostRegistrationListener listener;
     /**
      * Animator which animates transformations
      */
@@ -28,7 +28,7 @@ public class PostRegistrationCP extends javax.swing.JPanel {
      * 
      * @param listener Listener
      */
-    public void initPostRegistrationCP(RegistrationCPEventListener listener) {
+    public void initPostRegistrationCP(PostRegistrationListener listener) {
         initComponents();
         this.listener = listener;
         setDefaults();
@@ -38,8 +38,8 @@ public class PostRegistrationCP extends javax.swing.JPanel {
      * Additional initialization of panel
      */
     private void setDefaults() {
-        primaryColorPanel.setBackground(RegistrationCPEventListener.DEFAULT_PRIMARY_COLOR);
-        secondaryColorPanel.setBackground(RegistrationCPEventListener.DEFAULT_SECONDARY_COLOR);
+        primaryColorPanel.setBackground(PostRegistrationListener.DEFAULT_PRIMARY_COLOR);
+        secondaryColorPanel.setBackground(PostRegistrationListener.DEFAULT_SECONDARY_COLOR);
         primaryFillRB.setSelected(true);
         secondaryFillRB.setSelected(true);
         lowShiftRB.setSelected(true);
@@ -246,8 +246,6 @@ public class PostRegistrationCP extends javax.swing.JPanel {
         transparencyButton.setToolTipText(org.openide.util.NbBundle.getMessage(PostRegistrationCP.class, "PostRegistrationCP.transparencyButton.toolTipText")); // NOI18N
         transparencyButton.setBorder(javax.swing.BorderFactory.createTitledBorder(""));
         transparencyButton.setCursor(new java.awt.Cursor(java.awt.Cursor.DEFAULT_CURSOR));
-        transparencyButton.setMargin(new java.awt.Insets(0, 0, 0, 0));
-        transparencyButton.setOpaque(false);
         transparencyButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 transparencyButtonActionPerformed(evt);
@@ -263,8 +261,6 @@ public class PostRegistrationCP extends javax.swing.JPanel {
         colorButton.setCursor(new java.awt.Cursor(java.awt.Cursor.DEFAULT_CURSOR));
         colorButton.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
         colorButton.setIconTextGap(0);
-        colorButton.setMargin(new java.awt.Insets(0, 0, 0, 0));
-        colorButton.setOpaque(false);
         colorButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 colorButtonActionPerformed(evt);
@@ -277,7 +273,6 @@ public class PostRegistrationCP extends javax.swing.JPanel {
         org.openide.awt.Mnemonics.setLocalizedText(renderModeLabel, org.openide.util.NbBundle.getMessage(PostRegistrationCP.class, "PostRegistrationCP.renderModeLabel.text")); // NOI18N
 
         org.openide.awt.Mnemonics.setLocalizedText(secondaryHighlightsCB, org.openide.util.NbBundle.getMessage(PostRegistrationCP.class, "PostRegistrationCP.secondaryHighlightsCB.text")); // NOI18N
-        secondaryHighlightsCB.setOpaque(false);
         secondaryHighlightsCB.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 secondaryHighlightsCBActionPerformed(evt);
@@ -285,7 +280,6 @@ public class PostRegistrationCP extends javax.swing.JPanel {
         });
 
         org.openide.awt.Mnemonics.setLocalizedText(primaryHighlightsCB, org.openide.util.NbBundle.getMessage(PostRegistrationCP.class, "PostRegistrationCP.primaryHighlightsCB.text")); // NOI18N
-        primaryHighlightsCB.setOpaque(false);
         primaryHighlightsCB.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 primaryHighlightsCBActionPerformed(evt);
@@ -310,7 +304,6 @@ public class PostRegistrationCP extends javax.swing.JPanel {
         transparencySlider.setToolTipText(org.openide.util.NbBundle.getMessage(PostRegistrationCP.class, "PostRegistrationCP.transparencySlider.toolTipText")); // NOI18N
         transparencySlider.setValue(10);
         transparencySlider.setCursor(new java.awt.Cursor(java.awt.Cursor.HAND_CURSOR));
-        transparencySlider.setOpaque(false);
         transparencySlider.addChangeListener(new javax.swing.event.ChangeListener() {
             public void stateChanged(javax.swing.event.ChangeEvent evt) {
                 transparencySliderStateChanged(evt);
@@ -361,8 +354,6 @@ public class PostRegistrationCP extends javax.swing.JPanel {
 
         primaryRenderModeGroup.add(primaryLinesRB);
         org.openide.awt.Mnemonics.setLocalizedText(primaryLinesRB, org.openide.util.NbBundle.getMessage(PostRegistrationCP.class, "PostRegistrationCP.primaryLinesRB.text")); // NOI18N
-        primaryLinesRB.setMargin(new java.awt.Insets(0, 0, 0, 0));
-        primaryLinesRB.setOpaque(false);
         primaryLinesRB.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 primaryLinesRBActionPerformed(evt);
@@ -371,8 +362,6 @@ public class PostRegistrationCP extends javax.swing.JPanel {
 
         secondaryRenerModeGroup.add(secondaryFillRB);
         org.openide.awt.Mnemonics.setLocalizedText(secondaryFillRB, org.openide.util.NbBundle.getMessage(PostRegistrationCP.class, "PostRegistrationCP.secondaryFillRB.text")); // NOI18N
-        secondaryFillRB.setMargin(new java.awt.Insets(0, 0, 0, 0));
-        secondaryFillRB.setOpaque(false);
         secondaryFillRB.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 secondaryFillRBActionPerformed(evt);
@@ -381,8 +370,6 @@ public class PostRegistrationCP extends javax.swing.JPanel {
 
         primaryRenderModeGroup.add(primaryPointsRB);
         org.openide.awt.Mnemonics.setLocalizedText(primaryPointsRB, org.openide.util.NbBundle.getMessage(PostRegistrationCP.class, "PostRegistrationCP.primaryPointsRB.text")); // NOI18N
-        primaryPointsRB.setMargin(new java.awt.Insets(0, 0, 0, 0));
-        primaryPointsRB.setOpaque(false);
         primaryPointsRB.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 primaryPointsRBActionPerformed(evt);
@@ -391,8 +378,6 @@ public class PostRegistrationCP extends javax.swing.JPanel {
 
         secondaryRenerModeGroup.add(secondaryPointsRB);
         org.openide.awt.Mnemonics.setLocalizedText(secondaryPointsRB, org.openide.util.NbBundle.getMessage(PostRegistrationCP.class, "PostRegistrationCP.secondaryPointsRB.text")); // NOI18N
-        secondaryPointsRB.setMargin(new java.awt.Insets(0, 0, 0, 0));
-        secondaryPointsRB.setOpaque(false);
         secondaryPointsRB.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 secondaryPointsRBActionPerformed(evt);
@@ -401,8 +386,6 @@ public class PostRegistrationCP extends javax.swing.JPanel {
 
         secondaryRenerModeGroup.add(secondaryLinesRB);
         org.openide.awt.Mnemonics.setLocalizedText(secondaryLinesRB, org.openide.util.NbBundle.getMessage(PostRegistrationCP.class, "PostRegistrationCP.secondaryLinesRB.text")); // NOI18N
-        secondaryLinesRB.setMargin(new java.awt.Insets(0, 0, 0, 0));
-        secondaryLinesRB.setOpaque(false);
         secondaryLinesRB.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 secondaryLinesRBActionPerformed(evt);
@@ -411,8 +394,6 @@ public class PostRegistrationCP extends javax.swing.JPanel {
 
         primaryRenderModeGroup.add(primaryFillRB);
         org.openide.awt.Mnemonics.setLocalizedText(primaryFillRB, org.openide.util.NbBundle.getMessage(PostRegistrationCP.class, "PostRegistrationCP.primaryFillRB.text")); // NOI18N
-        primaryFillRB.setMargin(new java.awt.Insets(0, 0, 0, 0));
-        primaryFillRB.setOpaque(false);
         primaryFillRB.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 primaryFillRBActionPerformed(evt);
@@ -427,7 +408,7 @@ public class PostRegistrationCP extends javax.swing.JPanel {
                 .addGroup(modelPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                     .addComponent(primaryLabel, javax.swing.GroupLayout.PREFERRED_SIZE, 58, javax.swing.GroupLayout.PREFERRED_SIZE)
                     .addComponent(modelLabel)
-                    .addComponent(secondaryLabel, javax.swing.GroupLayout.DEFAULT_SIZE, 66, Short.MAX_VALUE))
+                    .addComponent(secondaryLabel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
                 .addGap(18, 18, 18)
                 .addGroup(modelPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                     .addGroup(modelPanelLayout.createSequentialGroup()
@@ -525,8 +506,6 @@ public class PostRegistrationCP extends javax.swing.JPanel {
         profileButton.setToolTipText(org.openide.util.NbBundle.getMessage(PostRegistrationCP.class, "PostRegistrationCP.profileButton.toolTipText")); // NOI18N
         profileButton.setBorder(javax.swing.BorderFactory.createTitledBorder(""));
         profileButton.setCursor(new java.awt.Cursor(java.awt.Cursor.DEFAULT_CURSOR));
-        profileButton.setMargin(new java.awt.Insets(0, 0, 0, 0));
-        profileButton.setOpaque(false);
         profileButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 profileButtonActionPerformed(evt);
@@ -537,8 +516,6 @@ public class PostRegistrationCP extends javax.swing.JPanel {
         frontButton.setToolTipText(org.openide.util.NbBundle.getMessage(PostRegistrationCP.class, "PostRegistrationCP.frontButton.toolTipText")); // NOI18N
         frontButton.setBorder(javax.swing.BorderFactory.createTitledBorder(""));
         frontButton.setCursor(new java.awt.Cursor(java.awt.Cursor.DEFAULT_CURSOR));
-        frontButton.setMargin(new java.awt.Insets(0, 0, 0, 0));
-        frontButton.setOpaque(false);
         frontButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 frontButtonActionPerformed(evt);
@@ -583,7 +560,6 @@ public class PostRegistrationCP extends javax.swing.JPanel {
 
         org.openide.awt.Mnemonics.setLocalizedText(featurePointsButton, org.openide.util.NbBundle.getMessage(PostRegistrationCP.class, "PostRegistrationCP.featurePointsButton.text")); // NOI18N
         featurePointsButton.setBorder(javax.swing.BorderFactory.createTitledBorder(""));
-        featurePointsButton.setMargin(new java.awt.Insets(0, 0, 0, 0));
         featurePointsButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 featurePointsButtonActionPerformed(evt);
@@ -595,10 +571,8 @@ public class PostRegistrationCP extends javax.swing.JPanel {
         thresholdDownButton.setBorder(javax.swing.BorderFactory.createTitledBorder(""));
         thresholdDownButton.setCursor(new java.awt.Cursor(java.awt.Cursor.DEFAULT_CURSOR));
         thresholdDownButton.setEnabled(false);
-        thresholdDownButton.setMargin(new java.awt.Insets(0, 0, 0, 0));
         thresholdDownButton.setMaximumSize(new java.awt.Dimension(24, 24));
         thresholdDownButton.setMinimumSize(new java.awt.Dimension(24, 24));
-        thresholdDownButton.setOpaque(false);
         thresholdDownButton.setPreferredSize(new java.awt.Dimension(24, 24));
         thresholdDownButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -611,7 +585,6 @@ public class PostRegistrationCP extends javax.swing.JPanel {
         thersholdUpButton.setBorder(javax.swing.BorderFactory.createTitledBorder(""));
         thersholdUpButton.setCursor(new java.awt.Cursor(java.awt.Cursor.DEFAULT_CURSOR));
         thersholdUpButton.setEnabled(false);
-        thersholdUpButton.setMargin(new java.awt.Insets(0, 0, 0, 0));
         thersholdUpButton.setMaximumSize(new java.awt.Dimension(24, 24));
         thersholdUpButton.setMinimumSize(new java.awt.Dimension(24, 24));
         thersholdUpButton.setPreferredSize(new java.awt.Dimension(24, 24));
@@ -625,7 +598,6 @@ public class PostRegistrationCP extends javax.swing.JPanel {
         org.openide.awt.Mnemonics.setLocalizedText(thersholdButton, org.openide.util.NbBundle.getMessage(PostRegistrationCP.class, "PostRegistrationCP.thersholdButton.text")); // NOI18N
         thersholdButton.setBorder(javax.swing.BorderFactory.createTitledBorder(""));
         thersholdButton.setEnabled(false);
-        thersholdButton.setOpaque(false);
         thersholdButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 thersholdButtonActionPerformed(evt);
@@ -678,7 +650,7 @@ public class PostRegistrationCP extends javax.swing.JPanel {
             .addGroup(visualizationPanelLayout.createSequentialGroup()
                 .addContainerGap()
                 .addGroup(visualizationPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
-                    .addComponent(jSeparator1, javax.swing.GroupLayout.DEFAULT_SIZE, 371, Short.MAX_VALUE)
+                    .addComponent(jSeparator1)
                     .addComponent(jSeparator4)
                     .addComponent(jSeparator8)
                     .addComponent(visualizationLabel)
@@ -723,7 +695,6 @@ public class PostRegistrationCP extends javax.swing.JPanel {
         translationButton.setBorder(javax.swing.BorderFactory.createTitledBorder(""));
         translationButton.setCursor(new java.awt.Cursor(java.awt.Cursor.DEFAULT_CURSOR));
         translationButton.setMargin(new java.awt.Insets(2, 2, 2, 2));
-        translationButton.setOpaque(false);
         translationButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 translationButtonActionPerformed(evt);
@@ -740,7 +711,6 @@ public class PostRegistrationCP extends javax.swing.JPanel {
         rightTranslationXButton.setMargin(new java.awt.Insets(2, 2, 2, 2));
         rightTranslationXButton.setMaximumSize(new java.awt.Dimension(24, 24));
         rightTranslationXButton.setMinimumSize(new java.awt.Dimension(24, 24));
-        rightTranslationXButton.setOpaque(false);
         rightTranslationXButton.setPreferredSize(new java.awt.Dimension(24, 24));
         rightTranslationXButton.addMouseListener(new java.awt.event.MouseAdapter() {
             public void mousePressed(java.awt.event.MouseEvent evt) {
@@ -765,7 +735,6 @@ public class PostRegistrationCP extends javax.swing.JPanel {
         leftTranslationYButton.setBorder(javax.swing.BorderFactory.createTitledBorder(""));
         leftTranslationYButton.setCursor(new java.awt.Cursor(java.awt.Cursor.DEFAULT_CURSOR));
         leftTranslationYButton.setMargin(new java.awt.Insets(2, 2, 2, 2));
-        leftTranslationYButton.setOpaque(false);
         leftTranslationYButton.setPreferredSize(new java.awt.Dimension(24, 24));
         leftTranslationYButton.addMouseListener(new java.awt.event.MouseAdapter() {
             public void mousePressed(java.awt.event.MouseEvent evt) {
@@ -788,7 +757,6 @@ public class PostRegistrationCP extends javax.swing.JPanel {
         rightTranslationYButton.setBorder(javax.swing.BorderFactory.createTitledBorder(""));
         rightTranslationYButton.setCursor(new java.awt.Cursor(java.awt.Cursor.DEFAULT_CURSOR));
         rightTranslationYButton.setMargin(new java.awt.Insets(2, 2, 2, 2));
-        rightTranslationYButton.setOpaque(false);
         rightTranslationYButton.setPreferredSize(new java.awt.Dimension(24, 24));
         rightTranslationYButton.addMouseListener(new java.awt.event.MouseAdapter() {
             public void mousePressed(java.awt.event.MouseEvent evt) {
@@ -820,7 +788,6 @@ public class PostRegistrationCP extends javax.swing.JPanel {
         rightTranslationZButton.setBorder(javax.swing.BorderFactory.createTitledBorder(""));
         rightTranslationZButton.setCursor(new java.awt.Cursor(java.awt.Cursor.DEFAULT_CURSOR));
         rightTranslationZButton.setMargin(new java.awt.Insets(2, 2, 2, 2));
-        rightTranslationZButton.setOpaque(false);
         rightTranslationZButton.setPreferredSize(new java.awt.Dimension(24, 24));
         rightTranslationZButton.addMouseListener(new java.awt.event.MouseAdapter() {
             public void mousePressed(java.awt.event.MouseEvent evt) {
@@ -838,7 +805,6 @@ public class PostRegistrationCP extends javax.swing.JPanel {
         leftTranslationXButton.setMargin(new java.awt.Insets(2, 2, 2, 2));
         leftTranslationXButton.setMaximumSize(new java.awt.Dimension(24, 24));
         leftTranslationXButton.setMinimumSize(new java.awt.Dimension(24, 24));
-        leftTranslationXButton.setOpaque(false);
         leftTranslationXButton.setPreferredSize(new java.awt.Dimension(24, 24));
         leftTranslationXButton.addMouseListener(new java.awt.event.MouseAdapter() {
             public void mousePressed(java.awt.event.MouseEvent evt) {
@@ -854,7 +820,6 @@ public class PostRegistrationCP extends javax.swing.JPanel {
         leftTranslationZButton.setBorder(javax.swing.BorderFactory.createTitledBorder(""));
         leftTranslationZButton.setCursor(new java.awt.Cursor(java.awt.Cursor.DEFAULT_CURSOR));
         leftTranslationZButton.setMargin(new java.awt.Insets(2, 2, 2, 2));
-        leftTranslationZButton.setOpaque(false);
         leftTranslationZButton.setPreferredSize(new java.awt.Dimension(24, 24));
         leftTranslationZButton.addMouseListener(new java.awt.event.MouseAdapter() {
             public void mousePressed(java.awt.event.MouseEvent evt) {
@@ -944,7 +909,6 @@ public class PostRegistrationCP extends javax.swing.JPanel {
         leftRotationYButton.setMargin(new java.awt.Insets(2, 2, 2, 2));
         leftRotationYButton.setMaximumSize(new java.awt.Dimension(24, 24));
         leftRotationYButton.setMinimumSize(new java.awt.Dimension(24, 24));
-        leftRotationYButton.setOpaque(false);
         leftRotationYButton.setPreferredSize(new java.awt.Dimension(24, 24));
         leftRotationYButton.addMouseListener(new java.awt.event.MouseAdapter() {
             public void mousePressed(java.awt.event.MouseEvent evt) {
@@ -960,7 +924,6 @@ public class PostRegistrationCP extends javax.swing.JPanel {
         leftRotationXButton.setBorder(javax.swing.BorderFactory.createTitledBorder(""));
         leftRotationXButton.setCursor(new java.awt.Cursor(java.awt.Cursor.DEFAULT_CURSOR));
         leftRotationXButton.setMargin(new java.awt.Insets(2, 2, 2, 2));
-        leftRotationXButton.setOpaque(false);
         leftRotationXButton.setPreferredSize(new java.awt.Dimension(24, 24));
         leftRotationXButton.addMouseListener(new java.awt.event.MouseAdapter() {
             public void mousePressed(java.awt.event.MouseEvent evt) {
@@ -986,7 +949,6 @@ public class PostRegistrationCP extends javax.swing.JPanel {
         rotationButton.setBorder(javax.swing.BorderFactory.createTitledBorder(""));
         rotationButton.setCursor(new java.awt.Cursor(java.awt.Cursor.DEFAULT_CURSOR));
         rotationButton.setMargin(new java.awt.Insets(2, 2, 2, 2));
-        rotationButton.setOpaque(false);
         rotationButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 rotationButtonActionPerformed(evt);
@@ -1014,7 +976,6 @@ public class PostRegistrationCP extends javax.swing.JPanel {
         rightRotationZButton.setMargin(new java.awt.Insets(2, 2, 2, 2));
         rightRotationZButton.setMaximumSize(new java.awt.Dimension(24, 24));
         rightRotationZButton.setMinimumSize(new java.awt.Dimension(24, 24));
-        rightRotationZButton.setOpaque(false);
         rightRotationZButton.setPreferredSize(new java.awt.Dimension(24, 24));
         rightRotationZButton.addMouseListener(new java.awt.event.MouseAdapter() {
             public void mousePressed(java.awt.event.MouseEvent evt) {
@@ -1032,7 +993,6 @@ public class PostRegistrationCP extends javax.swing.JPanel {
         rightRotationYButton.setMargin(new java.awt.Insets(2, 2, 2, 2));
         rightRotationYButton.setMaximumSize(new java.awt.Dimension(24, 24));
         rightRotationYButton.setMinimumSize(new java.awt.Dimension(24, 24));
-        rightRotationYButton.setOpaque(false);
         rightRotationYButton.setPreferredSize(new java.awt.Dimension(24, 24));
         rightRotationYButton.addMouseListener(new java.awt.event.MouseAdapter() {
             public void mousePressed(java.awt.event.MouseEvent evt) {
@@ -1050,7 +1010,6 @@ public class PostRegistrationCP extends javax.swing.JPanel {
         leftRotationZButton.setMargin(new java.awt.Insets(2, 2, 2, 2));
         leftRotationZButton.setMaximumSize(new java.awt.Dimension(24, 24));
         leftRotationZButton.setMinimumSize(new java.awt.Dimension(24, 24));
-        leftRotationZButton.setOpaque(false);
         leftRotationZButton.setPreferredSize(new java.awt.Dimension(24, 24));
         leftRotationZButton.addMouseListener(new java.awt.event.MouseAdapter() {
             public void mousePressed(java.awt.event.MouseEvent evt) {
@@ -1068,7 +1027,6 @@ public class PostRegistrationCP extends javax.swing.JPanel {
         rightRotationXButton.setMargin(new java.awt.Insets(2, 2, 2, 2));
         rightRotationXButton.setMaximumSize(new java.awt.Dimension(24, 24));
         rightRotationXButton.setMinimumSize(new java.awt.Dimension(24, 24));
-        rightRotationXButton.setOpaque(false);
         rightRotationXButton.setPreferredSize(new java.awt.Dimension(24, 24));
         rightRotationXButton.addMouseListener(new java.awt.event.MouseAdapter() {
             public void mousePressed(java.awt.event.MouseEvent evt) {
@@ -1175,7 +1133,6 @@ public class PostRegistrationCP extends javax.swing.JPanel {
         scalePlusButton.setMargin(new java.awt.Insets(2, 2, 2, 2));
         scalePlusButton.setMaximumSize(new java.awt.Dimension(24, 24));
         scalePlusButton.setMinimumSize(new java.awt.Dimension(24, 24));
-        scalePlusButton.setOpaque(false);
         scalePlusButton.setPreferredSize(new java.awt.Dimension(24, 24));
         scalePlusButton.addMouseListener(new java.awt.event.MouseAdapter() {
             public void mousePressed(java.awt.event.MouseEvent evt) {
@@ -1193,7 +1150,6 @@ public class PostRegistrationCP extends javax.swing.JPanel {
         scaleMinusButton.setMargin(new java.awt.Insets(2, 2, 2, 2));
         scaleMinusButton.setMaximumSize(new java.awt.Dimension(24, 24));
         scaleMinusButton.setMinimumSize(new java.awt.Dimension(24, 24));
-        scaleMinusButton.setOpaque(false);
         scaleMinusButton.setPreferredSize(new java.awt.Dimension(24, 24));
         scaleMinusButton.addMouseListener(new java.awt.event.MouseAdapter() {
             public void mousePressed(java.awt.event.MouseEvent evt) {
@@ -1218,7 +1174,6 @@ public class PostRegistrationCP extends javax.swing.JPanel {
         scaleButton.setBorder(javax.swing.BorderFactory.createTitledBorder(""));
         scaleButton.setCursor(new java.awt.Cursor(java.awt.Cursor.DEFAULT_CURSOR));
         scaleButton.setMargin(new java.awt.Insets(2, 2, 2, 2));
-        scaleButton.setOpaque(false);
         scaleButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 scaleButtonActionPerformed(evt);
@@ -1283,7 +1238,6 @@ public class PostRegistrationCP extends javax.swing.JPanel {
         precisionGroup.add(lowShiftRB);
         org.openide.awt.Mnemonics.setLocalizedText(lowShiftRB, org.openide.util.NbBundle.getMessage(PostRegistrationCP.class, "PostRegistrationCP.lowShiftRB.text")); // NOI18N
         lowShiftRB.setToolTipText(org.openide.util.NbBundle.getMessage(PostRegistrationCP.class, "PostRegistrationCP.lowShiftRB.toolTipText")); // NOI18N
-        lowShiftRB.setOpaque(false);
         lowShiftRB.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 lowShiftRBActionPerformed(evt);
@@ -1293,7 +1247,6 @@ public class PostRegistrationCP extends javax.swing.JPanel {
         precisionGroup.add(highShiftRB);
         org.openide.awt.Mnemonics.setLocalizedText(highShiftRB, org.openide.util.NbBundle.getMessage(PostRegistrationCP.class, "PostRegistrationCP.highShiftRB.text")); // NOI18N
         highShiftRB.setToolTipText(org.openide.util.NbBundle.getMessage(PostRegistrationCP.class, "PostRegistrationCP.highShiftRB.toolTipText")); // NOI18N
-        highShiftRB.setOpaque(false);
         highShiftRB.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 highShiftRBActionPerformed(evt);
@@ -1331,8 +1284,6 @@ public class PostRegistrationCP extends javax.swing.JPanel {
         applyButton.setToolTipText(org.openide.util.NbBundle.getMessage(PostRegistrationCP.class, "PostRegistrationCP.applyButton.toolTipText")); // NOI18N
         applyButton.setBorder(javax.swing.BorderFactory.createTitledBorder(""));
         applyButton.setCursor(new java.awt.Cursor(java.awt.Cursor.HAND_CURSOR));
-        applyButton.setMargin(new java.awt.Insets(0, 0, 0, 0));
-        applyButton.setOpaque(false);
         applyButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 applyButtonActionPerformed(evt);
@@ -1367,7 +1318,7 @@ public class PostRegistrationCP extends javax.swing.JPanel {
                                 .addGroup(transformationPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                                     .addComponent(resetAllButton, javax.swing.GroupLayout.PREFERRED_SIZE, 83, javax.swing.GroupLayout.PREFERRED_SIZE)
                                     .addComponent(applyButton, javax.swing.GroupLayout.PREFERRED_SIZE, 83, javax.swing.GroupLayout.PREFERRED_SIZE))))
-                        .addGap(0, 9, Short.MAX_VALUE)))
+                        .addGap(0, 5, Short.MAX_VALUE)))
                 .addContainerGap())
             .addComponent(jSeparator5, javax.swing.GroupLayout.Alignment.TRAILING)
         );
@@ -1400,7 +1351,7 @@ public class PostRegistrationCP extends javax.swing.JPanel {
                             .addComponent(jSeparator9, javax.swing.GroupLayout.PREFERRED_SIZE, 62, javax.swing.GroupLayout.PREFERRED_SIZE)
                             .addComponent(shiftPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                             .addComponent(resetAllButton))
-                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 9, Short.MAX_VALUE)))
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
                 .addComponent(jSeparator5, javax.swing.GroupLayout.PREFERRED_SIZE, 10, javax.swing.GroupLayout.PREFERRED_SIZE))
         );
 
@@ -1451,7 +1402,7 @@ public class PostRegistrationCP extends javax.swing.JPanel {
      * @param evt 
      */
     private void secondaryColorPanelMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_secondaryColorPanelMouseClicked
-        if (transparencySlider.getValue() == 2*RegistrationCPEventListener.TRANSPARENCY_RANGE) {
+        if (transparencySlider.getValue() == 2*PostRegistrationListener.TRANSPARENCY_RANGE) {
             return;
         }
         Color current = secondaryColorPanel.getBackground();
@@ -1467,9 +1418,9 @@ public class PostRegistrationCP extends javax.swing.JPanel {
      * @param evt 
      */
     private void transparencyButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_transparencyButtonActionPerformed
-        transparencySlider.setValue(RegistrationCPEventListener.TRANSPARENCY_RANGE);
+        transparencySlider.setValue(PostRegistrationListener.TRANSPARENCY_RANGE);
         transparencySlider.repaint();
-        listener.setTransparency(RegistrationCPEventListener.TRANSPARENCY_RANGE);
+        listener.setTransparency(PostRegistrationListener.TRANSPARENCY_RANGE);
     }//GEN-LAST:event_transparencyButtonActionPerformed
 
     /**
@@ -1486,7 +1437,7 @@ public class PostRegistrationCP extends javax.swing.JPanel {
             primaryFillRB.setEnabled(false);
             primaryLinesRB.setEnabled(false);
             primaryPointsRB.setEnabled(false);
-        } else if (transparency == 2*RegistrationCPEventListener.TRANSPARENCY_RANGE) {
+        } else if (transparency == 2*PostRegistrationListener.TRANSPARENCY_RANGE) {
             secondaryColorPanel.setBackground(Color.lightGray);
             secondaryHighlightsCB.setEnabled(false);
             secondaryHighlightsCB.setEnabled(false);
@@ -1708,8 +1659,8 @@ public class PostRegistrationCP extends javax.swing.JPanel {
      * @param evt 
      */
     private void colorButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_colorButtonActionPerformed
-        primaryColorPanel.setBackground(RegistrationCPEventListener.DEFAULT_PRIMARY_COLOR);
-        secondaryColorPanel.setBackground(RegistrationCPEventListener.DEFAULT_SECONDARY_COLOR);
+        primaryColorPanel.setBackground(PostRegistrationListener.DEFAULT_PRIMARY_COLOR);
+        secondaryColorPanel.setBackground(PostRegistrationListener.DEFAULT_SECONDARY_COLOR);
         listener.setDeafultColor();
     }//GEN-LAST:event_colorButtonActionPerformed
 
@@ -1727,7 +1678,7 @@ public class PostRegistrationCP extends javax.swing.JPanel {
      * @param evt 
      */
     private void featurePointsButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_featurePointsButtonActionPerformed
-        if (listener.isFeaturePointsActive()) {
+        if (listener.areFeaturePointsActive()) {
             featurePointsButton.setText("show");
             thersholdButton.setEnabled(false);
             thersholdFTF.setEnabled(false);
@@ -1999,7 +1950,7 @@ public class PostRegistrationCP extends javax.swing.JPanel {
      * @param evt 
      */
     private void thersholdButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_thersholdButtonActionPerformed
-        thersholdFTF.setValue(RegistrationCPEventListener.LOW_SHIFT_QUOTIENT);
+        thersholdFTF.setValue(PostRegistrationListener.LOW_SHIFT_QUOTIENT);
     }//GEN-LAST:event_thersholdButtonActionPerformed
 
     /**
@@ -2007,7 +1958,7 @@ public class PostRegistrationCP extends javax.swing.JPanel {
      * @param evt 
      */
     private void lowShiftRBActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_lowShiftRBActionPerformed
-        listener.setMoveModifier(RegistrationCPEventListener.LOW_SHIFT_QUOTIENT);
+        listener.setMoveModifier(PostRegistrationListener.LOW_SHIFT_QUOTIENT);
     }//GEN-LAST:event_lowShiftRBActionPerformed
 
     /**
@@ -2015,7 +1966,7 @@ public class PostRegistrationCP extends javax.swing.JPanel {
      * @param evt 
      */
     private void highShiftRBActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_highShiftRBActionPerformed
-        listener.setMoveModifier(RegistrationCPEventListener.HIGH_SHIFT_QUOTIENT);
+        listener.setMoveModifier(PostRegistrationListener.HIGH_SHIFT_QUOTIENT);
     }//GEN-LAST:event_highShiftRBActionPerformed
 
     /**
diff --git a/GUI/src/main/java/cz/fidentis/analyst/registration/RegistrationCPEventListener.java b/GUI/src/main/java/cz/fidentis/analyst/registration/PostRegistrationListener.java
similarity index 94%
rename from GUI/src/main/java/cz/fidentis/analyst/registration/RegistrationCPEventListener.java
rename to GUI/src/main/java/cz/fidentis/analyst/registration/PostRegistrationListener.java
index 60a26ca554c1a119e7d23a13dfade1eccfd5ed8d..86f0f6650225884292f5949a799394cd5c310823 100644
--- a/GUI/src/main/java/cz/fidentis/analyst/registration/RegistrationCPEventListener.java
+++ b/GUI/src/main/java/cz/fidentis/analyst/registration/PostRegistrationListener.java
@@ -18,28 +18,33 @@ import javax.vecmath.Vector3d;
  * @author Richard Pajersky
  */
 
-public class RegistrationCPEventListener {
+public class PostRegistrationListener {
     
     /**
      * Transformation shift is higher 
      */
     public static final double HIGH_SHIFT_QUOTIENT = 1;
+    
     /**
      * Transformation shift is lower 
      */
     public static final double LOW_SHIFT_QUOTIENT = 0.1;
+    
     /**
      * Quotient which determines translation and scale amount 
      */
     private static final double CHANGE_QUOTIENT = 500d;
+    
     /**
      * Color used as default color of primary face 
      */
     public static final Color DEFAULT_PRIMARY_COLOR = new Color(101, 119, 179);
+    
     /**
      * Color used as default color of secondary face 
      */
     public static final Color DEFAULT_SECONDARY_COLOR = new Color(237, 217, 76);
+    
     /**
      * Range of transparency 
      */
@@ -49,28 +54,34 @@ public class RegistrationCPEventListener {
      * Canvas which contains faces
      */
     private final Canvas canvas;
+    
     /**
      * Move amount on X-axis
      */
     private final double moveX;
+    
     /**
      * Move amount on Y-axis
      */
     private final double moveY;
+    
     /**
      * Move amount on Z-axis
      */
     private final double moveZ;
+    
     /**
      * Scale amount in all axis
      */
     private final double scaleXYZ;
+    
     /**
      * Primary face used for visualization
      */
     private final DrawableMesh primaryFace;
+    
     /**
-     * Secodnary face used for visualization and transformation
+     * Secondary face used for visualization and transformation
      */
     private final DrawableMesh secondaryFace;
     
@@ -78,8 +89,9 @@ public class RegistrationCPEventListener {
      * Transformation amount
      */
     private double moveModifier = LOW_SHIFT_QUOTIENT;
+    
     /**
-     * Thershold of feature points showing too far away
+     * Threshold of feature points showing too far away
      */
     private double featurePointsThreshold = LOW_SHIFT_QUOTIENT;
     
@@ -93,7 +105,7 @@ public class RegistrationCPEventListener {
      * @param canvas Canvas with two faces
      * @throws IllegalArgumentException if the canvas is {@code null}
      */
-    public RegistrationCPEventListener(Canvas canvas) {
+    public PostRegistrationListener(Canvas canvas) {
         if (canvas == null) {
             throw new IllegalArgumentException("canvas is null");
         }
@@ -518,7 +530,7 @@ public class RegistrationCPEventListener {
     /**
      * @return {@code true} if feature points are being rendered
      */
-    public boolean isFeaturePointsActive() {
+    public boolean areFeaturePointsActive() {
         return primaryFace.isRenderFeaturePoints();
     }
     
diff --git a/GUI/src/main/java/cz/fidentis/analyst/registration/RegistrationTestTopComponent.form b/GUI/src/main/java/cz/fidentis/analyst/registration/PostRegistrationTestTC.form
similarity index 97%
rename from GUI/src/main/java/cz/fidentis/analyst/registration/RegistrationTestTopComponent.form
rename to GUI/src/main/java/cz/fidentis/analyst/registration/PostRegistrationTestTC.form
index 7776b57446cdcc2158bffde68fd3144215ee54e4..e0ca68451f5a157b4645b7e68075753bc4c5c206 100644
--- a/GUI/src/main/java/cz/fidentis/analyst/registration/RegistrationTestTopComponent.form
+++ b/GUI/src/main/java/cz/fidentis/analyst/registration/PostRegistrationTestTC.form
@@ -59,7 +59,7 @@
   <SubComponents>
     <Component class="cz.fidentis.analyst.gui.canvas.Canvas" name="canvas1">
     </Component>
-    <Container class="cz.fidentis.analyst.gui.tab.PostRegistrationCP" name="postRegistrationCP1">
+    <Container class="cz.fidentis.analyst.registration.PostRegistrationCP" name="postRegistrationCP1">
 
       <Layout>
         <DimensionLayout dim="0">
diff --git a/GUI/src/main/java/cz/fidentis/analyst/registration/RegistrationTestTopComponent.java b/GUI/src/main/java/cz/fidentis/analyst/registration/PostRegistrationTestTC.java
similarity index 92%
rename from GUI/src/main/java/cz/fidentis/analyst/registration/RegistrationTestTopComponent.java
rename to GUI/src/main/java/cz/fidentis/analyst/registration/PostRegistrationTestTC.java
index a22aa716a503e37ce890d0aad34b6118d4ce53ed..aeca8a319941f10492a4ebf1bc3c96480fbf7546 100644
--- a/GUI/src/main/java/cz/fidentis/analyst/registration/RegistrationTestTopComponent.java
+++ b/GUI/src/main/java/cz/fidentis/analyst/registration/PostRegistrationTestTC.java
@@ -23,28 +23,28 @@ import org.openide.util.NbBundle.Messages;
         autostore = false
 )
 @TopComponent.Description(
-        preferredID = "RegistrationTestTopComponent",
+        preferredID = "PostRegistrationTestTC",
         //iconBase="SET/PATH/TO/ICON/HERE",
         persistenceType = TopComponent.PERSISTENCE_ALWAYS
 )
 @TopComponent.Registration(mode = "properties", openAtStartup = false)
-@ActionID(category = "Window", id = "cz.fidentis.analyst.gui.RegistrationTestTopComponent")
+@ActionID(category = "Window", id = "cz.fidentis.analyst.gui.PostRegistrationTestTC")
 @ActionReference(path = "Menu/Window" /*, position = 333 */)
 @TopComponent.OpenActionRegistration(
         displayName = "#CTL_RegistrationTestAction",
-        preferredID = "RegistrationTestTopComponent"
+        preferredID = "PostRegistrationTestTC"
 )
 @Messages({
     "CTL_RegistrationTestAction=RegistrationTest",
     "CTL_RegistrationTestTopComponent=RegistrationTest Window",
     "HINT_RegistrationTestTopComponent=This is a RegistrationTest window"
 })
-public final class RegistrationTestTopComponent extends TopComponent {
+public final class PostRegistrationTestTC extends TopComponent {
 
     /**
      * Constructor
      */
-    public RegistrationTestTopComponent() {
+    public PostRegistrationTestTC() {
         initComponents();
         setName(Bundle.CTL_RegistrationTestTopComponent());
         setToolTipText(Bundle.HINT_RegistrationTestTopComponent());
@@ -102,7 +102,7 @@ public final class RegistrationTestTopComponent extends TopComponent {
         secondar.add(new FeaturePoint(101, 0, 0, null));
         secondaryFace.setFeaturePoints(secondar);
         
-        postRegistrationCP1.initPostRegistrationCP(new RegistrationCPEventListener(canvas1));
+        postRegistrationCP1.initPostRegistrationCP(new PostRegistrationListener(canvas1));
         
     }
 
@@ -115,7 +115,7 @@ public final class RegistrationTestTopComponent extends TopComponent {
     private void initComponents() {
 
         canvas1 = new cz.fidentis.analyst.gui.canvas.Canvas();
-        postRegistrationCP1 = new cz.fidentis.analyst.gui.tab.PostRegistrationCP();
+        postRegistrationCP1 = new cz.fidentis.analyst.registration.PostRegistrationCP();
 
         setPreferredSize(new java.awt.Dimension(405, 600));
 
@@ -148,7 +148,7 @@ public final class RegistrationTestTopComponent extends TopComponent {
 
     // Variables declaration - do not modify//GEN-BEGIN:variables
     private cz.fidentis.analyst.gui.canvas.Canvas canvas1;
-    private cz.fidentis.analyst.gui.tab.PostRegistrationCP postRegistrationCP1;
+    private cz.fidentis.analyst.registration.PostRegistrationCP postRegistrationCP1;
     // End of variables declaration//GEN-END:variables
     @Override
     public void componentOpened() {
diff --git a/GUI/src/main/resources/cz/fidentis/analyst/gui/tab/Bundle.properties b/GUI/src/main/resources/cz/fidentis/analyst/gui/tab/Bundle.properties
index f0cbcd4f6b094696fce5c33177b5fa6788ec2e8a..44efbbfa1ef21cbbfc0cd1690473136b9fe322f0 100644
--- a/GUI/src/main/resources/cz/fidentis/analyst/gui/tab/Bundle.properties
+++ b/GUI/src/main/resources/cz/fidentis/analyst/gui/tab/Bundle.properties
@@ -1,90 +1,10 @@
 
 SingleFaceTab.jButton1.text=
-PostRegistrationCP.leftRotationXButton.text=
-PostRegistrationCP.rotationXFTF.toolTipText=
 PostRegistrationCP.rotationXFTF.text=0
-PostRegistrationCP.rightTranslationZButton.text=
-PostRegistrationCP.rightTranslationYButton.text=
-PostRegistrationCP.leftTranslationZButton.text=
-PostRegistrationCP.leftTranslationYButton.text=
-PostRegistrationCP.applyButton.text=Apply changes
-PostRegistrationCP.scaleButton.toolTipText=reset scale
-PostRegistrationCP.scaleButton.text=
-PostRegistrationCP.rotationButton.toolTipText=reset rotation
-PostRegistrationCP.rotationButton.text=
 PostRegistrationCP.translationZFTF.text=0
 PostRegistrationCP.translationYFTF.text=0
-PostRegistrationCP.translationXFTF.toolTipText=
 PostRegistrationCP.translationXFTF.text=0
-PostRegistrationCP.leftTranslationXButton.text=
-PostRegistrationCP.translationButton.toolTipText=reset translation
-PostRegistrationCP.translationButton.text=
-PostRegistrationCP.profileButton.toolTipText=model profile view
-PostRegistrationCP.profileButton.text=side
-PostRegistrationCP.frontButton.toolTipText=model front view
-PostRegistrationCP.frontButton.text=front
-PostRegistrationCP.featurePointsButton.text=show
-PostRegistrationCP.viewLabel.text=View:
-PostRegistrationCP.modelLabel.text=Model:
-PostRegistrationCP.transparencyButton.toolTipText=reset transparency
-PostRegistrationCP.transparencyButton.text=opacity
-PostRegistrationCP.primaryLabel.text=primary
-PostRegistrationCP.secondaryLabel.toolTipText=
-PostRegistrationCP.secondaryLabel.text=secondary
-PostRegistrationCP.transparencySlider.toolTipText=sets model transparency
-PostRegistrationCP.secondaryColorPanel.toolTipText=sets color of secondary model
-PostRegistrationCP.primaryColorPanel.toolTipText=sets color of primary model
-PostRegistrationCP.scalePlusButton.text=
-PostRegistrationCP.scaleMinusButton.text=
-PostRegistrationCP.scaleFTF.toolTipText=
 PostRegistrationCP.scaleFTF.text=0
 PostRegistrationCP.rotationZFTF.text=0
 PostRegistrationCP.rotationYFTF.text=0
-PostRegistrationCP.rightRotationZButton.text=
-PostRegistrationCP.rightRotationYButton.text=
-PostRegistrationCP.leftRotationZButton.text=
-PostRegistrationCP.leftRotationYButton.text=
-PostRegistrationCP.rightRotationXButton.text=
-PostRegistrationCP.jLabel2.text=Translation:
-PostRegistrationCP.jLabel3.text=Rotation:
-PostRegistrationCP.jLabel4.text=Scale:
-PostRegistrationCP.resetAllButton.text=reset all
-PostRegistrationCP.translXLabel.text=horizontal
-PostRegistrationCP.translYLabel.text=vertical
-PostRegistrationCP.translZLabel.text=front-back
-PostRegistrationCP.rotatXLabel.text=X
-PostRegistrationCP.rotatYLabel.text=Y
-PostRegistrationCP.rotatZLabel.text=Z
-PostRegistrationCP.rightTranslationXButton.text=
-PostRegistrationCP.highlightsLabel.text=highlights
-PostRegistrationCP.primaryHighlightsCB.text=
-PostRegistrationCP.secondaryHighlightsCB.text=
-PostRegistrationCP.renderModeLabel.text=render mode
-PostRegistrationCP.fillLabel.text=fill
-PostRegistrationCP.linesLabel.text=lines
-PostRegistrationCP.pointsLabel.text=points
-PostRegistrationCP.primaryFillRB.text=
-PostRegistrationCP.secondaryFillRB.text=
-PostRegistrationCP.primaryLinesRB.text=
-PostRegistrationCP.secondaryLinesRB.text=
-PostRegistrationCP.secondaryPointsRB.text=
-PostRegistrationCP.primaryPointsRB.text=
-PostRegistrationCP.colorButton.toolTipText=reset colors
-PostRegistrationCP.colorButton.text=color
-PostRegistrationCP.transformationLabel.text=Transformation
-PostRegistrationCP.featurePointsLabel.text=Feature points:
 PostRegistrationCP.jFormattedTextField1.text=jFormattedTextField1
-PostRegistrationCP.thresholdDownButton.text=
-PostRegistrationCP.thersholdUpButton.text=
-PostRegistrationCP.thersholdButton.text=thershold
-PostRegistrationCP.visualizationLabel.text=Visualization
-PostRegistrationCP.registrationAdjustmentLabel.text=Registration adjustment
-PostRegistrationCP.resetAllButton.toolTipText=reset all transformations
-PostRegistrationCP.applyButton.toolTipText=apply transformations
-PostRegistrationCP.shiftLabel.text=shift
-PostRegistrationCP.backfaceButton.text=hide backface
-PostRegistrationCP.shiftLabel.toolTipText=transformation amount
-PostRegistrationCP.highShiftRB.text=high
-PostRegistrationCP.highShiftRB.toolTipText=set high shifting amount
-PostRegistrationCP.lowShiftRB.text=low
-PostRegistrationCP.lowShiftRB.toolTipText=set low shifting amount
diff --git a/GUI/src/main/resources/cz/fidentis/analyst/registration/Bundle.properties b/GUI/src/main/resources/cz/fidentis/analyst/registration/Bundle.properties
new file mode 100644
index 0000000000000000000000000000000000000000..6953b62b7fb16e67a398aad8372a4fb03f3960d4
--- /dev/null
+++ b/GUI/src/main/resources/cz/fidentis/analyst/registration/Bundle.properties
@@ -0,0 +1,84 @@
+# To change this license header, choose License Headers in Project Properties.
+# To change this template file, choose Tools | Templates
+# and open the template in the editor.
+
+PostRegistrationCP.rightRotationXButton.text=
+PostRegistrationCP.viewLabel.text=View:
+PostRegistrationCP.frontButton.toolTipText=model front view
+PostRegistrationCP.frontButton.text=front
+PostRegistrationCP.profileButton.toolTipText=model profile view
+PostRegistrationCP.profileButton.text=side
+PostRegistrationCP.leftRotationZButton.text=
+PostRegistrationCP.primaryFillRB.text=
+PostRegistrationCP.rightRotationYButton.text=
+PostRegistrationCP.secondaryLinesRB.text=
+PostRegistrationCP.rightRotationZButton.text=
+PostRegistrationCP.secondaryPointsRB.text=
+PostRegistrationCP.primaryPointsRB.text=
+PostRegistrationCP.secondaryFillRB.text=
+PostRegistrationCP.rotationButton.toolTipText=reset rotation
+PostRegistrationCP.rotationButton.text=
+PostRegistrationCP.primaryLinesRB.text=
+PostRegistrationCP.rotatXLabel.text=X
+PostRegistrationCP.rotatYLabel.text=Y
+PostRegistrationCP.rotatZLabel.text=Z
+PostRegistrationCP.leftRotationXButton.text=
+PostRegistrationCP.primaryColorPanel.toolTipText=sets color of primary model
+PostRegistrationCP.secondaryColorPanel.toolTipText=sets color of secondary model
+PostRegistrationCP.transparencySlider.toolTipText=sets model transparency
+PostRegistrationCP.secondaryLabel.toolTipText=
+PostRegistrationCP.secondaryLabel.text=secondary
+PostRegistrationCP.leftRotationYButton.text=
+PostRegistrationCP.primaryLabel.text=primary
+PostRegistrationCP.highlightsLabel.text=highlights
+PostRegistrationCP.leftTranslationZButton.text=
+PostRegistrationCP.primaryHighlightsCB.text=
+PostRegistrationCP.leftTranslationXButton.text=
+PostRegistrationCP.secondaryHighlightsCB.text=
+PostRegistrationCP.rightTranslationZButton.text=
+PostRegistrationCP.renderModeLabel.text=render mode
+PostRegistrationCP.translYLabel.text=vertical
+PostRegistrationCP.fillLabel.text=fill
+PostRegistrationCP.translZLabel.text=front-back
+PostRegistrationCP.translXLabel.text=horizontal
+PostRegistrationCP.rightTranslationYButton.text=
+PostRegistrationCP.applyButton.toolTipText=apply transformations
+PostRegistrationCP.applyButton.text=Apply changes
+PostRegistrationCP.colorButton.toolTipText=reset colors
+PostRegistrationCP.colorButton.text=color
+PostRegistrationCP.highShiftRB.toolTipText=set high shifting amount
+PostRegistrationCP.highShiftRB.text=high
+PostRegistrationCP.linesLabel.text=lines
+PostRegistrationCP.lowShiftRB.toolTipText=set low shifting amount
+PostRegistrationCP.lowShiftRB.text=low
+PostRegistrationCP.transparencyButton.toolTipText=reset transparency
+PostRegistrationCP.transparencyButton.text=opacity
+PostRegistrationCP.shiftLabel.toolTipText=transformation amount
+PostRegistrationCP.shiftLabel.text=shift
+PostRegistrationCP.pointsLabel.text=points
+PostRegistrationCP.modelLabel.text=Model:
+PostRegistrationCP.leftTranslationYButton.text=
+PostRegistrationCP.translationXFTF.toolTipText=
+PostRegistrationCP.rightTranslationXButton.text=
+PostRegistrationCP.visualizationLabel.text=Visualization
+PostRegistrationCP.jLabel2.text=Translation:
+PostRegistrationCP.translationButton.toolTipText=reset translation
+PostRegistrationCP.translationButton.text=
+PostRegistrationCP.transformationLabel.text=Transformation
+PostRegistrationCP.registrationAdjustmentLabel.text=Registration adjustment
+PostRegistrationCP.featurePointsLabel.text=Feature points:
+PostRegistrationCP.resetAllButton.toolTipText=reset all transformations
+PostRegistrationCP.resetAllButton.text=reset all
+PostRegistrationCP.thersholdButton.text=thershold
+PostRegistrationCP.scaleButton.toolTipText=reset scale
+PostRegistrationCP.scaleButton.text=
+PostRegistrationCP.thersholdUpButton.text=
+PostRegistrationCP.scaleFTF.toolTipText=
+PostRegistrationCP.thresholdDownButton.text=
+PostRegistrationCP.scaleMinusButton.text=
+PostRegistrationCP.featurePointsButton.text=show
+PostRegistrationCP.scalePlusButton.text=
+PostRegistrationCP.jLabel4.text=Scale:
+PostRegistrationCP.backfaceButton.text=hide backface
+PostRegistrationCP.jLabel3.text=Rotation:
+PostRegistrationCP.rotationXFTF.toolTipText=
diff --git a/MeshModel/test_file_landmarks.csv b/MeshModel/test_file_landmarks.csv
index b9658ea0436adba2cb335af9ad6f55acf6f1f6a3..e2d6288e77633889dd6f24afab8da4e892c0cc9b 100644
--- a/MeshModel/test_file_landmarks.csv
+++ b/MeshModel/test_file_landmarks.csv
@@ -1,2 +1,2 @@
-Scan name,EX_R x,EX_R y,EX_R z,EX_L x,EX_L y,EX_L z,EN_R x,EN_R y,EN_R z,EN_L x,EN_L y,EN_L z,PAS_R x,PAS_R y,PAS_R z,PAS_L x,PAS_L y,PAS_L z,PAI_R x,PAI_R y,PAI_R z,PAI_L x,PAI_L y,PAI_L z,G x,G y,G z,SN x,SN y,SN z,AL_R x,AL_R y,AL_R z,AL_L x,AL_L y,AL_L z,N x,N y,N z,PRN x,PRN y,PRN z,LS x,LS y,LS z,STO x,STO y,STO z,LI x,LI y,LI z,CH_R x,CH_R y,CH_R z,CH_L x,CH_L y,CH_L z,CP_R x,CP_R y,CP_R z,CP_L x,CP_L y,CP_L z,SL x,SL y,SL z,GN x,GN y,GN z,GOL_R x,GOL_R y,GOL_R z,GOL_L x,GOL_L y,GOL_L z,ZY_R x,ZY_R y,ZY_R z,ZY_L x,ZY_L y,ZY_L z,PG x,PG y,PG z,T_R x,T_R y,T_R z,T_L x,T_L y,T_L z,SA_R x,SA_R y,SA_R z,SA_L x,SA_L y,SA_L z,SBA_R x,SBA_R y,SBA_R z,SBA_L x,SBA_L y,SBA_L z,PA_R x,PA_R y,PA_R z,PA_L x,PA_L y,PA_L z,OBS_R x,OBS_R y,OBS_R z,OBS_L x,OBS_L y,OBS_L z,OBI_R x,OBI_R y,OBI_R z,OBI_L x,OBI_L y,OBI_L z,PRA_R x,PRA_R y,PRA_R z,PRA_L x,PRA_L y,PRA_L z
+Scan name,EX_R x,EX_R y,EX_R z,EX_L x,EX_L y,EX_L z,EN_R x,EN_R y,EN_R z,EN_L x,EN_L y,EN_L z,PAS_R x,PAS_R y,PAS_R z,PAS_L x,PAS_L y,PAS_L z,PAI_R x,PAI_R y,PAI_R z,PAI_L x,PAI_L y,PAI_L z,G x,G y,G z,SN x,SN y,SN z,AL_R x,AL_R y,AL_R z,AL_L x,AL_L y,AL_L z,N x,N y,N z,PRN x,PRN y,PRN z,LS x,LS y,LS z,STO x,STO y,STO z,LI x,LI y,LI z,CH_R x,CH_R y,CH_R z,CH_L x,CH_L y,CH_L z,CP_R x,CP_R y,CP_R z,CP_L x,CP_L y,CP_L z,SL x,SL y,SL z,GN x,GN y,GN z,GOL_R x,GOL_R y,GOL_R z,GOL_L x,GOL_L y,GOL_L z,ZY_R x,ZY_R y,ZY_R z,ZY_L x,ZY_L y,ZY_L z,PG x,PG y,PG z,T_R x,T_R y,T_R z,T_L x,T_L y,T_L z,SA_R x,SA_R y,SA_R z,SA_L x,SA_L y,SA_L z,SBA_R x,SBA_R y,SBA_R z,SBA_L x,SBA_L y,SBA_L z,PA_R x,PA_R y,PA_R z,PA_L x,PA_L y,PA_L z,OBS_R x,OBS_R y,OBS_R z,OBS_L x,OBS_L y,OBS_L z,OBI_R x,OBI_R y,OBI_R z,OBI_L x,OBI_L y,OBI_L z,PRA_R x,PRA_R y,PRA_R z,PRA_L x,PRA_L y,PRA_L z
 test_file,-45.3298,37.1466,-40.5415,44.3033,36.255,-42.623,-18.5134,33.2336,-36.7921,16.188,32.6379,-37.2197,-34.3363,41.5306,-33.6564,33.8288,39.5634,-34.2531,-34.4132,31.9017,-35.2642,33.5827,30.789,-36.755,0.12959,51.8853,-14.4235,-0.0356107,-13.0827,-16.9983,-16.6623,-4.05884,-19.1798,15.5038,-4.97323,-21.1836,0.044336,39.4236,-19.1853,-0.0291473,0.258132,-0.140334,-0.0901103,-29.1039,-16.7076,0.055705,-35.7511,-21.7819,0.0285089,-44.8791,-21.1852,-28.1537,-35.8802,-32.2677,24.4702,-34.6564,-34.317,-5.68164,-26.7827,-16.8184,5.63171,-26.3173,-17.4413,0.0403775,-52.2879,-27.0041,0.0981629,-80.2827,-43.5233,-57.0806,-39.8906,-118.469,50.4482,-38.958,-118.26,-63.254,40.8951,-53.951,59.7107,38.7682,-58.1024,0.0468024,-61.4376,-25.9881,-78.3702,26.048,-120.74,70.6534,28.1125,-122.519,-91.2689,55.5377,-137.688,87.5631,56.4117,-137.202,-75.6368,-4.45582,-120.828,70.4776,-1.8171,-120.704,-93.2421,34.1812,-155.155,90.0449,35.8349,-155.402,-82.7099,46.6375,-123.483,76.087,46.7891,-123.211,-72.0651,-5.47207,-119.272,64.1992,-3.95897,-118.937,-83.3521,40.1314,-121.805,75.3747,40.0263,-121.781
\ No newline at end of file