diff --git a/Examples/Tutorial/CMakeLists.txt b/Examples/Tutorial/CMakeLists.txt
index 07b318ee39..230332d15a 100644
--- a/Examples/Tutorial/CMakeLists.txt
+++ b/Examples/Tutorial/CMakeLists.txt
@@ -1,16 +1,5 @@
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+
 foreach(stepNo RANGE 1 8)
-  mitk_create_executable(Step${stepNo}
-    FILES_CMAKE Step${stepNo}.cmake
-    DEPENDS QmitkExt
-    QT4_MODULES QtGui
-    )
+  add_subdirectory(Step${stepNo})
 endforeach()
-
-add_dependencies(Step7 Step6)
-add_dependencies(Step8 Step7)
-
-# adding additional example for mitk itk and vtk interaction
-mitk_create_executable(mitkWithITKAndVTK
-  DEPENDS Mitk IpPicSupport
-  FILES_CMAKE mitkWithITKAndVTK.cmake
-  )
diff --git a/Examples/Tutorial/ITKAndVTK/CMakeLists.txt b/Examples/Tutorial/ITKAndVTK/CMakeLists.txt
new file mode 100644
index 0000000000..06f387aefc
--- /dev/null
+++ b/Examples/Tutorial/ITKAndVTK/CMakeLists.txt
@@ -0,0 +1,4 @@
+# adding additional example for mitk itk and vtk interaction
+mitk_create_executable(mitkWithITKAndVTK
+  DEPENDS Mitk IpPicSupport
+  )
diff --git a/Examples/Tutorial/mitkWithITKAndVTK.cmake b/Examples/Tutorial/ITKAndVTK/files.cmake
similarity index 100%
rename from Examples/Tutorial/mitkWithITKAndVTK.cmake
rename to Examples/Tutorial/ITKAndVTK/files.cmake
diff --git a/Examples/Tutorial/mitkWithITKAndVTK.cpp b/Examples/Tutorial/ITKAndVTK/mitkWithITKAndVTK.cpp
similarity index 100%
rename from Examples/Tutorial/mitkWithITKAndVTK.cpp
rename to Examples/Tutorial/ITKAndVTK/mitkWithITKAndVTK.cpp
diff --git a/Examples/Tutorial/Step1/CMakeLists.txt b/Examples/Tutorial/Step1/CMakeLists.txt
new file mode 100644
index 0000000000..48a1f92698
--- /dev/null
+++ b/Examples/Tutorial/Step1/CMakeLists.txt
@@ -0,0 +1,4 @@
+mitk_create_executable(Step1
+  DEPENDS QmitkExt
+  )
+
diff --git a/Examples/Tutorial/Step1.cpp b/Examples/Tutorial/Step1/Step1.cpp
similarity index 100%
rename from Examples/Tutorial/Step1.cpp
rename to Examples/Tutorial/Step1/Step1.cpp
diff --git a/Examples/Tutorial/Step1.cmake b/Examples/Tutorial/Step1/files.cmake
similarity index 61%
rename from Examples/Tutorial/Step1.cmake
rename to Examples/Tutorial/Step1/files.cmake
index 92a91b1c35..f737b9bdaa 100644
--- a/Examples/Tutorial/Step1.cmake
+++ b/Examples/Tutorial/Step1/files.cmake
@@ -1,4 +1,4 @@
 set(CPP_FILES
   Step1.cpp
-  QtTesting.cpp
+  ../QtTesting.cpp
   )
diff --git a/Examples/Tutorial/Step10.cpp b/Examples/Tutorial/Step10/Step10.cpp
similarity index 100%
rename from Examples/Tutorial/Step10.cpp
rename to Examples/Tutorial/Step10/Step10.cpp
diff --git a/Examples/Tutorial/Step10.h b/Examples/Tutorial/Step10/Step10.h
similarity index 100%
rename from Examples/Tutorial/Step10.h
rename to Examples/Tutorial/Step10/Step10.h
diff --git a/Examples/Tutorial/Step2/CMakeLists.txt b/Examples/Tutorial/Step2/CMakeLists.txt
new file mode 100644
index 0000000000..cb63a6958b
--- /dev/null
+++ b/Examples/Tutorial/Step2/CMakeLists.txt
@@ -0,0 +1,3 @@
+mitk_create_executable(Step2
+  DEPENDS QmitkExt
+  )
diff --git a/Examples/Tutorial/Step2.cpp b/Examples/Tutorial/Step2/Step2.cpp
similarity index 100%
rename from Examples/Tutorial/Step2.cpp
rename to Examples/Tutorial/Step2/Step2.cpp
diff --git a/Examples/Tutorial/Step2.cmake b/Examples/Tutorial/Step2/files.cmake
similarity index 61%
rename from Examples/Tutorial/Step2.cmake
rename to Examples/Tutorial/Step2/files.cmake
index f5b09d7956..228aaba31f 100644
--- a/Examples/Tutorial/Step2.cmake
+++ b/Examples/Tutorial/Step2/files.cmake
@@ -1,4 +1,4 @@
 set(CPP_FILES
   Step2.cpp
-  QtTesting.cpp
+  ../QtTesting.cpp
   )
