diff --git a/Builds/QtCreator/.gitignore b/Builds/QtCreator/.gitignore
new file mode 100644
index 0000000000..20e0d48afd
--- /dev/null
+++ b/Builds/QtCreator/.gitignore
@@ -0,0 +1,5 @@
+# QTCreator
+
+Makefile
+*.user
+
diff --git a/Builds/QtCreator/rippled.pro b/Builds/QtCreator/rippled.pro
new file mode 100644
index 0000000000..8fc0f80bf7
--- /dev/null
+++ b/Builds/QtCreator/rippled.pro
@@ -0,0 +1,85 @@
+# Google Protocol Buffers support
+
+PROTOPATH += .
+PROTOPATH += ../Protocol
+for(p, PROTOPATH):PROTOPATHS += --proto_path=$${p}
+
+protobuf_decl.name = protobuf header
+protobuf_decl.input = PROTOS
+protobuf_decl.output = ${QMAKE_FILE_BASE}.pb.h
+protobuf_decl.commands = protoc --cpp_out="../../build/proto/" --proto_path="../../src/cpp/ripple" ${QMAKE_FILE_NAME}
+protobuf_decl.variable_out = GENERATED_FILES
+QMAKE_EXTRA_COMPILERS += protobuf_decl
+
+protobuf_impl.name = protobuf implementation
+protobuf_impl.input = PROTOS
+protobuf_impl.output = ${QMAKE_FILE_BASE}.pb.cc
+protobuf_impl.depends = ${QMAKE_FILE_BASE}.pb.h
+protobuf_impl.commands = $$escape_expand(\n)
+protobuf_impl.variable_out = GENERATED_SOURCES
+QMAKE_EXTRA_COMPILERS += protobuf_impl
+
+# Ripple compilation
+
+DESTDIR = ../../build/QtCreator
+OBJECTS_DIR = ../../build/QtCreator/obj
+
+TEMPLATE = app
+CONFIG += console thread
+CONFIG -= qt gui
+
+QMAKE_CXXFLAGS += \
+    -Wno-sign-compare \
+    -Wno-char-subscripts \
+    -Wno-invalid-offsetof \
+    -Wno-unused-parameter \
+    -Wformat \
+    -O0 \
+    -pthread
+
+INCLUDEPATH += \
+    "../.." \
+    "../../build/proto" \
+    "../../Subtrees" \
+    "../../Subtrees/leveldb/" \
+    "../../Subtrees/leveldb/port" \
+    "../../Subtrees/leveldb/include"
+
+SOURCES += \
+    ../../Subtrees/beast/modules/beast_basics/beast_basics.cpp \
+    ../../Subtrees/beast/modules/beast_core/beast_core.cpp \
+    ../../modules/ripple_app/ripple_app_pt1.cpp \
+    ../../modules/ripple_app/ripple_app_pt2.cpp \
+    ../../modules/ripple_app/ripple_app_pt3.cpp \
+    ../../modules/ripple_app/ripple_app_pt4.cpp \
+    ../../modules/ripple_app/ripple_app_pt5.cpp \
+    ../../modules/ripple_app/ripple_app_pt6.cpp \
+    ../../modules/ripple_app/ripple_app_pt7.cpp \
+    ../../modules/ripple_app/ripple_app_pt8.cpp \
+    ../../modules/ripple_basics/ripple_basics.cpp \
+    ../../modules/ripple_core/ripple_core.cpp \
+    ../../modules/ripple_client/ripple_client.cpp \
+    ../../modules/ripple_data/ripple_data.cpp \
+    ../../modules/ripple_json/ripple_json.cpp \
+    ../../modules/ripple_leveldb/ripple_leveldb.cpp \
+    ../../modules/ripple_sqlite/ripple_sqlite.c \
+    ../../modules/ripple_websocket/ripple_websocket.cpp \
+    ../../build/proto/ripple.pb.cc
+
+PROTOS = ../../src/cpp/ripple/ripple.proto
+
+LIBS += \
+    -lboost_date_time-mt\
+    -lboost_filesystem-mt \
+    -lboost_program_options-mt \
+    -lboost_regex-mt \
+    -lboost_system-mt \
+    -lboost_thread-mt \
+    -lboost_random-mt \
+    -lprotobuf \
+    -lssl \
+    -lrt
+
+
+
+
diff --git a/modules/ripple_app/ripple_app.cpp b/modules/ripple_app/ripple_app.cpp
index f32fd0bcd2..c4f34736fa 100644
--- a/modules/ripple_app/ripple_app.cpp
+++ b/modules/ripple_app/ripple_app.cpp
@@ -15,7 +15,7 @@
 #include "BeastConfig.h"
 
 // This must come first to work around the boost placeholders issues
-#include "modules/beast_basics/beast_basics.h" 
+#include "beast/modules/beast_basics/beast_basics.h"
 
 // VFALCO NOTE Holy smokes...that's a lot of boost!!!
 #include <boost/algorithm/string.hpp>
@@ -57,9 +57,9 @@
 #include <boost/unordered_set.hpp>
 #include <boost/weak_ptr.hpp>
 
-#include "../modules/ripple_sqlite/ripple_sqlite.h" // for SqliteDatabase.cpp
+#include "../ripple_sqlite/ripple_sqlite.h" // for SqliteDatabase.cpp
 
-#include "../modules/ripple_core/ripple_core.h"
+#include "../ripple_core/ripple_core.h"
 
 // VFALCO TODO fix these warnings!
 #ifdef _MSC_VER
diff --git a/modules/ripple_basics/ripple_basics.h b/modules/ripple_basics/ripple_basics.h
index 34aa2d11d2..49eabc2124 100644
--- a/modules/ripple_basics/ripple_basics.h
+++ b/modules/ripple_basics/ripple_basics.h
@@ -23,7 +23,7 @@
 #include "system/ripple_StandardIncludes.h"
 
 // This must come before Boost, to fix the boost placeholders problem
-#include "modules/beast_basics/beast_basics.h"
+#include "beast/modules/beast_basics/beast_basics.h"
 
 #include "system/ripple_BoostIncludes.h"
 
@@ -36,9 +36,9 @@
 //
 #if __cplusplus > 201100L
 namespace boost
-{ 
-    template <class T> 
-    const T* get_pointer (std::shared_ptr<T> const& ptr) 
+{
+    template <class T>
+    const T* get_pointer (std::shared_ptr<T> const& ptr)
     {
         return ptr.get();
     }
@@ -64,11 +64,7 @@ namespace boost
 # include <sys/types.h>
 #endif
 
-#include "modules/beast_core/beast_core.h"
-//#include "modules/beast_basics/beast_basics.h"
-
-// VFALCO TODO Fix this for FreeBSD
-//#include "modules/beast_basics/beast_basics.h"
+#include "beast/modules/beast_core/beast_core.h"
 
 #include "../ripple_json/ripple_json.h"