diff --git a/TwlBackupChecker/DataExportImportTool/OMakefile b/TwlBackupChecker/CTR/DataExportImportTool/OMakefile
similarity index 63%
rename from TwlBackupChecker/DataExportImportTool/OMakefile
rename to TwlBackupChecker/CTR/DataExportImportTool/OMakefile
index 01cfcf1..310389e 100644
--- a/TwlBackupChecker/DataExportImportTool/OMakefile
+++ b/TwlBackupChecker/CTR/DataExportImportTool/OMakefile
@@ -15,9 +15,9 @@
 #----------------------------------------------------------------------------
 SUPPORTED_TARGETS   =   CTR-*.Process.MPCore.*
 
-SAMPLED_DEMOS_COMMON_INCLUDE_DIR = $(dir ../../../CTR_SDK-2_4/SampleDemos/common/include)
-INCLUDES            += $(SAMPLED_DEMOS_COMMON_INCLUDE_DIR)
-
+SAMPLE_DEMOS_DIR                = $(dir $(CTRSDK_ROOT)/../CTR/SampleDemos)
+SAMPLE_DEMOS_COMMON_INCLUDE_DIR = $(dir $(SAMPLE_DEMOS_DIR)/common/include)
+INCLUDES                       += $(SAMPLE_DEMOS_COMMON_INCLUDE_DIR)
 
 SOURCES[]           =
                         main.cpp
@@ -25,19 +25,13 @@ SOURCES[]           =
                         sdAccessor.cpp
                         window.cpp
 
-TARGET_PROGRAM      =   twlSdExportImport
+TARGET_PROGRAM      =   twlBkpExportImport
 
 LIBS                +=  libnn_am lib_demo lib_applet
 
 ROM_SPEC_FILE   =   twlSdExportImport.rsf
 DESCRIPTOR      =   $(HORIZON_ROOT)/resources/specfiles/systemapplications/Mset.desc
 
-# files �t�H���_�ɓ���Ă���� backupSample.cia �����炩���� devmenu ����C���|�[�g���Ă���N�����ĉ�����
-
-# srl �����p�u���b�V������ cia �̍���
-# makecia �R�}���h�ňȉ��̂悤�ɂ��ĉ�����
-# makecia <output.cia> -s <input.srl> -padding
-
 include $(ROOT_OMAKE)/modulerules
 
 build: $(DEFAULT_TARGETS)