diff --git a/Examples/Tutorial/Step3/CMakeLists.txt b/Examples/Tutorial/Step3/CMakeLists.txt
new file mode 100644
index 0000000000..f4a03db0f2
--- /dev/null
+++ b/Examples/Tutorial/Step3/CMakeLists.txt
@@ -0,0 +1,3 @@
+mitk_create_executable(Step3
+  DEPENDS QmitkExt
+  )
diff --git a/Examples/Tutorial/Step3.cpp b/Examples/Tutorial/Step3/Step3.cpp
similarity index 100%
rename from Examples/Tutorial/Step3.cpp
rename to Examples/Tutorial/Step3/Step3.cpp
diff --git a/Examples/Tutorial/Step3.cmake b/Examples/Tutorial/Step3/files.cmake
similarity index 61%
rename from Examples/Tutorial/Step3.cmake
rename to Examples/Tutorial/Step3/files.cmake
index 87d69ded85..92387dd3f9 100644
--- a/Examples/Tutorial/Step3.cmake
+++ b/Examples/Tutorial/Step3/files.cmake
@@ -1,4 +1,4 @@
 set(CPP_FILES
   Step3.cpp
-  QtTesting.cpp
+  ../QtTesting.cpp
   )
diff --git a/Examples/Tutorial/Step4/CMakeLists.txt b/Examples/Tutorial/Step4/CMakeLists.txt
new file mode 100644
index 0000000000..fa8209e65c
--- /dev/null
+++ b/Examples/Tutorial/Step4/CMakeLists.txt
@@ -0,0 +1,3 @@
+mitk_create_executable(Step4
+  DEPENDS QmitkExt
+  )
diff --git a/Examples/Tutorial/Step4.cpp b/Examples/Tutorial/Step4/Step4.cpp
similarity index 100%
rename from Examples/Tutorial/Step4.cpp
rename to Examples/Tutorial/Step4/Step4.cpp
diff --git a/Examples/Tutorial/Step4.cmake b/Examples/Tutorial/Step4/files.cmake
similarity index 61%
rename from Examples/Tutorial/Step4.cmake
rename to Examples/Tutorial/Step4/files.cmake
index b0f2d178f7..97d991f251 100644
--- a/Examples/Tutorial/Step4.cmake
+++ b/Examples/Tutorial/Step4/files.cmake
@@ -1,4 +1,4 @@
 set(CPP_FILES
   Step4.cpp
-  QtTesting.cpp
+  ../QtTesting.cpp
   )
diff --git a/Examples/Tutorial/Step5/CMakeLists.txt b/Examples/Tutorial/Step5/CMakeLists.txt
new file mode 100644
index 0000000000..21d1baafec
--- /dev/null
+++ b/Examples/Tutorial/Step5/CMakeLists.txt
@@ -0,0 +1,3 @@
+mitk_create_executable(Step5
+  DEPENDS QmitkExt
+  )
diff --git a/Examples/Tutorial/Step5.cpp b/Examples/Tutorial/Step5/Step5.cpp
similarity index 100%
rename from Examples/Tutorial/Step5.cpp
rename to Examples/Tutorial/Step5/Step5.cpp
diff --git a/Examples/Tutorial/Step5.cmake b/Examples/Tutorial/Step5/files.cmake
similarity index 61%
rename from Examples/Tutorial/Step5.cmake
rename to Examples/Tutorial/Step5/files.cmake
index 313b66ea2f..37b77371cc 100644
--- a/Examples/Tutorial/Step5.cmake
+++ b/Examples/Tutorial/Step5/files.cmake
@@ -1,4 +1,4 @@
 set(CPP_FILES
   Step5.cpp
-  QtTesting.cpp
+  ../QtTesting.cpp
   )
