diff --git a/samples/HelloPhobos/CMakeLists.txt b/samples/HelloTango/CMakeLists.txt
similarity index 54%
rename from samples/HelloPhobos/CMakeLists.txt
rename to samples/HelloTango/CMakeLists.txt
index 28b0a8b..df420ee 100644
--- a/samples/HelloPhobos/CMakeLists.txt
+++ b/samples/HelloTango/CMakeLists.txt
@@ -1,3 +1,23 @@
+#################################
+# Preamble
+##############
+
+# where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ 
+# is checked
+set(CMAKE_MODULE_PATH
+	${CMAKE_SOURCE_DIR}/cmake/Modules
+)
+
+# Using Tango
+set(CMAKE_D_USE_TANGO True)
+
+# check for DDoc usage
+include(UseDDoc)
+
+#################################
+# Project
+##############
+
 # The name of our project is "HELLO".  CMakeLists files in this project can
 # refer to the root source directory of the project as ${HELLO_SOURCE_DIR} and
 # to the root binary directory of the project as ${HELLO_BINARY_DIR}.
@@ -7,4 +27,4 @@ PROJECT (HELLO D)
 # cause another cmake executable to run.  The same process will walk through
 # the project's entire directory structure.
 ADD_SUBDIRECTORY (Hello)
-ADD_SUBDIRECTORY (Demo)
\ No newline at end of file
+ADD_SUBDIRECTORY (Demo)
diff --git a/samples/HelloPhobos/Demo/CMakeLists.txt b/samples/HelloTango/Demo/CMakeLists.txt
similarity index 63%
rename from samples/HelloPhobos/Demo/CMakeLists.txt
rename to samples/HelloTango/Demo/CMakeLists.txt
index dea5ba6..7bf0014 100644
--- a/samples/HelloPhobos/Demo/CMakeLists.txt
+++ b/samples/HelloTango/Demo/CMakeLists.txt
@@ -1,12 +1,21 @@
 # Make sure the compiler can find include files from our Hello library.
-INCLUDE_DIRECTORIES (${HELLO_SOURCE_DIR}/Hello)
+INCLUDE_DIRECTORIES (
+	${CMAKE_BINARY_DIR}
+	${CMAKE_SOURCE_DIR}
+)
 
 # Make sure the linker can find the Hello library once it is built.
-LINK_DIRECTORIES (${HELLO_BINARY_DIR}/Hello)
+LINK_DIRECTORIES (
+	${HELLO_BINARY_DIR}/Hello
+)
 
 # Add executable called "helloDemo" that is built from the source files
 # "demo.cxx" and "demo_b.cxx".  The extensions are automatically found.
-ADD_EXECUTABLE (helloDemo demo.d)
+ADD_EXECUTABLE (helloDemo 
+	demo.d
+)
 
 # Link the executable to the Hello library.
-TARGET_LINK_LIBRARIES (helloDemo Hello)
+TARGET_LINK_LIBRARIES (helloDemo 
+	Hello
+)
diff --git a/samples/HelloPhobos/Demo/demo.d b/samples/HelloTango/Demo/demo.d
similarity index 84%
rename from samples/HelloPhobos/Demo/demo.d
rename to samples/HelloTango/Demo/demo.d
index ebf988e..fdb9470 100644
--- a/samples/HelloPhobos/Demo/demo.d
+++ b/samples/HelloTango/Demo/demo.d
@@ -1,4 +1,3 @@
-import std.stdio;
 import Hello.hello;
 
 int main()
diff --git a/samples/HelloPhobos/Hello/CMakeLists.txt b/samples/HelloTango/Hello/CMakeLists.txt
similarity index 72%
rename from samples/HelloPhobos/Hello/CMakeLists.txt
rename to samples/HelloTango/Hello/CMakeLists.txt
index 93d607b..a662cb1 100644
--- a/samples/HelloPhobos/Hello/CMakeLists.txt
+++ b/samples/HelloTango/Hello/CMakeLists.txt
@@ -1,3 +1,8 @@
+include_directories(
+	${CMAKE_BINARY_DIR}
+	${CMAKE_SOURCE_DIR}
+)
+
 # Create a library called "Hello" which includes the source file "hello.cxx".
 # The extension is already found.  Any number of sources could be listed here.
 ADD_LIBRARY (Hello hello.d)
diff --git a/samples/HelloPhobos/Hello/hello.d b/samples/HelloTango/Hello/hello.d
similarity index 53%
rename from samples/HelloPhobos/Hello/hello.d
rename to samples/HelloTango/Hello/hello.d
index ee86fed..c1d7fa1 100644
--- a/samples/HelloPhobos/Hello/hello.d
+++ b/samples/HelloTango/Hello/hello.d
@@ -1,13 +1,13 @@
 module Hello.hello;
 
-import std.stdio;
+import tango.io.Stdout;
 
 class Hail
 {
 public:
   void Print()
   {
-     writefln ("Hello, World!");
+     Stdout("Hello, World!").newline;
   }
 }