Spostate anche le librerie.

diff --git a/DiffieHellman.dll b/DiffieHellman.dll
deleted file mode 100644
index aa31051..0000000
Binary files a/DiffieHellman.dll and /dev/null differ
diff --git a/Dizzy.csproj b/Dizzy.csproj
index 85e0a4e..27b5734 100644
--- a/Dizzy.csproj
+++ b/Dizzy.csproj
@@ -58,26 +58,26 @@
     <Reference Include="Mono.Posix" />
     <Reference Include="Tamir.SharpSSH, Version=1.1.1.13, Culture=neutral, PublicKeyToken=null">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>Tamir.SharpSSH.dll</HintPath>
+      <HintPath>Libraries\Tamir.SharpSSH.dll</HintPath>
     </Reference>
     <Reference Include="Org.Mentalis.Security, Version=1.0.13.715, Culture=neutral, PublicKeyToken=null">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>Org.Mentalis.Security.dll</HintPath>
+      <HintPath>Libraries\Org.Mentalis.Security.dll</HintPath>
     </Reference>
     <Reference Include="DiffieHellman, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>DiffieHellman.dll</HintPath>
+      <HintPath>Libraries\DiffieHellman.dll</HintPath>
     </Reference>
     <Reference Include="System.Data.SQLite, Version=1.0.65.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>System.Data.SQLite.dll</HintPath>
+      <HintPath>Libraries\System.Data.SQLite.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="gtk-gui\gui.stetic">
       <LogicalName>gui.stetic</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Dizzy\sqlite3.dll">
+    <EmbeddedResource Include="Libraries\sqlite3.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </EmbeddedResource>
   </ItemGroup>
@@ -103,5 +103,6 @@
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
     <Folder Include="Dizzy\" />
+    <Folder Include="Libraries\" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Dizzy.make b/Dizzy.make
index 8e873e8..ffbc91c 100644
--- a/Dizzy.make
+++ b/Dizzy.make
@@ -11,11 +11,11 @@ COMPILE_TARGET = exe
 PROJECT_REFERENCES =
 BUILD_DIR = bin/Debug

-SQLITE3_DLL_SOURCE=Dizzy/sqlite3.dll
-TAMIR_SHARPSSH_DLL_SOURCE=Tamir.SharpSSH.dll
-DIFFIEHELLMAN_DLL_SOURCE=DiffieHellman.dll
-ORG_MENTALIS_SECURITY_DLL_SOURCE=Org.Mentalis.Security.dll
-SYSTEM_DATA_SQLITE_DLL_SOURCE=System.Data.SQLite.dll
+SQLITE3_DLL_SOURCE=Libraries/sqlite3.dll
+DIFFIEHELLMAN_DLL_SOURCE=Libraries/DiffieHellman.dll
+ORG_MENTALIS_SECURITY_DLL_SOURCE=Libraries/Org.Mentalis.Security.dll
+SYSTEM_DATA_SQLITE_DLL_SOURCE=Libraries/System.Data.SQLite.dll
+TAMIR_SHARPSSH_DLL_SOURCE=Libraries/Tamir.SharpSSH.dll
 DIZZY_EXE_MDB_SOURCE=bin/Debug/Dizzy.exe.mdb
 DIZZY_EXE_MDB=$(BUILD_DIR)/Dizzy.exe.mdb

@@ -30,11 +30,11 @@ COMPILE_TARGET = exe
 PROJECT_REFERENCES =
 BUILD_DIR = bin/Release

-SQLITE3_DLL_SOURCE=Dizzy/sqlite3.dll
-TAMIR_SHARPSSH_DLL_SOURCE=Tamir.SharpSSH.dll
-DIFFIEHELLMAN_DLL_SOURCE=DiffieHellman.dll
-ORG_MENTALIS_SECURITY_DLL_SOURCE=Org.Mentalis.Security.dll
-SYSTEM_DATA_SQLITE_DLL_SOURCE=System.Data.SQLite.dll
+SQLITE3_DLL_SOURCE=Libraries/sqlite3.dll
+DIFFIEHELLMAN_DLL_SOURCE=Libraries/DiffieHellman.dll
+ORG_MENTALIS_SECURITY_DLL_SOURCE=Libraries/Org.Mentalis.Security.dll
+SYSTEM_DATA_SQLITE_DLL_SOURCE=Libraries/System.Data.SQLite.dll
+TAMIR_SHARPSSH_DLL_SOURCE=Libraries/Tamir.SharpSSH.dll
 DIZZY_EXE_MDB=

 endif
@@ -42,14 +42,14 @@ endif
 AL=al2
 SATELLITE_ASSEMBLY_NAME=$(notdir $(basename $(ASSEMBLY))).resources.dll

-PROGRAMFILES_DIZZY = \
+PROGRAMFILES_LIBRARIES = \
 	$(SQLITE3_DLL)

 PROGRAMFILES = \
-	$(TAMIR_SHARPSSH_DLL) \
 	$(DIFFIEHELLMAN_DLL) \
 	$(ORG_MENTALIS_SECURITY_DLL) \
 	$(SYSTEM_DATA_SQLITE_DLL) \
+	$(TAMIR_SHARPSSH_DLL) \
 	$(DIZZY_EXE_MDB)

 BINARIES = \
@@ -58,7 +58,7 @@ BINARIES = \

 RESGEN=resgen2

-all: $(ASSEMBLY) $(PROGRAMFILES_DIZZY) $(PROGRAMFILES) $(BINARIES)
+all: $(ASSEMBLY) $(PROGRAMFILES_LIBRARIES) $(PROGRAMFILES) $(BINARIES)

 FILES = \
 	gtk-gui/generated.cs \
@@ -78,7 +78,7 @@ DATA_FILES =

 RESOURCES = \
 	gtk-gui/gui.stetic \
-	Dizzy/sqlite3.dll,Dizzy.Dizzy.sqlite3.dll
+	Libraries/sqlite3.dll,Dizzy.Libraries.sqlite3.dll

 EXTRAS = \
 	Dizzy/app.desktop \
@@ -92,27 +92,27 @@ REFERENCES =  \
 	Mono.Posix

 DLL_REFERENCES =  \
-	Tamir.SharpSSH.dll \
-	Org.Mentalis.Security.dll \
-	DiffieHellman.dll \
-	System.Data.SQLite.dll
+	Libraries/DiffieHellman.dll \
+	Libraries/Org.Mentalis.Security.dll \
+	Libraries/System.Data.SQLite.dll \
+	Libraries/Tamir.SharpSSH.dll

-CLEANFILES = $(PROGRAMFILES_DIZZY) $(PROGRAMFILES) $(BINARIES)
+CLEANFILES = $(PROGRAMFILES_LIBRARIES) $(PROGRAMFILES) $(BINARIES)

 include $(top_srcdir)/Makefile.include

-SQLITE3_DLL = $(BUILD_DIR)/Dizzy/sqlite3.dll
-TAMIR_SHARPSSH_DLL = $(BUILD_DIR)/Tamir.SharpSSH.dll
+SQLITE3_DLL = $(BUILD_DIR)/Libraries/sqlite3.dll
 DIFFIEHELLMAN_DLL = $(BUILD_DIR)/DiffieHellman.dll
 ORG_MENTALIS_SECURITY_DLL = $(BUILD_DIR)/Org.Mentalis.Security.dll
 SYSTEM_DATA_SQLITE_DLL = $(BUILD_DIR)/System.Data.SQLite.dll
+TAMIR_SHARPSSH_DLL = $(BUILD_DIR)/Tamir.SharpSSH.dll
 DIZZY = $(BUILD_DIR)/dizzy

 $(eval $(call emit-deploy-target,SQLITE3_DLL))
-$(eval $(call emit-deploy-target,TAMIR_SHARPSSH_DLL))
 $(eval $(call emit-deploy-target,DIFFIEHELLMAN_DLL))
 $(eval $(call emit-deploy-target,ORG_MENTALIS_SECURITY_DLL))
 $(eval $(call emit-deploy-target,SYSTEM_DATA_SQLITE_DLL))
+$(eval $(call emit-deploy-target,TAMIR_SHARPSSH_DLL))
 $(eval $(call emit-deploy-wrapper,DIZZY,dizzy,x))


diff --git a/Dizzy/sqlite3.dll b/Dizzy/sqlite3.dll
deleted file mode 100755
index ec15374..0000000
Binary files a/Dizzy/sqlite3.dll and /dev/null differ
diff --git a/Libraries/DiffieHellman.dll b/Libraries/DiffieHellman.dll
new file mode 100644
index 0000000..aa31051
Binary files /dev/null and b/Libraries/DiffieHellman.dll differ
diff --git a/Libraries/Org.Mentalis.Security.dll b/Libraries/Org.Mentalis.Security.dll
new file mode 100644
index 0000000..bac39dd
Binary files /dev/null and b/Libraries/Org.Mentalis.Security.dll differ
diff --git a/Libraries/System.Data.SQLite.dll b/Libraries/System.Data.SQLite.dll
new file mode 100644
index 0000000..66f38e7
Binary files /dev/null and b/Libraries/System.Data.SQLite.dll differ
diff --git a/Libraries/Tamir.SharpSSH.dll b/Libraries/Tamir.SharpSSH.dll
new file mode 100644
index 0000000..c2f67a8
Binary files /dev/null and b/Libraries/Tamir.SharpSSH.dll differ
diff --git a/Libraries/sqlite3.dll b/Libraries/sqlite3.dll
new file mode 100755
index 0000000..ec15374
Binary files /dev/null and b/Libraries/sqlite3.dll differ
diff --git a/Makefile.am b/Makefile.am
index 85bc69f..e5ebad4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@

-EXTRA_DIST =  expansions.m4 Tamir.SharpSSH.dll Org.Mentalis.Security.dll DiffieHellman.dll System.Data.SQLite.dll
+EXTRA_DIST =  expansions.m4 Libraries/DiffieHellman.dll Libraries/Org.Mentalis.Security.dll Libraries/System.Data.SQLite.dll Libraries/Tamir.SharpSSH.dll

 #Warning: This is an automatically generated file, do not edit!
 if ENABLE_DEBUG_X86
diff --git a/Makefile.include b/Makefile.include
index 79e6aed..9442d19 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -65,10 +65,10 @@ DISTCLEANFILES = $(GENERATED_FILES) $(pc_files) $(BUILD_DIR)/*
 pkglib_SCRIPTS = $(ASSEMBLY)
 bin_SCRIPTS = $(BINARIES)

-programfilesdizzydir = @libdir@/@PACKAGE@/Dizzy
-programfilesdizzy_DATA = $(PROGRAMFILES_DIZZY)
 programfilesdir = @libdir@/@PACKAGE@
 programfiles_DATA = $(PROGRAMFILES)
+programfileslibrariesdir = @libdir@/@PACKAGE@/Libraries
+programfileslibraries_DATA = $(PROGRAMFILES_LIBRARIES)


 # macros
diff --git a/Org.Mentalis.Security.dll b/Org.Mentalis.Security.dll
deleted file mode 100644
index bac39dd..0000000
Binary files a/Org.Mentalis.Security.dll and /dev/null differ
diff --git a/System.Data.SQLite.dll b/System.Data.SQLite.dll
deleted file mode 100644
index 66f38e7..0000000
Binary files a/System.Data.SQLite.dll and /dev/null differ
diff --git a/Tamir.SharpSSH.dll b/Tamir.SharpSSH.dll
deleted file mode 100644
index c2f67a8..0000000
Binary files a/Tamir.SharpSSH.dll and /dev/null differ