diff --git a/Examples/Tutorial/Step6/CMakeLists.txt b/Examples/Tutorial/Step6/CMakeLists.txt
new file mode 100644
index 0000000000..09833d2525
--- /dev/null
+++ b/Examples/Tutorial/Step6/CMakeLists.txt
@@ -0,0 +1,3 @@
+mitk_create_executable(Step6
+  DEPENDS QmitkExt
+  )
diff --git a/Examples/Tutorial/Step6.cpp b/Examples/Tutorial/Step6/Step6.cpp
similarity index 100%
rename from Examples/Tutorial/Step6.cpp
rename to Examples/Tutorial/Step6/Step6.cpp
diff --git a/Examples/Tutorial/Step6.h b/Examples/Tutorial/Step6/Step6.h
similarity index 100%
rename from Examples/Tutorial/Step6.h
rename to Examples/Tutorial/Step6/Step6.h
diff --git a/Examples/Tutorial/Step6RegionGrowing.txx b/Examples/Tutorial/Step6/Step6RegionGrowing.txx
similarity index 100%
rename from Examples/Tutorial/Step6RegionGrowing.txx
rename to Examples/Tutorial/Step6/Step6RegionGrowing.txx
diff --git a/Examples/Tutorial/Step6RegionGrowing1.cpp b/Examples/Tutorial/Step6/Step6RegionGrowing1.cpp
similarity index 100%
rename from Examples/Tutorial/Step6RegionGrowing1.cpp
rename to Examples/Tutorial/Step6/Step6RegionGrowing1.cpp
diff --git a/Examples/Tutorial/Step6RegionGrowing2.cpp b/Examples/Tutorial/Step6/Step6RegionGrowing2.cpp
similarity index 100%
rename from Examples/Tutorial/Step6RegionGrowing2.cpp
rename to Examples/Tutorial/Step6/Step6RegionGrowing2.cpp
diff --git a/Examples/Tutorial/Step6RegionGrowing3.cpp b/Examples/Tutorial/Step6/Step6RegionGrowing3.cpp
similarity index 100%
rename from Examples/Tutorial/Step6RegionGrowing3.cpp
rename to Examples/Tutorial/Step6/Step6RegionGrowing3.cpp
diff --git a/Examples/Tutorial/Step6main.cpp b/Examples/Tutorial/Step6/Step6main.cpp
similarity index 100%
rename from Examples/Tutorial/Step6main.cpp
rename to Examples/Tutorial/Step6/Step6main.cpp
diff --git a/Examples/Tutorial/Step6.cmake b/Examples/Tutorial/Step6/files.cmake
similarity index 89%
rename from Examples/Tutorial/Step6.cmake
rename to Examples/Tutorial/Step6/files.cmake
index 60ce1c74cb..51e4db2011 100644
--- a/Examples/Tutorial/Step6.cmake
+++ b/Examples/Tutorial/Step6/files.cmake
@@ -1,12 +1,12 @@
 set(CPP_FILES
   Step6.cpp
   Step6RegionGrowing1.cpp
   Step6RegionGrowing2.cpp
   Step6RegionGrowing3.cpp
   Step6main.cpp
-  QtTesting.cpp
+  ../QtTesting.cpp
   )
 
 set(MOC_H_FILES
   Step6.h
   )
