diff --git a/README.markdown b/README.markdown
index aea6f1d..8b126dc 100644
--- a/README.markdown
+++ b/README.markdown
@@ -1,9 +1,24 @@
 FizzBuzz
 ========
 
-An array of the usual suspects - Hello World, FizzBuzz, Fibonacci, more to come...
+An array of the usual suspects.
 
-TODO
+C++
 ----
-  * Echo Client / Server
-  * Ajax Chat
+
+  * linked list
+  * binary search tree
+
+Ruby
+----
+
+  * Fizzbuzz
+  * TCP Echo Server
+  * HTTP Chat Server / Client
+
+JavaScript
+----
+
+  * Hello World
+  * Fizzbuzz
+  * Fibonacci
diff --git a/RubyChatHTTP/PirateServer.rb b/http-chat-ruby/PirateServer.rb
similarity index 100%
rename from RubyChatHTTP/PirateServer.rb
rename to http-chat-ruby/PirateServer.rb
diff --git a/RubyChatHTTP/README.md b/http-chat-ruby/README.md
similarity index 100%
rename from RubyChatHTTP/README.md
rename to http-chat-ruby/README.md
diff --git a/RubyChatHTTP/public/404.html b/http-chat-ruby/public/404.html
similarity index 100%
rename from RubyChatHTTP/public/404.html
rename to http-chat-ruby/public/404.html
diff --git a/RubyChatHTTP/public/422.html b/http-chat-ruby/public/422.html
similarity index 100%
rename from RubyChatHTTP/public/422.html
rename to http-chat-ruby/public/422.html
diff --git a/RubyChatHTTP/public/chatroom.html b/http-chat-ruby/public/chatroom.html
similarity index 100%
rename from RubyChatHTTP/public/chatroom.html
rename to http-chat-ruby/public/chatroom.html
diff --git a/RubyChatHTTP/public/images/coolaj86-pirate.jpg b/http-chat-ruby/public/images/coolaj86-pirate.jpg
similarity index 100%
rename from RubyChatHTTP/public/images/coolaj86-pirate.jpg
rename to http-chat-ruby/public/images/coolaj86-pirate.jpg
diff --git a/RubyChatHTTP/public/index.html b/http-chat-ruby/public/index.html
similarity index 100%
rename from RubyChatHTTP/public/index.html
rename to http-chat-ruby/public/index.html
diff --git a/RubyChatHTTP/public/javascripts/app.js b/http-chat-ruby/public/javascripts/app.js
similarity index 100%
rename from RubyChatHTTP/public/javascripts/app.js
rename to http-chat-ruby/public/javascripts/app.js
diff --git a/RubyChatHTTP/public/javascripts/jquery-1.4.1.min.js b/http-chat-ruby/public/javascripts/jquery-1.4.1.min.js
similarity index 100%
rename from RubyChatHTTP/public/javascripts/jquery-1.4.1.min.js
rename to http-chat-ruby/public/javascripts/jquery-1.4.1.min.js
diff --git a/RubyChatHTTP/public/javascripts/sammy-0.4.1.min.js b/http-chat-ruby/public/javascripts/sammy-0.4.1.min.js
similarity index 100%
rename from RubyChatHTTP/public/javascripts/sammy-0.4.1.min.js
rename to http-chat-ruby/public/javascripts/sammy-0.4.1.min.js
diff --git a/RubyChatHTTP/public/javascripts/sammy-plugins/sammy.json-0.4.1.min.js b/http-chat-ruby/public/javascripts/sammy-plugins/sammy.json-0.4.1.min.js
similarity index 100%
rename from RubyChatHTTP/public/javascripts/sammy-plugins/sammy.json-0.4.1.min.js
rename to http-chat-ruby/public/javascripts/sammy-plugins/sammy.json-0.4.1.min.js
diff --git a/RubyChatHTTP/public/stylesheets/main.css b/http-chat-ruby/public/stylesheets/main.css
similarity index 100%
rename from RubyChatHTTP/public/stylesheets/main.css
rename to http-chat-ruby/public/stylesheets/main.css
diff --git a/EchoTCP/EchoClient.rb b/tcp-echo-ruby/EchoClient.rb
similarity index 100%
rename from EchoTCP/EchoClient.rb
rename to tcp-echo-ruby/EchoClient.rb
diff --git a/EchoTCP/EchoServer.rb b/tcp-echo-ruby/EchoServer.rb
similarity index 100%
rename from EchoTCP/EchoServer.rb
rename to tcp-echo-ruby/EchoServer.rb
diff --git a/EchoTCP/IT347Client.rb b/tcp-echo-ruby/IT347Client.rb
similarity index 100%
rename from EchoTCP/IT347Client.rb
rename to tcp-echo-ruby/IT347Client.rb
diff --git a/EchoTCP/IT347Server.rb b/tcp-echo-ruby/IT347Server.rb
similarity index 100%
rename from EchoTCP/IT347Server.rb
rename to tcp-echo-ruby/IT347Server.rb