diff --git a/Signal Generator/Signal Generator.csproj b/Signal Generator/Signal Generator.csproj
index 6d778f8..6c67525 100644
--- a/Signal Generator/Signal Generator.csproj	
+++ b/Signal Generator/Signal Generator.csproj	
@@ -58,11 +58,11 @@
     <Compile Include="AddSignalWindow.xaml.cs">
       <DependentUpon>AddSignalWindow.xaml</DependentUpon>
     </Compile>
-    <Compile Include="AnalogSignalMethods.cs" />
-    <Compile Include="FmSignal.cs" />
+    <Compile Include="Signal\Base\AnalogSignalMethods.cs" />
+    <Compile Include="Signal\FmSignal.cs" />
     <Compile Include="Settings.cs" />
-    <Compile Include="Parameter.cs" />
-    <Compile Include="SinusoidalSignal.cs" />
+    <Compile Include="Signal\Base\Parameter.cs" />
+    <Compile Include="Signal\SinusoidalSignal.cs" />
     <Compile Include="TaskWindow.xaml.cs">
       <DependentUpon>TaskWindow.xaml</DependentUpon>
     </Compile>
@@ -78,7 +78,7 @@
       <DependentUpon>App.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="IAnalogSignal.cs" />
+    <Compile Include="Signal\Base\IAnalogSignal.cs" />
     <Compile Include="MainWindow.xaml.cs">
       <DependentUpon>MainWindow.xaml</DependentUpon>
       <SubType>Code</SubType>
@@ -89,7 +89,7 @@
     </Page>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="MultiSignal.cs" />
+    <Compile Include="Signal\MultiSignal.cs" />
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>
diff --git a/Signal Generator/AnalogSignalMethods.cs b/Signal Generator/Signal/Base/AnalogSignalMethods.cs
similarity index 84%
rename from Signal Generator/AnalogSignalMethods.cs
rename to Signal Generator/Signal/Base/AnalogSignalMethods.cs
index 6449121..f33c087 100644
--- a/Signal Generator/AnalogSignalMethods.cs	
+++ b/Signal Generator/Signal/Base/AnalogSignalMethods.cs	
@@ -9,7 +9,7 @@ namespace Signal_Generator
 {
     class AnalogSignalMethods
     {
-        internal string paramsToString(Collection<Parameter> paramsCollection)
+        protected string paramsToString(Collection<Parameter> paramsCollection)
         {
             string result = "";
             foreach (Parameter p in paramsCollection)
diff --git a/Signal Generator/IAnalogSignal.cs b/Signal Generator/Signal/Base/IAnalogSignal.cs
similarity index 100%
rename from Signal Generator/IAnalogSignal.cs
rename to Signal Generator/Signal/Base/IAnalogSignal.cs
diff --git a/Signal Generator/Parameter.cs b/Signal Generator/Signal/Base/Parameter.cs
similarity index 100%
rename from Signal Generator/Parameter.cs
rename to Signal Generator/Signal/Base/Parameter.cs
diff --git a/Signal Generator/FmSignal.cs b/Signal Generator/Signal/FmSignal.cs
similarity index 100%
rename from Signal Generator/FmSignal.cs
rename to Signal Generator/Signal/FmSignal.cs
diff --git a/Signal Generator/MultiSignal.cs b/Signal Generator/Signal/MultiSignal.cs
similarity index 100%
rename from Signal Generator/MultiSignal.cs
rename to Signal Generator/Signal/MultiSignal.cs
diff --git a/Signal Generator/SinusoidalSignal.cs b/Signal Generator/Signal/SinusoidalSignal.cs
similarity index 100%
rename from Signal Generator/SinusoidalSignal.cs
rename to Signal Generator/Signal/SinusoidalSignal.cs