diff --git a/Examples/Tutorial/Step7.cmake b/Examples/Tutorial/Step7.cmake
deleted file mode 100644
index 27bf1fc393..0000000000
--- a/Examples/Tutorial/Step7.cmake
+++ /dev/null
@@ -1,14 +0,0 @@
-set(CPP_FILES
-  Step7.cpp
-  Step6RegionGrowing1.cpp
-  Step6RegionGrowing2.cpp
-  Step6RegionGrowing3.cpp
-  Step6.cpp
-  Step7main.cpp
-  QtTesting.cpp
-  moc_Step6.cxx
-  )
-
-set(MOC_H_FILES
-  Step7.h
-  )
diff --git a/Examples/Tutorial/Step7/CMakeLists.txt b/Examples/Tutorial/Step7/CMakeLists.txt
new file mode 100644
index 0000000000..be05fd8c9e
--- /dev/null
+++ b/Examples/Tutorial/Step7/CMakeLists.txt
@@ -0,0 +1,5 @@
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../Step6)
+
+mitk_create_executable(Step7
+  DEPENDS QmitkExt
+  )
diff --git a/Examples/Tutorial/Step7.cpp b/Examples/Tutorial/Step7/Step7.cpp
similarity index 100%
rename from Examples/Tutorial/Step7.cpp
rename to Examples/Tutorial/Step7/Step7.cpp
diff --git a/Examples/Tutorial/Step7.h b/Examples/Tutorial/Step7/Step7.h
similarity index 100%
rename from Examples/Tutorial/Step7.h
rename to Examples/Tutorial/Step7/Step7.h
diff --git a/Examples/Tutorial/Step7main.cpp b/Examples/Tutorial/Step7/Step7main.cpp
similarity index 100%
rename from Examples/Tutorial/Step7main.cpp
rename to Examples/Tutorial/Step7/Step7main.cpp
diff --git a/Examples/Tutorial/Step7/files.cmake b/Examples/Tutorial/Step7/files.cmake
new file mode 100644
index 0000000000..72cf47060e
--- /dev/null
+++ b/Examples/Tutorial/Step7/files.cmake
@@ -0,0 +1,14 @@
+set(CPP_FILES
+  Step7.cpp
+  Step7main.cpp
+  ../Step6/Step6RegionGrowing1.cpp
+  ../Step6/Step6RegionGrowing2.cpp
+  ../Step6/Step6RegionGrowing3.cpp
+  ../Step6/Step6.cpp
+  ../QtTesting.cpp
+  )
+
+set(MOC_H_FILES
+  ../Step6/Step6.h
+  Step7.h
+  )
diff --git a/Examples/Tutorial/Step8.cmake b/Examples/Tutorial/Step8.cmake
deleted file mode 100644
index 7e46ad2ae8..0000000000
--- a/Examples/Tutorial/Step8.cmake
+++ /dev/null
@@ -1,16 +0,0 @@
-set(CPP_FILES
-  Step8.cpp
-  Step6RegionGrowing1.cpp
-  Step6RegionGrowing2.cpp
-  Step6RegionGrowing3.cpp
-  Step6.cpp
-  Step7.cpp
-  Step8main.cpp
-  QtTesting.cpp
-  moc_Step6.cxx
-  moc_Step7.cxx
-  )
-
-set(MOC_H_FILES
-  Step8.h
-  )
diff --git a/Examples/Tutorial/Step8/CMakeLists.txt b/Examples/Tutorial/Step8/CMakeLists.txt
new file mode 100644
index 0000000000..79c2d2352f
--- /dev/null
+++ b/Examples/Tutorial/Step8/CMakeLists.txt
@@ -0,0 +1,8 @@
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}/../Step6
+  ${CMAKE_CURRENT_SOURCE_DIR}/../Step7
+  )
+
+mitk_create_executable(Step8
+  DEPENDS QmitkExt
+  )
diff --git a/Examples/Tutorial/Step8.cpp b/Examples/Tutorial/Step8/Step8.cpp
similarity index 100%
rename from Examples/Tutorial/Step8.cpp
rename to Examples/Tutorial/Step8/Step8.cpp
diff --git a/Examples/Tutorial/Step8.h b/Examples/Tutorial/Step8/Step8.h
similarity index 100%
rename from Examples/Tutorial/Step8.h
rename to Examples/Tutorial/Step8/Step8.h
diff --git a/Examples/Tutorial/Step8main.cpp b/Examples/Tutorial/Step8/Step8main.cpp
similarity index 100%
rename from Examples/Tutorial/Step8main.cpp
rename to Examples/Tutorial/Step8/Step8main.cpp
diff --git a/Examples/Tutorial/Step8/files.cmake b/Examples/Tutorial/Step8/files.cmake
new file mode 100644
index 0000000000..1be2ec21f7
--- /dev/null
+++ b/Examples/Tutorial/Step8/files.cmake
@@ -0,0 +1,16 @@
+set(CPP_FILES
+  Step8.cpp
+  Step8main.cpp
+  ../Step6/Step6RegionGrowing1.cpp
+  ../Step6/Step6RegionGrowing2.cpp
+  ../Step6/Step6RegionGrowing3.cpp
+  ../Step6/Step6.cpp
+  ../Step7/Step7.cpp
+  ../QtTesting.cpp
+  )
+
+set(MOC_H_FILES
+  ../Step6/Step6.h
+  ../Step7/Step7.h
+  Step8.h
+  )
diff --git a/Modules/US/CMakeLists.txt b/Modules/US/CMakeLists.txt
index a69a8e5d5e..b50c7047d9 100644
--- a/Modules/US/CMakeLists.txt
+++ b/Modules/US/CMakeLists.txt
@@ -1,14 +1,13 @@
 MITK_CREATE_MODULE(MitkUS
   SUBPROJECTS
   INCLUDE_DIRS USControlInterfaces USFilters USModel USService
   INTERNAL_INCLUDE_DIRS ${INCLUDE_DIRS_INTERNAL}
-  QT_MODULE
   DEPENDS Mitk mitkOpenCVVideoSupport Qmitk QmitkExt
 )
 
 ## create US config
 #CONFIGURE_FILE(mitkUSConfig.h.in ${PROJECT_BINARY_DIR}/mitkUSConfig.h @ONLY)
 
 ADD_SUBDIRECTORY(USHardwareTelemed)
 
-ADD_SUBDIRECTORY(Testing)
\ No newline at end of file
+ADD_SUBDIRECTORY(Testing)