diff --git a/TwlBackupChecker/DataExportImportTool/OMakeroot b/TwlBackupChecker/CTR/DataExportImportTool/OMakeroot
similarity index 100%
rename from TwlBackupChecker/DataExportImportTool/OMakeroot
rename to TwlBackupChecker/CTR/DataExportImportTool/OMakeroot
diff --git a/TwlBackupChecker/DataExportImportTool/draw.cpp b/TwlBackupChecker/CTR/DataExportImportTool/draw.cpp
similarity index 100%
rename from TwlBackupChecker/DataExportImportTool/draw.cpp
rename to TwlBackupChecker/CTR/DataExportImportTool/draw.cpp
diff --git a/TwlBackupChecker/DataExportImportTool/draw.h b/TwlBackupChecker/CTR/DataExportImportTool/draw.h
similarity index 100%
rename from TwlBackupChecker/DataExportImportTool/draw.h
rename to TwlBackupChecker/CTR/DataExportImportTool/draw.h
diff --git a/TwlBackupChecker/DataExportImportTool/main.cpp b/TwlBackupChecker/CTR/DataExportImportTool/main.cpp
similarity index 95%
rename from TwlBackupChecker/DataExportImportTool/main.cpp
rename to TwlBackupChecker/CTR/DataExportImportTool/main.cpp
index 4c99536..41b9ddc 100644
--- a/TwlBackupChecker/DataExportImportTool/main.cpp
+++ b/TwlBackupChecker/CTR/DataExportImportTool/main.cpp
@@ -55,7 +55,7 @@ wchar_t binaryName[256];
 void Initialize()
 {
     // ヒープの初期化
-    s_AppHeap.Initialize(nn::os::GetDeviceMemoryAddress(), NN_OS_DEVICE_MEMORY_SIZE, nn::os::ALLOCATE_OPTION_LINEAR);
+    s_AppHeap.Initialize(nn::os::GetDeviceMemoryAddress(), nn::os::GetDeviceMemorySize(), nn::os::ALLOCATE_OPTION_LINEAR);
 
     // fs の初期化
     nn::fs::Initialize();
diff --git a/TwlBackupChecker/DataExportImportTool/sdAccessor.cpp b/TwlBackupChecker/CTR/DataExportImportTool/sdAccessor.cpp
similarity index 100%
rename from TwlBackupChecker/DataExportImportTool/sdAccessor.cpp
rename to TwlBackupChecker/CTR/DataExportImportTool/sdAccessor.cpp
diff --git a/TwlBackupChecker/DataExportImportTool/sdAccessor.h b/TwlBackupChecker/CTR/DataExportImportTool/sdAccessor.h
similarity index 100%
rename from TwlBackupChecker/DataExportImportTool/sdAccessor.h
rename to TwlBackupChecker/CTR/DataExportImportTool/sdAccessor.h
diff --git a/TwlBackupChecker/DataExportImportTool/twlSdExportImport.cci b/TwlBackupChecker/CTR/DataExportImportTool/twlSdExportImport.cci
similarity index 100%
rename from TwlBackupChecker/DataExportImportTool/twlSdExportImport.cci
rename to TwlBackupChecker/CTR/DataExportImportTool/twlSdExportImport.cci
diff --git a/TwlBackupChecker/DataExportImportTool/twlSdExportImport.rsf b/TwlBackupChecker/CTR/DataExportImportTool/twlSdExportImport.rsf
similarity index 100%
rename from TwlBackupChecker/DataExportImportTool/twlSdExportImport.rsf
rename to TwlBackupChecker/CTR/DataExportImportTool/twlSdExportImport.rsf
diff --git a/TwlBackupChecker/DataExportImportTool/window.cpp b/TwlBackupChecker/CTR/DataExportImportTool/window.cpp
similarity index 100%
rename from TwlBackupChecker/DataExportImportTool/window.cpp
rename to TwlBackupChecker/CTR/DataExportImportTool/window.cpp
diff --git a/TwlBackupChecker/DataExportImportTool/window.h b/TwlBackupChecker/CTR/DataExportImportTool/window.h
similarity index 100%
rename from TwlBackupChecker/DataExportImportTool/window.h
rename to TwlBackupChecker/CTR/DataExportImportTool/window.h
diff --git a/TwlBackupChecker/FalsifyTwlBackup/FalsifyTwlBackup.sln b/TwlBackupChecker/Windows/FalsifyTwlBackup/FalsifyTwlBackup.sln
similarity index 100%
rename from TwlBackupChecker/FalsifyTwlBackup/FalsifyTwlBackup.sln
rename to TwlBackupChecker/Windows/FalsifyTwlBackup/FalsifyTwlBackup.sln
diff --git a/TwlBackupChecker/FalsifyTwlBackup/FalsifyTwlBackup/FalsifyTwlBackup.csproj b/TwlBackupChecker/Windows/FalsifyTwlBackup/FalsifyTwlBackup/FalsifyTwlBackup.csproj
similarity index 100%
rename from TwlBackupChecker/FalsifyTwlBackup/FalsifyTwlBackup/FalsifyTwlBackup.csproj
rename to TwlBackupChecker/Windows/FalsifyTwlBackup/FalsifyTwlBackup/FalsifyTwlBackup.csproj
diff --git a/TwlBackupChecker/FalsifyTwlBackup/FalsifyTwlBackup/Program.cs b/TwlBackupChecker/Windows/FalsifyTwlBackup/FalsifyTwlBackup/Program.cs
similarity index 100%
rename from TwlBackupChecker/FalsifyTwlBackup/FalsifyTwlBackup/Program.cs
rename to TwlBackupChecker/Windows/FalsifyTwlBackup/FalsifyTwlBackup/Program.cs
diff --git a/TwlBackupChecker/FalsifyTwlBackup/FalsifyTwlBackup/Properties.cs b/TwlBackupChecker/Windows/FalsifyTwlBackup/FalsifyTwlBackup/Properties.cs
similarity index 100%
rename from TwlBackupChecker/FalsifyTwlBackup/FalsifyTwlBackup/Properties.cs
rename to TwlBackupChecker/Windows/FalsifyTwlBackup/FalsifyTwlBackup/Properties.cs
diff --git a/TwlBackupChecker/FalsifyTwlBackup/FalsifyTwlBackup/Properties/AssemblyInfo.cs b/TwlBackupChecker/Windows/FalsifyTwlBackup/FalsifyTwlBackup/Properties/AssemblyInfo.cs
similarity index 100%
rename from TwlBackupChecker/FalsifyTwlBackup/FalsifyTwlBackup/Properties/AssemblyInfo.cs
rename to TwlBackupChecker/Windows/FalsifyTwlBackup/FalsifyTwlBackup/Properties/AssemblyInfo.cs
diff --git a/TwlBackupChecker/FalsifyTwlBackup/FalsifyTwlBackup/TWLBackupBlock.dll b/TwlBackupChecker/Windows/FalsifyTwlBackup/FalsifyTwlBackup/TWLBackupBlock.dll
similarity index 100%
rename from TwlBackupChecker/FalsifyTwlBackup/FalsifyTwlBackup/TWLBackupBlock.dll
rename to TwlBackupChecker/Windows/FalsifyTwlBackup/FalsifyTwlBackup/TWLBackupBlock.dll
diff --git a/TwlBackupChecker/FalsifyTwlBackup/FalsifyTwlBackup/bin/Debug/FalsifyTwlBackup.exe b/TwlBackupChecker/Windows/FalsifyTwlBackup/FalsifyTwlBackup/bin/Debug/FalsifyTwlBackup.exe
similarity index 100%
rename from TwlBackupChecker/FalsifyTwlBackup/FalsifyTwlBackup/bin/Debug/FalsifyTwlBackup.exe
rename to TwlBackupChecker/Windows/FalsifyTwlBackup/FalsifyTwlBackup/bin/Debug/FalsifyTwlBackup.exe
diff --git a/TwlBackupChecker/FalsifyTwlBackup/FalsifyTwlBackup/bin/Debug/FalsifyTwlBackup.pdb b/TwlBackupChecker/Windows/FalsifyTwlBackup/FalsifyTwlBackup/bin/Debug/FalsifyTwlBackup.pdb
similarity index 100%
rename from TwlBackupChecker/FalsifyTwlBackup/FalsifyTwlBackup/bin/Debug/FalsifyTwlBackup.pdb
rename to TwlBackupChecker/Windows/FalsifyTwlBackup/FalsifyTwlBackup/bin/Debug/FalsifyTwlBackup.pdb
diff --git a/TwlBackupChecker/FalsifyTwlBackup/FalsifyTwlBackup/bin/Debug/FalsifyTwlBackup.vshost.exe b/TwlBackupChecker/Windows/FalsifyTwlBackup/FalsifyTwlBackup/bin/Debug/FalsifyTwlBackup.vshost.exe
similarity index 100%
rename from TwlBackupChecker/FalsifyTwlBackup/FalsifyTwlBackup/bin/Debug/FalsifyTwlBackup.vshost.exe
rename to TwlBackupChecker/Windows/FalsifyTwlBackup/FalsifyTwlBackup/bin/Debug/FalsifyTwlBackup.vshost.exe
diff --git a/TwlBackupChecker/FalsifyTwlBackup/FalsifyTwlBackup/bin/Debug/FalsifyTwlBackup.vshost.exe.manifest b/TwlBackupChecker/Windows/FalsifyTwlBackup/FalsifyTwlBackup/bin/Debug/FalsifyTwlBackup.vshost.exe.manifest
similarity index 100%
rename from TwlBackupChecker/FalsifyTwlBackup/FalsifyTwlBackup/bin/Debug/FalsifyTwlBackup.vshost.exe.manifest
rename to TwlBackupChecker/Windows/FalsifyTwlBackup/FalsifyTwlBackup/bin/Debug/FalsifyTwlBackup.vshost.exe.manifest
diff --git a/TwlBackupChecker/FalsifyTwlBackup/FalsifyTwlBackup/bin/Debug/TWLBackupBlock.dll b/TwlBackupChecker/Windows/FalsifyTwlBackup/FalsifyTwlBackup/bin/Debug/TWLBackupBlock.dll
similarity index 100%
rename from TwlBackupChecker/FalsifyTwlBackup/FalsifyTwlBackup/bin/Debug/TWLBackupBlock.dll
rename to TwlBackupChecker/Windows/FalsifyTwlBackup/FalsifyTwlBackup/bin/Debug/TWLBackupBlock.dll
diff --git a/TwlBackupChecker/FalsifyTwlBackup/FalsifyTwlBackup/bin/Release/FalsifyTwlBackup.exe b/TwlBackupChecker/Windows/FalsifyTwlBackup/FalsifyTwlBackup/bin/Release/FalsifyTwlBackup.exe
similarity index 100%
rename from TwlBackupChecker/FalsifyTwlBackup/FalsifyTwlBackup/bin/Release/FalsifyTwlBackup.exe
rename to TwlBackupChecker/Windows/FalsifyTwlBackup/FalsifyTwlBackup/bin/Release/FalsifyTwlBackup.exe
diff --git a/TwlBackupChecker/FalsifyTwlBackup/FalsifyTwlBackup/bin/Release/FalsifyTwlBackup.pdb b/TwlBackupChecker/Windows/FalsifyTwlBackup/FalsifyTwlBackup/bin/Release/FalsifyTwlBackup.pdb
similarity index 100%
rename from TwlBackupChecker/FalsifyTwlBackup/FalsifyTwlBackup/bin/Release/FalsifyTwlBackup.pdb
rename to TwlBackupChecker/Windows/FalsifyTwlBackup/FalsifyTwlBackup/bin/Release/FalsifyTwlBackup.pdb
diff --git a/TwlBackupChecker/FalsifyTwlBackup/FalsifyTwlBackup/bin/Release/TWLBackupBlock.dll b/TwlBackupChecker/Windows/FalsifyTwlBackup/FalsifyTwlBackup/bin/Release/TWLBackupBlock.dll
similarity index 100%
rename from TwlBackupChecker/FalsifyTwlBackup/FalsifyTwlBackup/bin/Release/TWLBackupBlock.dll
rename to TwlBackupChecker/Windows/FalsifyTwlBackup/FalsifyTwlBackup/bin/Release/TWLBackupBlock.dll
diff --git a/TwlBackupChecker/FalsifyTwlBackup/FalsifyTwlBackup/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/TwlBackupChecker/Windows/FalsifyTwlBackup/FalsifyTwlBackup/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
similarity index 100%
rename from TwlBackupChecker/FalsifyTwlBackup/FalsifyTwlBackup/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
rename to TwlBackupChecker/Windows/FalsifyTwlBackup/FalsifyTwlBackup/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
diff --git a/TwlBackupChecker/FalsifyTwlBackup/FalsifyTwlBackup/obj/x86/Debug/FalsifyTwlBackup.csproj.FileListAbsolute.txt b/TwlBackupChecker/Windows/FalsifyTwlBackup/FalsifyTwlBackup/obj/x86/Debug/FalsifyTwlBackup.csproj.FileListAbsolute.txt
similarity index 100%
rename from TwlBackupChecker/FalsifyTwlBackup/FalsifyTwlBackup/obj/x86/Debug/FalsifyTwlBackup.csproj.FileListAbsolute.txt
rename to TwlBackupChecker/Windows/FalsifyTwlBackup/FalsifyTwlBackup/obj/x86/Debug/FalsifyTwlBackup.csproj.FileListAbsolute.txt
diff --git a/TwlBackupChecker/FalsifyTwlBackup/FalsifyTwlBackup/obj/x86/Debug/FalsifyTwlBackup.exe b/TwlBackupChecker/Windows/FalsifyTwlBackup/FalsifyTwlBackup/obj/x86/Debug/FalsifyTwlBackup.exe
similarity index 100%
rename from TwlBackupChecker/FalsifyTwlBackup/FalsifyTwlBackup/obj/x86/Debug/FalsifyTwlBackup.exe
rename to TwlBackupChecker/Windows/FalsifyTwlBackup/FalsifyTwlBackup/obj/x86/Debug/FalsifyTwlBackup.exe
diff --git a/TwlBackupChecker/FalsifyTwlBackup/FalsifyTwlBackup/obj/x86/Debug/FalsifyTwlBackup.pdb b/TwlBackupChecker/Windows/FalsifyTwlBackup/FalsifyTwlBackup/obj/x86/Debug/FalsifyTwlBackup.pdb
similarity index 100%
rename from TwlBackupChecker/FalsifyTwlBackup/FalsifyTwlBackup/obj/x86/Debug/FalsifyTwlBackup.pdb
rename to TwlBackupChecker/Windows/FalsifyTwlBackup/FalsifyTwlBackup/obj/x86/Debug/FalsifyTwlBackup.pdb
diff --git a/TwlBackupChecker/FalsifyTwlBackup/FalsifyTwlBackup/obj/x86/Release/DesignTimeResolveAssemblyReferences.cache b/TwlBackupChecker/Windows/FalsifyTwlBackup/FalsifyTwlBackup/obj/x86/Release/DesignTimeResolveAssemblyReferences.cache
similarity index 100%
rename from TwlBackupChecker/FalsifyTwlBackup/FalsifyTwlBackup/obj/x86/Release/DesignTimeResolveAssemblyReferences.cache
rename to TwlBackupChecker/Windows/FalsifyTwlBackup/FalsifyTwlBackup/obj/x86/Release/DesignTimeResolveAssemblyReferences.cache
diff --git a/TwlBackupChecker/FalsifyTwlBackup/FalsifyTwlBackup/obj/x86/Release/DesignTimeResolveAssemblyReferencesInput.cache b/TwlBackupChecker/Windows/FalsifyTwlBackup/FalsifyTwlBackup/obj/x86/Release/DesignTimeResolveAssemblyReferencesInput.cache
similarity index 100%
rename from TwlBackupChecker/FalsifyTwlBackup/FalsifyTwlBackup/obj/x86/Release/DesignTimeResolveAssemblyReferencesInput.cache
rename to TwlBackupChecker/Windows/FalsifyTwlBackup/FalsifyTwlBackup/obj/x86/Release/DesignTimeResolveAssemblyReferencesInput.cache
diff --git a/TwlBackupChecker/FalsifyTwlBackup/FalsifyTwlBackup/obj/x86/Release/FalsifyTwlBackup.csproj.FileListAbsolute.txt b/TwlBackupChecker/Windows/FalsifyTwlBackup/FalsifyTwlBackup/obj/x86/Release/FalsifyTwlBackup.csproj.FileListAbsolute.txt
similarity index 100%
rename from TwlBackupChecker/FalsifyTwlBackup/FalsifyTwlBackup/obj/x86/Release/FalsifyTwlBackup.csproj.FileListAbsolute.txt
rename to TwlBackupChecker/Windows/FalsifyTwlBackup/FalsifyTwlBackup/obj/x86/Release/FalsifyTwlBackup.csproj.FileListAbsolute.txt
diff --git a/TwlBackupChecker/FalsifyTwlBackup/FalsifyTwlBackup/obj/x86/Release/FalsifyTwlBackup.exe b/TwlBackupChecker/Windows/FalsifyTwlBackup/FalsifyTwlBackup/obj/x86/Release/FalsifyTwlBackup.exe
similarity index 100%
rename from TwlBackupChecker/FalsifyTwlBackup/FalsifyTwlBackup/obj/x86/Release/FalsifyTwlBackup.exe
rename to TwlBackupChecker/Windows/FalsifyTwlBackup/FalsifyTwlBackup/obj/x86/Release/FalsifyTwlBackup.exe
diff --git a/TwlBackupChecker/FalsifyTwlBackup/FalsifyTwlBackup/obj/x86/Release/FalsifyTwlBackup.pdb b/TwlBackupChecker/Windows/FalsifyTwlBackup/FalsifyTwlBackup/obj/x86/Release/FalsifyTwlBackup.pdb
similarity index 100%
rename from TwlBackupChecker/FalsifyTwlBackup/FalsifyTwlBackup/obj/x86/Release/FalsifyTwlBackup.pdb
rename to TwlBackupChecker/Windows/FalsifyTwlBackup/FalsifyTwlBackup/obj/x86/Release/FalsifyTwlBackup.pdb
diff --git a/TwlBackupChecker/FalsifyTwlBackup/FalsifyTwlBackup/obj/x86/Release/ResolveAssemblyReference.cache b/TwlBackupChecker/Windows/FalsifyTwlBackup/FalsifyTwlBackup/obj/x86/Release/ResolveAssemblyReference.cache
similarity index 100%
rename from TwlBackupChecker/FalsifyTwlBackup/FalsifyTwlBackup/obj/x86/Release/ResolveAssemblyReference.cache
rename to TwlBackupChecker/Windows/FalsifyTwlBackup/FalsifyTwlBackup/obj/x86/Release/ResolveAssemblyReference.cache
diff --git a/TwlBackupChecker/TWLBackupBlock/TWLBackupBlock.sln b/TwlBackupChecker/Windows/TWLBackupBlock/TWLBackupBlock.sln
similarity index 100%
rename from TwlBackupChecker/TWLBackupBlock/TWLBackupBlock.sln
rename to TwlBackupChecker/Windows/TWLBackupBlock/TWLBackupBlock.sln
diff --git a/TwlBackupChecker/TWLBackupBlock/TWLBackupBlock/AbstractBody.cs b/TwlBackupChecker/Windows/TWLBackupBlock/TWLBackupBlock/AbstractBody.cs
similarity index 100%
rename from TwlBackupChecker/TWLBackupBlock/TWLBackupBlock/AbstractBody.cs
rename to TwlBackupChecker/Windows/TWLBackupBlock/TWLBackupBlock/AbstractBody.cs
diff --git a/TwlBackupChecker/TWLBackupBlock/TWLBackupBlock/AesCmac.cs b/TwlBackupChecker/Windows/TWLBackupBlock/TWLBackupBlock/AesCmac.cs
similarity index 100%
rename from TwlBackupChecker/TWLBackupBlock/TWLBackupBlock/AesCmac.cs
rename to TwlBackupChecker/Windows/TWLBackupBlock/TWLBackupBlock/AesCmac.cs
diff --git a/TwlBackupChecker/TWLBackupBlock/TWLBackupBlock/Block.cs b/TwlBackupChecker/Windows/TWLBackupBlock/TWLBackupBlock/Block.cs
similarity index 100%
rename from TwlBackupChecker/TWLBackupBlock/TWLBackupBlock/Block.cs
rename to TwlBackupChecker/Windows/TWLBackupBlock/TWLBackupBlock/Block.cs
diff --git a/TwlBackupChecker/TWLBackupBlock/TWLBackupBlock/Blocks.cs b/TwlBackupChecker/Windows/TWLBackupBlock/TWLBackupBlock/Blocks.cs
similarity index 100%
rename from TwlBackupChecker/TWLBackupBlock/TWLBackupBlock/Blocks.cs
rename to TwlBackupChecker/Windows/TWLBackupBlock/TWLBackupBlock/Blocks.cs
diff --git a/TwlBackupChecker/TWLBackupBlock/TWLBackupBlock/Body.cs b/TwlBackupChecker/Windows/TWLBackupBlock/TWLBackupBlock/Body.cs
similarity index 100%
rename from TwlBackupChecker/TWLBackupBlock/TWLBackupBlock/Body.cs
rename to TwlBackupChecker/Windows/TWLBackupBlock/TWLBackupBlock/Body.cs
diff --git a/TwlBackupChecker/TWLBackupBlock/TWLBackupBlock/ExtBinaryReader.cs b/TwlBackupChecker/Windows/TWLBackupBlock/TWLBackupBlock/ExtBinaryReader.cs
similarity index 100%
rename from TwlBackupChecker/TWLBackupBlock/TWLBackupBlock/ExtBinaryReader.cs
rename to TwlBackupChecker/Windows/TWLBackupBlock/TWLBackupBlock/ExtBinaryReader.cs
diff --git a/TwlBackupChecker/TWLBackupBlock/TWLBackupBlock/HeaderBody.cs b/TwlBackupChecker/Windows/TWLBackupBlock/TWLBackupBlock/HeaderBody.cs
similarity index 100%
rename from TwlBackupChecker/TWLBackupBlock/TWLBackupBlock/HeaderBody.cs
rename to TwlBackupChecker/Windows/TWLBackupBlock/TWLBackupBlock/HeaderBody.cs
diff --git a/TwlBackupChecker/TWLBackupBlock/TWLBackupBlock/Properties/AssemblyInfo.cs b/TwlBackupChecker/Windows/TWLBackupBlock/TWLBackupBlock/Properties/AssemblyInfo.cs
similarity index 100%
rename from TwlBackupChecker/TWLBackupBlock/TWLBackupBlock/Properties/AssemblyInfo.cs
rename to TwlBackupChecker/Windows/TWLBackupBlock/TWLBackupBlock/Properties/AssemblyInfo.cs
diff --git a/TwlBackupChecker/TWLBackupBlock/TWLBackupBlock/Properties/Resources.Designer.cs b/TwlBackupChecker/Windows/TWLBackupBlock/TWLBackupBlock/Properties/Resources.Designer.cs
similarity index 100%
rename from TwlBackupChecker/TWLBackupBlock/TWLBackupBlock/Properties/Resources.Designer.cs
rename to TwlBackupChecker/Windows/TWLBackupBlock/TWLBackupBlock/Properties/Resources.Designer.cs
diff --git a/TwlBackupChecker/TWLBackupBlock/TWLBackupBlock/Properties/Resources.resx b/TwlBackupChecker/Windows/TWLBackupBlock/TWLBackupBlock/Properties/Resources.resx
similarity index 100%
rename from TwlBackupChecker/TWLBackupBlock/TWLBackupBlock/Properties/Resources.resx
rename to TwlBackupChecker/Windows/TWLBackupBlock/TWLBackupBlock/Properties/Resources.resx
diff --git a/TwlBackupChecker/TWLBackupBlock/TWLBackupBlock/Properties/Settings.Designer.cs b/TwlBackupChecker/Windows/TWLBackupBlock/TWLBackupBlock/Properties/Settings.Designer.cs
similarity index 100%
rename from TwlBackupChecker/TWLBackupBlock/TWLBackupBlock/Properties/Settings.Designer.cs
rename to TwlBackupChecker/Windows/TWLBackupBlock/TWLBackupBlock/Properties/Settings.Designer.cs
diff --git a/TwlBackupChecker/TWLBackupBlock/TWLBackupBlock/Properties/Settings.settings b/TwlBackupChecker/Windows/TWLBackupBlock/TWLBackupBlock/Properties/Settings.settings
similarity index 100%
rename from TwlBackupChecker/TWLBackupBlock/TWLBackupBlock/Properties/Settings.settings
rename to TwlBackupChecker/Windows/TWLBackupBlock/TWLBackupBlock/Properties/Settings.settings
diff --git a/TwlBackupChecker/TWLBackupBlock/TWLBackupBlock/SignatureBody.cs b/TwlBackupChecker/Windows/TWLBackupBlock/TWLBackupBlock/SignatureBody.cs
similarity index 100%
rename from TwlBackupChecker/TWLBackupBlock/TWLBackupBlock/SignatureBody.cs
rename to TwlBackupChecker/Windows/TWLBackupBlock/TWLBackupBlock/SignatureBody.cs
diff --git a/TwlBackupChecker/TWLBackupBlock/TWLBackupBlock/TwlBackupBlock.csproj b/TwlBackupChecker/Windows/TWLBackupBlock/TWLBackupBlock/TwlBackupBlock.csproj
similarity index 100%
rename from TwlBackupChecker/TWLBackupBlock/TWLBackupBlock/TwlBackupBlock.csproj
rename to TwlBackupChecker/Windows/TWLBackupBlock/TWLBackupBlock/TwlBackupBlock.csproj
diff --git a/TwlBackupChecker/TWLBackupBlock/TWLBackupBlock/Utility.cs b/TwlBackupChecker/Windows/TWLBackupBlock/TWLBackupBlock/Utility.cs
similarity index 100%
rename from TwlBackupChecker/TWLBackupBlock/TWLBackupBlock/Utility.cs
rename to TwlBackupChecker/Windows/TWLBackupBlock/TWLBackupBlock/Utility.cs