diff --git a/WaveshareUARTFingerprintSensor.Sample/DataDisplay.cs b/WaveshareUARTFingerprintSensor.Sample/Views/DataDisplay.cs
similarity index 96%
rename from WaveshareUARTFingerprintSensor.Sample/DataDisplay.cs
rename to WaveshareUARTFingerprintSensor.Sample/Views/DataDisplay.cs
index e1f1da5..52ce317 100644
--- a/WaveshareUARTFingerprintSensor.Sample/DataDisplay.cs
+++ b/WaveshareUARTFingerprintSensor.Sample/Views/DataDisplay.cs
@@ -6,7 +6,7 @@ using System.Text;
 using System.Threading.Tasks;
 using Terminal.Gui;
 
-namespace WaveshareUARTFingerprintSensor.Sample
+namespace WaveshareUARTFingerprintSensor.Sample.Views
 {
     public class DataDisplay : Toplevel
     {
diff --git a/WaveshareUARTFingerprintSensor.Sample/EntryDialog.cs b/WaveshareUARTFingerprintSensor.Sample/Views/EntryDialog.cs
similarity index 97%
rename from WaveshareUARTFingerprintSensor.Sample/EntryDialog.cs
rename to WaveshareUARTFingerprintSensor.Sample/Views/EntryDialog.cs
index cc68970..95c8997 100644
--- a/WaveshareUARTFingerprintSensor.Sample/EntryDialog.cs
+++ b/WaveshareUARTFingerprintSensor.Sample/Views/EntryDialog.cs
@@ -6,7 +6,7 @@ using System.Text;
 using System.Threading.Tasks;
 using Terminal.Gui;
 
-namespace WaveshareUARTFingerprintSensor.Sample
+namespace WaveshareUARTFingerprintSensor.Sample.Views
 {
     public class EntryDialog : Dialog
     {
diff --git a/WaveshareUARTFingerprintSensor.Sample/FingerprintDialog.cs b/WaveshareUARTFingerprintSensor.Sample/Views/FingerprintDialog.cs
similarity index 95%
rename from WaveshareUARTFingerprintSensor.Sample/FingerprintDialog.cs
rename to WaveshareUARTFingerprintSensor.Sample/Views/FingerprintDialog.cs
index c71b04a..3a7c224 100644
--- a/WaveshareUARTFingerprintSensor.Sample/FingerprintDialog.cs
+++ b/WaveshareUARTFingerprintSensor.Sample/Views/FingerprintDialog.cs
@@ -6,7 +6,7 @@ using System.Text;
 using System.Threading.Tasks;
 using Terminal.Gui;
 
-namespace WaveshareUARTFingerprintSensor.Sample
+namespace WaveshareUARTFingerprintSensor.Sample.Views
 {
     public class FingerprintDialog : Dialog
     {
diff --git a/WaveshareUARTFingerprintSensor.Sample/SettingsDisplay.cs b/WaveshareUARTFingerprintSensor.Sample/Views/SettingsDisplay.cs
similarity index 97%
rename from WaveshareUARTFingerprintSensor.Sample/SettingsDisplay.cs
rename to WaveshareUARTFingerprintSensor.Sample/Views/SettingsDisplay.cs
index 7dae4ae..f41ef63 100644
--- a/WaveshareUARTFingerprintSensor.Sample/SettingsDisplay.cs
+++ b/WaveshareUARTFingerprintSensor.Sample/Views/SettingsDisplay.cs
@@ -7,7 +7,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using Terminal.Gui;
 
-namespace WaveshareUARTFingerprintSensor.Sample
+namespace WaveshareUARTFingerprintSensor.Sample.Views
 {
     public class SettingsDisplay : Toplevel
     {
diff --git a/WaveshareUARTFingerprintSensor.Sample/SleepDisplay.cs b/WaveshareUARTFingerprintSensor.Sample/Views/SleepDisplay.cs
similarity index 98%
rename from WaveshareUARTFingerprintSensor.Sample/SleepDisplay.cs
rename to WaveshareUARTFingerprintSensor.Sample/Views/SleepDisplay.cs
index 7657f29..7eea2d2 100644
--- a/WaveshareUARTFingerprintSensor.Sample/SleepDisplay.cs
+++ b/WaveshareUARTFingerprintSensor.Sample/Views/SleepDisplay.cs
@@ -7,7 +7,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using Terminal.Gui;
 
-namespace WaveshareUARTFingerprintSensor.Sample
+namespace WaveshareUARTFingerprintSensor.Sample.Views
 {
     public class SleepDisplay : Toplevel
     {
diff --git a/WaveshareUARTFingerprintSensor.Sample/TUIManager.cs b/WaveshareUARTFingerprintSensor.Sample/Views/TUIManager.cs
similarity index 99%
rename from WaveshareUARTFingerprintSensor.Sample/TUIManager.cs
rename to WaveshareUARTFingerprintSensor.Sample/Views/TUIManager.cs
index 2703576..31f5ac1 100644
--- a/WaveshareUARTFingerprintSensor.Sample/TUIManager.cs
+++ b/WaveshareUARTFingerprintSensor.Sample/Views/TUIManager.cs
@@ -7,7 +7,7 @@ using System.Text;
 using System.Threading.Tasks;
 using Terminal.Gui;
 
-namespace WaveshareUARTFingerprintSensor.Sample
+namespace WaveshareUARTFingerprintSensor.Sample.Views
 {
     public class TUIManager : Toplevel
     {
diff --git a/WaveshareUARTFingerprintSensor.Sample/WaveshareUARTFingerprintSensor.Sample.csproj b/WaveshareUARTFingerprintSensor.Sample/WaveshareUARTFingerprintSensor.Sample.csproj
index cbb60d9..6fe9565 100644
--- a/WaveshareUARTFingerprintSensor.Sample/WaveshareUARTFingerprintSensor.Sample.csproj
+++ b/WaveshareUARTFingerprintSensor.Sample/WaveshareUARTFingerprintSensor.Sample.csproj
@@ -99,14 +99,14 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="DataDisplay.cs" />
-    <Compile Include="EntryDialog.cs" />
-    <Compile Include="FingerprintDialog.cs" />
+    <Compile Include="Views\DataDisplay.cs" />
+    <Compile Include="Views\EntryDialog.cs" />
+    <Compile Include="Views\FingerprintDialog.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="SettingsDisplay.cs" />
-    <Compile Include="SleepDisplay.cs" />
-    <Compile Include="TUIManager.cs" />
+    <Compile Include="Views\SettingsDisplay.cs" />
+    <Compile Include="Views\SleepDisplay.cs" />
+    <Compile Include="Views\TUIManager.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />