diff --git a/ccminer.vcxproj b/ccminer.vcxproj
index f240a84..8b2a01b 100644
--- a/ccminer.vcxproj
+++ b/ccminer.vcxproj
@@ -340,26 +340,18 @@
     <ClInclude Include="sph\sph_types.h" />
     <ClInclude Include="sph\sph_whirlpool.h" />
     <ClInclude Include="uint256.h" />
-  </ItemGroup>
-  <ItemGroup>
     <ClInclude Include="lyra2\Lyra2.h" />
     <ClInclude Include="lyra2\Sponge.h" />
+    <ClInclude Include="quark\groestl_transf_quad.h" />
+    <ClInclude Include="quark\groestl_functions_quad.h" />
   </ItemGroup>
   <ItemGroup>
     <CudaCompile Include="cuda.cpp" />
-    <CudaCompile Include="bitslice_transformations_quad.cu">
-      <ExcludedFromBuild>true</ExcludedFromBuild>
-    </CudaCompile>
-    <CudaCompile Include="cuda_groestlcoin.cu">
-    </CudaCompile>
-    <CudaCompile Include="cuda_myriadgroestl.cu">
-    </CudaCompile>
+    <CudaCompile Include="cuda_groestlcoin.cu" />
+    <CudaCompile Include="cuda_myriadgroestl.cu" />
     <CudaCompile Include="cuda_nist5.cu">
     </CudaCompile>
     <CudaCompile Include="zr5.cu" />
-    <CudaCompile Include="groestl_functions_quad.cu">
-      <ExcludedFromBuild>true</ExcludedFromBuild>
-    </CudaCompile>
     <CudaCompile Include="heavy\cuda_blake512.cu">
     </CudaCompile>
     <CudaCompile Include="heavy\cuda_combine.cu">
diff --git a/ccminer.vcxproj.filters b/ccminer.vcxproj.filters
index d92ba44..4d89287 100644
--- a/ccminer.vcxproj.filters
+++ b/ccminer.vcxproj.filters
@@ -368,6 +368,12 @@
     <ClInclude Include="lyra2\Sponge.h">
       <Filter>Header Files\lyra2</Filter>
     </ClInclude>
+    <ClInclude Include="quark\groestl_transf_quad.h">
+      <Filter>Source Files\CUDA\quark</Filter>
+    </ClInclude>
+    <ClInclude Include="quark\groestl_functions_quad.h">
+      <Filter>Source Files\CUDA\quark</Filter>
+    </ClInclude>
     <ClInclude Include="res\resource.h">
       <Filter>Ressources</Filter>
     </ClInclude>
@@ -379,9 +385,6 @@
     <CudaCompile Include="cuda_groestlcoin.cu">
       <Filter>Source Files\CUDA</Filter>
     </CudaCompile>
-    <CudaCompile Include="bitslice_transformations_quad.cu">
-      <Filter>Source Files\CUDA</Filter>
-    </CudaCompile>
     <CudaCompile Include="JHA\cuda_jha_keccak512.cu">
       <Filter>Source Files\CUDA\JHA</Filter>
     </CudaCompile>
@@ -571,9 +574,6 @@
     <CudaCompile Include="zr5.cu">
       <Filter>Source Files\CUDA</Filter>
     </CudaCompile>
-    <CudaCompile Include="groestl_functions_quad.cu">
-      <Filter>Source Files\CUDA\quark</Filter>
-    </CudaCompile>
     <CudaCompile Include="skein.cu">
       <Filter>Source Files\CUDA</Filter>
     </CudaCompile>
diff --git a/cuda_groestlcoin.cu b/cuda_groestlcoin.cu
index 47548a0..e580f55 100644
--- a/cuda_groestlcoin.cu
+++ b/cuda_groestlcoin.cu
@@ -13,11 +13,9 @@ extern uint32_t *d_resultNonce[MAX_GPUS];
 __constant__ uint32_t groestlcoin_gpu_msg[32];
 
 #if __CUDA_ARCH__ >= 300
-
-// 64 Registers Variant for Compute 3.0
-#include "groestl_functions_quad.cu"
-
-#include "bitslice_transformations_quad.cu"
+// 64 Registers Variant for Compute 3.0+
+#include "quark/groestl_functions_quad.h"
+#include "quark/groestl_transf_quad.h"
 #endif
 
 #define SWAB32(x) cuda_swab32(x)
diff --git a/cuda_myriadgroestl.cu b/cuda_myriadgroestl.cu
index a376740..0c9acd7 100644
--- a/cuda_myriadgroestl.cu
+++ b/cuda_myriadgroestl.cu
@@ -6,11 +6,9 @@
 #include "cuda_helper.h"
 
 #if __CUDA_ARCH__ >= 300
-
 // 64 Registers Variant for Compute 3.0
-#include "groestl_functions_quad.cu"
-
-#include "bitslice_transformations_quad.cu"
+#include "quark/groestl_functions_quad.h"
+#include "quark/groestl_transf_quad.h"
 #endif
 
 // globaler Speicher für alle HeftyHashes aller Threads
diff --git a/quark/cuda_quark_groestl512.cu b/quark/cuda_quark_groestl512.cu
index 3ec7f9b..6aa8645 100644
--- a/quark/cuda_quark_groestl512.cu
+++ b/quark/cuda_quark_groestl512.cu
@@ -9,8 +9,8 @@
 #define THF 4
 
 #if __CUDA_ARCH__ >= 300
-#include "groestl_functions_quad.cu"
-#include "bitslice_transformations_quad.cu"
+#include "quark/groestl_functions_quad.h"
+#include "quark/groestl_transf_quad.h"
 #endif
 
 #include "quark/cuda_quark_groestl512_sm20.cu"
diff --git a/groestl_functions_quad.cu b/quark/groestl_functions_quad.h
similarity index 100%
rename from groestl_functions_quad.cu
rename to quark/groestl_functions_quad.h
diff --git a/bitslice_transformations_quad.cu b/quark/groestl_transf_quad.h
similarity index 100%
rename from bitslice_transformations_quad.cu
rename to quark/groestl_transf_quad.h