diff --git a/.gitignore b/.gitignore
index d9b3fdee9..efa99cb08 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,9 +14,13 @@
 
 # Ignore object files.
 *.o
-obj/*
-bin/rippled
-rippled
+build/obj/*
+build/proto/*
+build/bin/rippled
+build/rippled
+
+# Ignore JavaScript build targets
+build/ripple.js
 
 # Ignore locally installed node_modules
 node_modules
diff --git a/.gitmodules b/.gitmodules
index 87d8f8a1d..79ccb098e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,9 @@
-[submodule "websocketpp"]
-	path = websocketpp
+[submodule "src/cpp/websocketpp"]
+	path = src/cpp/websocketpp
 	url = https://github.com/zaphoyd/websocketpp.git
-[submodule "js/cryptojs"]
-	path = js/cryptojs
+[submodule "src/js/cryptojs"]
+	path = src/js/cryptojs
 	url = git://github.com/gwjjeff/cryptojs.git
-[submodule "js/sjcl"]
-	path = js/sjcl
+[submodule "src/js/sjcl"]
+	path = src/js/sjcl
 	url = git://github.com/bitwiseshiftleft/sjcl.git
diff --git a/SConstruct b/SConstruct
index 32e614c5a..5a5155483 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1,5 +1,5 @@
 #
-# Newcoin - SConstruct
+# Ripple - SConstruct
 #
 
 import glob
@@ -37,8 +37,8 @@ else:
 #
 # Put objects files in their own directory.
 #
-for dir in ['src', 'database', 'json', 'websocketpp']:
-	VariantDir('obj/'+dir, dir, duplicate=0)
+for dir in ['ripple', 'database', 'json', 'websocketpp']:
+	VariantDir('build/obj/'+dir, 'src/cpp/'+dir, duplicate=0)
 
 # Use openssl
 env.ParseConfig('pkg-config --cflags --libs openssl')
@@ -68,22 +68,23 @@ if OSX:
 	env.Append(LINKFLAGS = ['-L/usr/local/Cellar/openssl/1.0.1c/lib'])
 	env.Append(CXXFLAGS = ['-I/usr/local/Cellar/openssl/1.0.1c/include'])
 
-DB_SRCS   = glob.glob('database/*.c') + glob.glob('database/*.cpp')
-JSON_SRCS = glob.glob('json/*.cpp')
+DB_SRCS   = glob.glob('src/cpp/database/*.c') + glob.glob('src/cpp/database/*.cpp')
+JSON_SRCS = glob.glob('src/cpp/json/*.cpp')
 
 WEBSOCKETPP_SRCS = [
-	'websocketpp/src/base64/base64.cpp',
-	'websocketpp/src/md5/md5.c',
-	'websocketpp/src/messages/data.cpp',
-	'websocketpp/src/network_utilities.cpp',
-	'websocketpp/src/processors/hybi_header.cpp',
-	'websocketpp/src/processors/hybi_util.cpp',
-	'websocketpp/src/sha1/sha1.cpp',
-	'websocketpp/src/uri.cpp'
+	'src/cpp/websocketpp/src/base64/base64.cpp',
+	'src/cpp/websocketpp/src/md5/md5.c',
+	'src/cpp/websocketpp/src/messages/data.cpp',
+	'src/cpp/websocketpp/src/network_utilities.cpp',
+	'src/cpp/websocketpp/src/processors/hybi_header.cpp',
+	'src/cpp/websocketpp/src/processors/hybi_util.cpp',
+	'src/cpp/websocketpp/src/sha1/sha1.cpp',
+	'src/cpp/websocketpp/src/uri.cpp'
 	]
 
-NEWCOIN_SRCS = glob.glob('src/*.cpp')
-PROTO_SRCS = env.Protoc([], 'src/ripple.proto', PROTOCOUTDIR='obj', PROTOCPYTHONOUTDIR=None)
+RIPPLE_SRCS = glob.glob('src/cpp/ripple/*.cpp')
+PROTO_SRCS = env.Protoc([], 'src/cpp/ripple/ripple.proto', PROTOCOUTDIR='build/proto', PROTOCPYTHONOUTDIR=None)
+env.Append(CXXFLAGS = ['-Ibuild/proto'])
 
 env.Clean(PROTO_SRCS, 'site_scons/site_tools/protoc.pyc')
 
@@ -91,21 +92,21 @@ env.Clean(PROTO_SRCS, 'site_scons/site_tools/protoc.pyc')
 UNUSED_SRCS = []
 
 for file in UNUSED_SRCS:
-	NEWCOIN_SRCS.remove(file)
+	RIPPLE_SRCS.remove(file)
 
-NEWCOIN_SRCS += DB_SRCS + JSON_SRCS + WEBSOCKETPP_SRCS
+RIPPLE_SRCS += DB_SRCS + JSON_SRCS + WEBSOCKETPP_SRCS
 
 # Derive the object files from the source files.
-NEWCOIN_OBJS = []
+RIPPLE_OBJS = []
 
-for file in NEWCOIN_SRCS:
-	NEWCOIN_OBJS.append('obj/' + file)
+RIPPLE_OBJS += PROTO_SRCS
 
-NEWCOIN_OBJS += PROTO_SRCS
+for file in RIPPLE_SRCS:
+	RIPPLE_OBJS.append('build/obj/' + file[8:])
 
-rippled = env.Program('rippled', NEWCOIN_OBJS)
+rippled = env.Program('build/rippled', RIPPLE_OBJS)
 
-tags = env.CTags('obj/tags', NEWCOIN_SRCS)
+tags = env.CTags('build/obj/tags', RIPPLE_SRCS)
 
 Default(rippled, tags)
 
diff --git a/site_scons/site_tools/protoc.py b/site_scons/site_tools/protoc.py
index e3458bcf2..93d79309b 100644
--- a/site_scons/site_tools/protoc.py
+++ b/site_scons/site_tools/protoc.py
@@ -40,7 +40,7 @@ def ProtocEmitter(target, source, env):
     source = source_with_corrected_path
     
     for src in source:
-        modulename = os.path.splitext(src)[0]
+        modulename = os.path.splitext(os.path.basename(src))[0]
 
         if env['PROTOCOUTDIR']:            
             base = os.path.join(env['PROTOCOUTDIR'] , modulename)
@@ -56,8 +56,8 @@ def ProtocEmitter(target, source, env):
         pass
 
     # XXX KLUDGE: Force things to be right.
-    env['PROTOCOUTDIR']	    = 'obj/src'
-    env['PROTOCPROTOPATH']  = ['src']
+    env['PROTOCOUTDIR']	    = 'build/proto'
+    env['PROTOCPROTOPATH']  = ['src/cpp/ripple']
 
     #~ print "PROTOC SOURCE:", [str(s) for s in source]
     #~ print "PROTOC TARGET:", [str(s) for s in target]
diff --git a/database/SqliteDatabase.cpp b/src/cpp/database/SqliteDatabase.cpp
similarity index 100%
rename from database/SqliteDatabase.cpp
rename to src/cpp/database/SqliteDatabase.cpp
diff --git a/database/SqliteDatabase.h b/src/cpp/database/SqliteDatabase.h
similarity index 100%
rename from database/SqliteDatabase.h
rename to src/cpp/database/SqliteDatabase.h
diff --git a/database/database.cpp b/src/cpp/database/database.cpp
similarity index 100%
rename from database/database.cpp
rename to src/cpp/database/database.cpp
diff --git a/database/database.h b/src/cpp/database/database.h
similarity index 97%
rename from database/database.h
rename to src/cpp/database/database.h
index 50b247b4f..36ce4285c 100644
--- a/database/database.h
+++ b/src/cpp/database/database.h
@@ -3,8 +3,8 @@
 
 #include <string>
 #include <vector>
-#include "../src/types.h"
-#include "../src/utils.h"
+#include "../ripple/types.h"
+#include "../ripple/utils.h"
 
 #define SQL_FOREACH(_db, _strQuery)		\
 	if ((_db)->executeSQL(_strQuery))	\
diff --git a/database/linux/mysqldatabase.cpp b/src/cpp/database/linux/mysqldatabase.cpp
similarity index 100%
rename from database/linux/mysqldatabase.cpp
rename to src/cpp/database/linux/mysqldatabase.cpp
diff --git a/database/linux/mysqldatabase.h b/src/cpp/database/linux/mysqldatabase.h
similarity index 100%
rename from database/linux/mysqldatabase.h
rename to src/cpp/database/linux/mysqldatabase.h
diff --git a/database/sqlite3.c b/src/cpp/database/sqlite3.c
similarity index 100%
rename from database/sqlite3.c
rename to src/cpp/database/sqlite3.c
diff --git a/database/sqlite3.h b/src/cpp/database/sqlite3.h
similarity index 100%
rename from database/sqlite3.h
rename to src/cpp/database/sqlite3.h
diff --git a/database/sqlite3ext.h b/src/cpp/database/sqlite3ext.h
similarity index 100%
rename from database/sqlite3ext.h
rename to src/cpp/database/sqlite3ext.h
diff --git a/database/win/dbutility.h b/src/cpp/database/win/dbutility.h
similarity index 100%
rename from database/win/dbutility.h
rename to src/cpp/database/win/dbutility.h
diff --git a/database/win/windatabase.cpp b/src/cpp/database/win/windatabase.cpp
similarity index 100%
rename from database/win/windatabase.cpp
rename to src/cpp/database/win/windatabase.cpp
diff --git a/database/win/windatabase.h b/src/cpp/database/win/windatabase.h
similarity index 100%
rename from database/win/windatabase.h
rename to src/cpp/database/win/windatabase.h
diff --git a/json/LICENSE b/src/cpp/json/LICENSE
similarity index 100%
rename from json/LICENSE
rename to src/cpp/json/LICENSE
diff --git a/json/autolink.h b/src/cpp/json/autolink.h
similarity index 100%
rename from json/autolink.h
rename to src/cpp/json/autolink.h
diff --git a/json/config.h b/src/cpp/json/config.h
similarity index 100%
rename from json/config.h
rename to src/cpp/json/config.h
diff --git a/json/features.h b/src/cpp/json/features.h
similarity index 100%
rename from json/features.h
rename to src/cpp/json/features.h
diff --git a/json/forwards.h b/src/cpp/json/forwards.h
similarity index 100%
rename from json/forwards.h
rename to src/cpp/json/forwards.h
diff --git a/json/json.h b/src/cpp/json/json.h
similarity index 100%
rename from json/json.h
rename to src/cpp/json/json.h
diff --git a/json/json_batchallocator.h b/src/cpp/json/json_batchallocator.h
similarity index 100%
rename from json/json_batchallocator.h
rename to src/cpp/json/json_batchallocator.h
diff --git a/json/json_internalarray.inl b/src/cpp/json/json_internalarray.inl
similarity index 100%
rename from json/json_internalarray.inl
rename to src/cpp/json/json_internalarray.inl
diff --git a/json/json_internalmap.inl b/src/cpp/json/json_internalmap.inl
similarity index 100%
rename from json/json_internalmap.inl
rename to src/cpp/json/json_internalmap.inl
diff --git a/json/json_reader.cpp b/src/cpp/json/json_reader.cpp
similarity index 100%
rename from json/json_reader.cpp
rename to src/cpp/json/json_reader.cpp
diff --git a/json/json_value.cpp b/src/cpp/json/json_value.cpp
similarity index 100%
rename from json/json_value.cpp
rename to src/cpp/json/json_value.cpp
diff --git a/json/json_valueiterator.inl b/src/cpp/json/json_valueiterator.inl
similarity index 100%
rename from json/json_valueiterator.inl
rename to src/cpp/json/json_valueiterator.inl
diff --git a/json/json_writer.cpp b/src/cpp/json/json_writer.cpp
similarity index 100%
rename from json/json_writer.cpp
rename to src/cpp/json/json_writer.cpp
diff --git a/json/reader.h b/src/cpp/json/reader.h
similarity index 100%
rename from json/reader.h
rename to src/cpp/json/reader.h
diff --git a/json/value.h b/src/cpp/json/value.h
similarity index 100%
rename from json/value.h
rename to src/cpp/json/value.h
diff --git a/json/version b/src/cpp/json/version
similarity index 100%
rename from json/version
rename to src/cpp/json/version
diff --git a/json/writer.h b/src/cpp/json/writer.h
similarity index 100%
rename from json/writer.h
rename to src/cpp/json/writer.h
diff --git a/src/AccountState.cpp b/src/cpp/ripple/AccountState.cpp
similarity index 100%
rename from src/AccountState.cpp
rename to src/cpp/ripple/AccountState.cpp
diff --git a/src/AccountState.h b/src/cpp/ripple/AccountState.h
similarity index 100%
rename from src/AccountState.h
rename to src/cpp/ripple/AccountState.h
diff --git a/src/Amount.cpp b/src/cpp/ripple/Amount.cpp
similarity index 100%
rename from src/Amount.cpp
rename to src/cpp/ripple/Amount.cpp
diff --git a/src/Application.cpp b/src/cpp/ripple/Application.cpp
similarity index 100%
rename from src/Application.cpp
rename to src/cpp/ripple/Application.cpp
diff --git a/src/Application.h b/src/cpp/ripple/Application.h
similarity index 100%
rename from src/Application.h
rename to src/cpp/ripple/Application.h
diff --git a/src/BitcoinUtil.cpp b/src/cpp/ripple/BitcoinUtil.cpp
similarity index 100%
rename from src/BitcoinUtil.cpp
rename to src/cpp/ripple/BitcoinUtil.cpp
diff --git a/src/BitcoinUtil.h b/src/cpp/ripple/BitcoinUtil.h
similarity index 100%
rename from src/BitcoinUtil.h
rename to src/cpp/ripple/BitcoinUtil.h
diff --git a/src/CallRPC.cpp b/src/cpp/ripple/CallRPC.cpp
similarity index 100%
rename from src/CallRPC.cpp
rename to src/cpp/ripple/CallRPC.cpp
diff --git a/src/CallRPC.h b/src/cpp/ripple/CallRPC.h
similarity index 100%
rename from src/CallRPC.h
rename to src/cpp/ripple/CallRPC.h
diff --git a/src/CanonicalTXSet.cpp b/src/cpp/ripple/CanonicalTXSet.cpp
similarity index 100%
rename from src/CanonicalTXSet.cpp
rename to src/cpp/ripple/CanonicalTXSet.cpp
diff --git a/src/CanonicalTXSet.h b/src/cpp/ripple/CanonicalTXSet.h
similarity index 100%
rename from src/CanonicalTXSet.h
rename to src/cpp/ripple/CanonicalTXSet.h
diff --git a/src/Config.cpp b/src/cpp/ripple/Config.cpp
similarity index 100%
rename from src/Config.cpp
rename to src/cpp/ripple/Config.cpp
diff --git a/src/Config.h b/src/cpp/ripple/Config.h
similarity index 100%
rename from src/Config.h
rename to src/cpp/ripple/Config.h
diff --git a/src/ConnectionPool.cpp b/src/cpp/ripple/ConnectionPool.cpp
similarity index 100%
rename from src/ConnectionPool.cpp
rename to src/cpp/ripple/ConnectionPool.cpp
diff --git a/src/ConnectionPool.h b/src/cpp/ripple/ConnectionPool.h
similarity index 100%
rename from src/ConnectionPool.h
rename to src/cpp/ripple/ConnectionPool.h
diff --git a/src/Contract.cpp b/src/cpp/ripple/Contract.cpp
similarity index 100%
rename from src/Contract.cpp
rename to src/cpp/ripple/Contract.cpp
diff --git a/src/Contract.h b/src/cpp/ripple/Contract.h
similarity index 100%
rename from src/Contract.h
rename to src/cpp/ripple/Contract.h
diff --git a/src/DBInit.cpp b/src/cpp/ripple/DBInit.cpp
similarity index 100%
rename from src/DBInit.cpp
rename to src/cpp/ripple/DBInit.cpp
diff --git a/src/DeterministicKeys.cpp b/src/cpp/ripple/DeterministicKeys.cpp
similarity index 100%
rename from src/DeterministicKeys.cpp
rename to src/cpp/ripple/DeterministicKeys.cpp
diff --git a/src/ECIES.cpp b/src/cpp/ripple/ECIES.cpp
similarity index 100%
rename from src/ECIES.cpp
rename to src/cpp/ripple/ECIES.cpp
diff --git a/src/FieldNames.cpp b/src/cpp/ripple/FieldNames.cpp
similarity index 100%
rename from src/FieldNames.cpp
rename to src/cpp/ripple/FieldNames.cpp
diff --git a/src/FieldNames.h b/src/cpp/ripple/FieldNames.h
similarity index 100%
rename from src/FieldNames.h
rename to src/cpp/ripple/FieldNames.h
diff --git a/src/HTTPRequest.cpp b/src/cpp/ripple/HTTPRequest.cpp
similarity index 100%
rename from src/HTTPRequest.cpp
rename to src/cpp/ripple/HTTPRequest.cpp
diff --git a/src/HTTPRequest.h b/src/cpp/ripple/HTTPRequest.h
similarity index 100%
rename from src/HTTPRequest.h
rename to src/cpp/ripple/HTTPRequest.h
diff --git a/src/HashPrefixes.h b/src/cpp/ripple/HashPrefixes.h
similarity index 100%
rename from src/HashPrefixes.h
rename to src/cpp/ripple/HashPrefixes.h
diff --git a/src/HashedObject.cpp b/src/cpp/ripple/HashedObject.cpp
similarity index 100%
rename from src/HashedObject.cpp
rename to src/cpp/ripple/HashedObject.cpp
diff --git a/src/HashedObject.h b/src/cpp/ripple/HashedObject.h
similarity index 100%
rename from src/HashedObject.h
rename to src/cpp/ripple/HashedObject.h
diff --git a/src/HttpsClient.cpp b/src/cpp/ripple/HttpsClient.cpp
similarity index 100%
rename from src/HttpsClient.cpp
rename to src/cpp/ripple/HttpsClient.cpp
diff --git a/src/HttpsClient.h b/src/cpp/ripple/HttpsClient.h
similarity index 100%
rename from src/HttpsClient.h
rename to src/cpp/ripple/HttpsClient.h
diff --git a/src/InstanceCounter.cpp b/src/cpp/ripple/InstanceCounter.cpp
similarity index 100%
rename from src/InstanceCounter.cpp
rename to src/cpp/ripple/InstanceCounter.cpp
diff --git a/src/InstanceCounter.h b/src/cpp/ripple/InstanceCounter.h
similarity index 100%
rename from src/InstanceCounter.h
rename to src/cpp/ripple/InstanceCounter.h
diff --git a/src/Interpreter.cpp b/src/cpp/ripple/Interpreter.cpp
similarity index 100%
rename from src/Interpreter.cpp
rename to src/cpp/ripple/Interpreter.cpp
diff --git a/src/Interpreter.h b/src/cpp/ripple/Interpreter.h
similarity index 100%
rename from src/Interpreter.h
rename to src/cpp/ripple/Interpreter.h
diff --git a/src/JobQueue.cpp b/src/cpp/ripple/JobQueue.cpp
similarity index 100%
rename from src/JobQueue.cpp
rename to src/cpp/ripple/JobQueue.cpp
diff --git a/src/JobQueue.h b/src/cpp/ripple/JobQueue.h
similarity index 100%
rename from src/JobQueue.h
rename to src/cpp/ripple/JobQueue.h
diff --git a/src/Ledger.cpp b/src/cpp/ripple/Ledger.cpp
similarity index 99%
rename from src/Ledger.cpp
rename to src/cpp/ripple/Ledger.cpp
index 632ced372..693b3cd0d 100644
--- a/src/Ledger.cpp
+++ b/src/cpp/ripple/Ledger.cpp
@@ -10,7 +10,7 @@
 #include "Application.h"
 #include "Ledger.h"
 #include "utils.h"
-#include "../obj/src/ripple.pb.h"
+#include "ripple.pb.h"
 #include "PackedMessage.h"
 #include "Config.h"
 #include "BitcoinUtil.h"
diff --git a/src/Ledger.h b/src/cpp/ripple/Ledger.h
similarity index 100%
rename from src/Ledger.h
rename to src/cpp/ripple/Ledger.h
diff --git a/src/LedgerAcquire.cpp b/src/cpp/ripple/LedgerAcquire.cpp
similarity index 100%
rename from src/LedgerAcquire.cpp
rename to src/cpp/ripple/LedgerAcquire.cpp
diff --git a/src/LedgerAcquire.h b/src/cpp/ripple/LedgerAcquire.h
similarity index 99%
rename from src/LedgerAcquire.h
rename to src/cpp/ripple/LedgerAcquire.h
index 2ce741529..eab3e47d8 100644
--- a/src/LedgerAcquire.h
+++ b/src/cpp/ripple/LedgerAcquire.h
@@ -16,7 +16,7 @@
 #include "Peer.h"
 #include "TaggedCache.h"
 #include "InstanceCounter.h"
-#include "../obj/src/ripple.pb.h"
+#include "ripple.pb.h"
 
 DEFINE_INSTANCE(PeerSet);
 
diff --git a/src/LedgerConsensus.cpp b/src/cpp/ripple/LedgerConsensus.cpp
similarity index 100%
rename from src/LedgerConsensus.cpp
rename to src/cpp/ripple/LedgerConsensus.cpp
diff --git a/src/LedgerConsensus.h b/src/cpp/ripple/LedgerConsensus.h
similarity index 100%
rename from src/LedgerConsensus.h
rename to src/cpp/ripple/LedgerConsensus.h
diff --git a/src/LedgerEntrySet.cpp b/src/cpp/ripple/LedgerEntrySet.cpp
similarity index 100%
rename from src/LedgerEntrySet.cpp
rename to src/cpp/ripple/LedgerEntrySet.cpp
diff --git a/src/LedgerEntrySet.h b/src/cpp/ripple/LedgerEntrySet.h
similarity index 100%
rename from src/LedgerEntrySet.h
rename to src/cpp/ripple/LedgerEntrySet.h
diff --git a/src/LedgerFormats.cpp b/src/cpp/ripple/LedgerFormats.cpp
similarity index 100%
rename from src/LedgerFormats.cpp
rename to src/cpp/ripple/LedgerFormats.cpp
diff --git a/src/LedgerFormats.h b/src/cpp/ripple/LedgerFormats.h
similarity index 100%
rename from src/LedgerFormats.h
rename to src/cpp/ripple/LedgerFormats.h
diff --git a/src/LedgerHistory.cpp b/src/cpp/ripple/LedgerHistory.cpp
similarity index 100%
rename from src/LedgerHistory.cpp
rename to src/cpp/ripple/LedgerHistory.cpp
diff --git a/src/LedgerHistory.h b/src/cpp/ripple/LedgerHistory.h
similarity index 100%
rename from src/LedgerHistory.h
rename to src/cpp/ripple/LedgerHistory.h
diff --git a/src/LedgerMaster.cpp b/src/cpp/ripple/LedgerMaster.cpp
similarity index 100%
rename from src/LedgerMaster.cpp
rename to src/cpp/ripple/LedgerMaster.cpp
diff --git a/src/LedgerMaster.h b/src/cpp/ripple/LedgerMaster.h
similarity index 100%
rename from src/LedgerMaster.h
rename to src/cpp/ripple/LedgerMaster.h
diff --git a/src/LedgerProposal.cpp b/src/cpp/ripple/LedgerProposal.cpp
similarity index 100%
rename from src/LedgerProposal.cpp
rename to src/cpp/ripple/LedgerProposal.cpp
diff --git a/src/LedgerProposal.h b/src/cpp/ripple/LedgerProposal.h
similarity index 100%
rename from src/LedgerProposal.h
rename to src/cpp/ripple/LedgerProposal.h
diff --git a/src/LedgerTiming.cpp b/src/cpp/ripple/LedgerTiming.cpp
similarity index 100%
rename from src/LedgerTiming.cpp
rename to src/cpp/ripple/LedgerTiming.cpp
diff --git a/src/LedgerTiming.h b/src/cpp/ripple/LedgerTiming.h
similarity index 100%
rename from src/LedgerTiming.h
rename to src/cpp/ripple/LedgerTiming.h
diff --git a/src/Log.cpp b/src/cpp/ripple/Log.cpp
similarity index 100%
rename from src/Log.cpp
rename to src/cpp/ripple/Log.cpp
diff --git a/src/Log.h b/src/cpp/ripple/Log.h
similarity index 100%
rename from src/Log.h
rename to src/cpp/ripple/Log.h
diff --git a/src/NetworkOPs.cpp b/src/cpp/ripple/NetworkOPs.cpp
similarity index 100%
rename from src/NetworkOPs.cpp
rename to src/cpp/ripple/NetworkOPs.cpp
diff --git a/src/NetworkOPs.h b/src/cpp/ripple/NetworkOPs.h
similarity index 100%
rename from src/NetworkOPs.h
rename to src/cpp/ripple/NetworkOPs.h
diff --git a/src/NetworkStatus.h b/src/cpp/ripple/NetworkStatus.h
similarity index 100%
rename from src/NetworkStatus.h
rename to src/cpp/ripple/NetworkStatus.h
diff --git a/src/NicknameState.cpp b/src/cpp/ripple/NicknameState.cpp
similarity index 100%
rename from src/NicknameState.cpp
rename to src/cpp/ripple/NicknameState.cpp
diff --git a/src/NicknameState.h b/src/cpp/ripple/NicknameState.h
similarity index 100%
rename from src/NicknameState.h
rename to src/cpp/ripple/NicknameState.h
diff --git a/src/Operation.cpp b/src/cpp/ripple/Operation.cpp
similarity index 100%
rename from src/Operation.cpp
rename to src/cpp/ripple/Operation.cpp
diff --git a/src/Operation.h b/src/cpp/ripple/Operation.h
similarity index 100%
rename from src/Operation.h
rename to src/cpp/ripple/Operation.h
diff --git a/src/OrderBook.cpp b/src/cpp/ripple/OrderBook.cpp
similarity index 100%
rename from src/OrderBook.cpp
rename to src/cpp/ripple/OrderBook.cpp
diff --git a/src/OrderBook.h b/src/cpp/ripple/OrderBook.h
similarity index 100%
rename from src/OrderBook.h
rename to src/cpp/ripple/OrderBook.h
diff --git a/src/OrderBookDB.cpp b/src/cpp/ripple/OrderBookDB.cpp
similarity index 100%
rename from src/OrderBookDB.cpp
rename to src/cpp/ripple/OrderBookDB.cpp
diff --git a/src/OrderBookDB.h b/src/cpp/ripple/OrderBookDB.h
similarity index 100%
rename from src/OrderBookDB.h
rename to src/cpp/ripple/OrderBookDB.h
diff --git a/src/PackedMessage.cpp b/src/cpp/ripple/PackedMessage.cpp
similarity index 100%
rename from src/PackedMessage.cpp
rename to src/cpp/ripple/PackedMessage.cpp
diff --git a/src/PackedMessage.h b/src/cpp/ripple/PackedMessage.h
similarity index 98%
rename from src/PackedMessage.h
rename to src/cpp/ripple/PackedMessage.h
index 11d2e7371..fd072b9ec 100644
--- a/src/PackedMessage.h
+++ b/src/cpp/ripple/PackedMessage.h
@@ -14,7 +14,7 @@
 #include <boost/enable_shared_from_this.hpp>
 #include <boost/cstdint.hpp>
 
-#include "../obj/src/ripple.pb.h"
+#include "ripple.pb.h"
 
 // The header size for packed messages
 // len(4)+type(2)
diff --git a/src/ParseSection.cpp b/src/cpp/ripple/ParseSection.cpp
similarity index 100%
rename from src/ParseSection.cpp
rename to src/cpp/ripple/ParseSection.cpp
diff --git a/src/ParseSection.h b/src/cpp/ripple/ParseSection.h
similarity index 100%
rename from src/ParseSection.h
rename to src/cpp/ripple/ParseSection.h
diff --git a/src/Pathfinder.cpp b/src/cpp/ripple/Pathfinder.cpp
similarity index 100%
rename from src/Pathfinder.cpp
rename to src/cpp/ripple/Pathfinder.cpp
diff --git a/src/Pathfinder.h b/src/cpp/ripple/Pathfinder.h
similarity index 100%
rename from src/Pathfinder.h
rename to src/cpp/ripple/Pathfinder.h
diff --git a/src/Peer.cpp b/src/cpp/ripple/Peer.cpp
similarity index 100%
rename from src/Peer.cpp
rename to src/cpp/ripple/Peer.cpp
diff --git a/src/Peer.h b/src/cpp/ripple/Peer.h
similarity index 99%
rename from src/Peer.h
rename to src/cpp/ripple/Peer.h
index e70d702fb..3865e8aa3 100644
--- a/src/Peer.h
+++ b/src/cpp/ripple/Peer.h
@@ -8,7 +8,7 @@
 #include <boost/make_shared.hpp>
 #include <boost/shared_ptr.hpp>
 
-#include "../obj/src/ripple.pb.h"
+#include "ripple.pb.h"
 #include "PackedMessage.h"
 #include "Ledger.h"
 #include "Transaction.h"
diff --git a/src/PeerDoor.cpp b/src/cpp/ripple/PeerDoor.cpp
similarity index 100%
rename from src/PeerDoor.cpp
rename to src/cpp/ripple/PeerDoor.cpp
diff --git a/src/PeerDoor.h b/src/cpp/ripple/PeerDoor.h
similarity index 100%
rename from src/PeerDoor.h
rename to src/cpp/ripple/PeerDoor.h
diff --git a/src/PlatRand.cpp b/src/cpp/ripple/PlatRand.cpp
similarity index 100%
rename from src/PlatRand.cpp
rename to src/cpp/ripple/PlatRand.cpp
diff --git a/src/PubKeyCache.cpp b/src/cpp/ripple/PubKeyCache.cpp
similarity index 100%
rename from src/PubKeyCache.cpp
rename to src/cpp/ripple/PubKeyCache.cpp
diff --git a/src/PubKeyCache.h b/src/cpp/ripple/PubKeyCache.h
similarity index 100%
rename from src/PubKeyCache.h
rename to src/cpp/ripple/PubKeyCache.h
diff --git a/src/RPC.h b/src/cpp/ripple/RPC.h
similarity index 100%
rename from src/RPC.h
rename to src/cpp/ripple/RPC.h
diff --git a/src/RPCCommands.cpp b/src/cpp/ripple/RPCCommands.cpp
similarity index 100%
rename from src/RPCCommands.cpp
rename to src/cpp/ripple/RPCCommands.cpp
diff --git a/src/RPCCommands.h b/src/cpp/ripple/RPCCommands.h
similarity index 100%
rename from src/RPCCommands.h
rename to src/cpp/ripple/RPCCommands.h
diff --git a/src/RPCDoor.cpp b/src/cpp/ripple/RPCDoor.cpp
similarity index 100%
rename from src/RPCDoor.cpp
rename to src/cpp/ripple/RPCDoor.cpp
diff --git a/src/RPCDoor.h b/src/cpp/ripple/RPCDoor.h
similarity index 100%
rename from src/RPCDoor.h
rename to src/cpp/ripple/RPCDoor.h
diff --git a/src/RPCHandler.cpp b/src/cpp/ripple/RPCHandler.cpp
similarity index 100%
rename from src/RPCHandler.cpp
rename to src/cpp/ripple/RPCHandler.cpp
diff --git a/src/RPCHandler.h b/src/cpp/ripple/RPCHandler.h
similarity index 100%
rename from src/RPCHandler.h
rename to src/cpp/ripple/RPCHandler.h
diff --git a/src/RPCServer.cpp b/src/cpp/ripple/RPCServer.cpp
similarity index 100%
rename from src/RPCServer.cpp
rename to src/cpp/ripple/RPCServer.cpp
diff --git a/src/RPCServer.h b/src/cpp/ripple/RPCServer.h
similarity index 100%
rename from src/RPCServer.h
rename to src/cpp/ripple/RPCServer.h
diff --git a/src/RangeSet.cpp b/src/cpp/ripple/RangeSet.cpp
similarity index 100%
rename from src/RangeSet.cpp
rename to src/cpp/ripple/RangeSet.cpp
diff --git a/src/RangeSet.h b/src/cpp/ripple/RangeSet.h
similarity index 100%
rename from src/RangeSet.h
rename to src/cpp/ripple/RangeSet.h
diff --git a/src/RippleAddress.cpp b/src/cpp/ripple/RippleAddress.cpp
similarity index 100%
rename from src/RippleAddress.cpp
rename to src/cpp/ripple/RippleAddress.cpp
diff --git a/src/RippleAddress.h b/src/cpp/ripple/RippleAddress.h
similarity index 100%
rename from src/RippleAddress.h
rename to src/cpp/ripple/RippleAddress.h
diff --git a/src/RippleCalc.cpp b/src/cpp/ripple/RippleCalc.cpp
similarity index 100%
rename from src/RippleCalc.cpp
rename to src/cpp/ripple/RippleCalc.cpp
diff --git a/src/RippleCalc.h b/src/cpp/ripple/RippleCalc.h
similarity index 100%
rename from src/RippleCalc.h
rename to src/cpp/ripple/RippleCalc.h
diff --git a/src/RippleLines.cpp b/src/cpp/ripple/RippleLines.cpp
similarity index 100%
rename from src/RippleLines.cpp
rename to src/cpp/ripple/RippleLines.cpp
diff --git a/src/RippleLines.h b/src/cpp/ripple/RippleLines.h
similarity index 100%
rename from src/RippleLines.h
rename to src/cpp/ripple/RippleLines.h
diff --git a/src/RippleState.cpp b/src/cpp/ripple/RippleState.cpp
similarity index 100%
rename from src/RippleState.cpp
rename to src/cpp/ripple/RippleState.cpp
diff --git a/src/RippleState.h b/src/cpp/ripple/RippleState.h
similarity index 100%
rename from src/RippleState.h
rename to src/cpp/ripple/RippleState.h
diff --git a/src/SHAMap.cpp b/src/cpp/ripple/SHAMap.cpp
similarity index 100%
rename from src/SHAMap.cpp
rename to src/cpp/ripple/SHAMap.cpp
diff --git a/src/SHAMap.h b/src/cpp/ripple/SHAMap.h
similarity index 100%
rename from src/SHAMap.h
rename to src/cpp/ripple/SHAMap.h
diff --git a/src/SHAMapDiff.cpp b/src/cpp/ripple/SHAMapDiff.cpp
similarity index 100%
rename from src/SHAMapDiff.cpp
rename to src/cpp/ripple/SHAMapDiff.cpp
diff --git a/src/SHAMapNodes.cpp b/src/cpp/ripple/SHAMapNodes.cpp
similarity index 100%
rename from src/SHAMapNodes.cpp
rename to src/cpp/ripple/SHAMapNodes.cpp
diff --git a/src/SHAMapSync.cpp b/src/cpp/ripple/SHAMapSync.cpp
similarity index 100%
rename from src/SHAMapSync.cpp
rename to src/cpp/ripple/SHAMapSync.cpp
diff --git a/src/SHAMapSync.h b/src/cpp/ripple/SHAMapSync.h
similarity index 100%
rename from src/SHAMapSync.h
rename to src/cpp/ripple/SHAMapSync.h
diff --git a/src/SNTPClient.cpp b/src/cpp/ripple/SNTPClient.cpp
similarity index 100%
rename from src/SNTPClient.cpp
rename to src/cpp/ripple/SNTPClient.cpp
diff --git a/src/SNTPClient.h b/src/cpp/ripple/SNTPClient.h
similarity index 100%
rename from src/SNTPClient.h
rename to src/cpp/ripple/SNTPClient.h
diff --git a/src/ScopedLock.h b/src/cpp/ripple/ScopedLock.h
similarity index 100%
rename from src/ScopedLock.h
rename to src/cpp/ripple/ScopedLock.h
diff --git a/src/ScriptData.cpp b/src/cpp/ripple/ScriptData.cpp
similarity index 100%
rename from src/ScriptData.cpp
rename to src/cpp/ripple/ScriptData.cpp
diff --git a/src/ScriptData.h b/src/cpp/ripple/ScriptData.h
similarity index 100%
rename from src/ScriptData.h
rename to src/cpp/ripple/ScriptData.h
diff --git a/src/SecureAllocator.h b/src/cpp/ripple/SecureAllocator.h
similarity index 100%
rename from src/SecureAllocator.h
rename to src/cpp/ripple/SecureAllocator.h
diff --git a/src/SerializeProto.h b/src/cpp/ripple/SerializeProto.h
similarity index 100%
rename from src/SerializeProto.h
rename to src/cpp/ripple/SerializeProto.h
diff --git a/src/SerializedLedger.cpp b/src/cpp/ripple/SerializedLedger.cpp
similarity index 100%
rename from src/SerializedLedger.cpp
rename to src/cpp/ripple/SerializedLedger.cpp
diff --git a/src/SerializedLedger.h b/src/cpp/ripple/SerializedLedger.h
similarity index 100%
rename from src/SerializedLedger.h
rename to src/cpp/ripple/SerializedLedger.h
diff --git a/src/SerializedObject.cpp b/src/cpp/ripple/SerializedObject.cpp
similarity index 100%
rename from src/SerializedObject.cpp
rename to src/cpp/ripple/SerializedObject.cpp
diff --git a/src/SerializedObject.h b/src/cpp/ripple/SerializedObject.h
similarity index 100%
rename from src/SerializedObject.h
rename to src/cpp/ripple/SerializedObject.h
diff --git a/src/SerializedTransaction.cpp b/src/cpp/ripple/SerializedTransaction.cpp
similarity index 100%
rename from src/SerializedTransaction.cpp
rename to src/cpp/ripple/SerializedTransaction.cpp
diff --git a/src/SerializedTransaction.h b/src/cpp/ripple/SerializedTransaction.h
similarity index 100%
rename from src/SerializedTransaction.h
rename to src/cpp/ripple/SerializedTransaction.h
diff --git a/src/SerializedTypes.cpp b/src/cpp/ripple/SerializedTypes.cpp
similarity index 100%
rename from src/SerializedTypes.cpp
rename to src/cpp/ripple/SerializedTypes.cpp
diff --git a/src/SerializedTypes.h b/src/cpp/ripple/SerializedTypes.h
similarity index 100%
rename from src/SerializedTypes.h
rename to src/cpp/ripple/SerializedTypes.h
diff --git a/src/SerializedValidation.cpp b/src/cpp/ripple/SerializedValidation.cpp
similarity index 100%
rename from src/SerializedValidation.cpp
rename to src/cpp/ripple/SerializedValidation.cpp
diff --git a/src/SerializedValidation.h b/src/cpp/ripple/SerializedValidation.h
similarity index 100%
rename from src/SerializedValidation.h
rename to src/cpp/ripple/SerializedValidation.h
diff --git a/src/Serializer.cpp b/src/cpp/ripple/Serializer.cpp
similarity index 100%
rename from src/Serializer.cpp
rename to src/cpp/ripple/Serializer.cpp
diff --git a/src/Serializer.h b/src/cpp/ripple/Serializer.h
similarity index 100%
rename from src/Serializer.h
rename to src/cpp/ripple/Serializer.h
diff --git a/src/Suppression.cpp b/src/cpp/ripple/Suppression.cpp
similarity index 100%
rename from src/Suppression.cpp
rename to src/cpp/ripple/Suppression.cpp
diff --git a/src/Suppression.h b/src/cpp/ripple/Suppression.h
similarity index 100%
rename from src/Suppression.h
rename to src/cpp/ripple/Suppression.h
diff --git a/src/TaggedCache.h b/src/cpp/ripple/TaggedCache.h
similarity index 100%
rename from src/TaggedCache.h
rename to src/cpp/ripple/TaggedCache.h
diff --git a/src/Transaction.cpp b/src/cpp/ripple/Transaction.cpp
similarity index 100%
rename from src/Transaction.cpp
rename to src/cpp/ripple/Transaction.cpp
diff --git a/src/Transaction.h b/src/cpp/ripple/Transaction.h
similarity index 99%
rename from src/Transaction.h
rename to src/cpp/ripple/Transaction.h
index 0978e9d2c..4f37bfab5 100644
--- a/src/Transaction.h
+++ b/src/cpp/ripple/Transaction.h
@@ -16,7 +16,7 @@
 
 #include "key.h"
 #include "uint256.h"
-#include "../obj/src/ripple.pb.h"
+#include "ripple.pb.h"
 #include "Serializer.h"
 #include "SHAMap.h"
 #include "SerializedTransaction.h"
diff --git a/src/TransactionAction.cpp b/src/cpp/ripple/TransactionAction.cpp
similarity index 100%
rename from src/TransactionAction.cpp
rename to src/cpp/ripple/TransactionAction.cpp
diff --git a/src/TransactionEngine.cpp b/src/cpp/ripple/TransactionEngine.cpp
similarity index 100%
rename from src/TransactionEngine.cpp
rename to src/cpp/ripple/TransactionEngine.cpp
diff --git a/src/TransactionEngine.h b/src/cpp/ripple/TransactionEngine.h
similarity index 100%
rename from src/TransactionEngine.h
rename to src/cpp/ripple/TransactionEngine.h
diff --git a/src/TransactionErr.cpp b/src/cpp/ripple/TransactionErr.cpp
similarity index 100%
rename from src/TransactionErr.cpp
rename to src/cpp/ripple/TransactionErr.cpp
diff --git a/src/TransactionErr.h b/src/cpp/ripple/TransactionErr.h
similarity index 100%
rename from src/TransactionErr.h
rename to src/cpp/ripple/TransactionErr.h
diff --git a/src/TransactionFormats.cpp b/src/cpp/ripple/TransactionFormats.cpp
similarity index 100%
rename from src/TransactionFormats.cpp
rename to src/cpp/ripple/TransactionFormats.cpp
diff --git a/src/TransactionFormats.h b/src/cpp/ripple/TransactionFormats.h
similarity index 100%
rename from src/TransactionFormats.h
rename to src/cpp/ripple/TransactionFormats.h
diff --git a/src/TransactionMaster.cpp b/src/cpp/ripple/TransactionMaster.cpp
similarity index 100%
rename from src/TransactionMaster.cpp
rename to src/cpp/ripple/TransactionMaster.cpp
diff --git a/src/TransactionMaster.h b/src/cpp/ripple/TransactionMaster.h
similarity index 100%
rename from src/TransactionMaster.h
rename to src/cpp/ripple/TransactionMaster.h
diff --git a/src/TransactionMeta.cpp b/src/cpp/ripple/TransactionMeta.cpp
similarity index 100%
rename from src/TransactionMeta.cpp
rename to src/cpp/ripple/TransactionMeta.cpp
diff --git a/src/TransactionMeta.h b/src/cpp/ripple/TransactionMeta.h
similarity index 100%
rename from src/TransactionMeta.h
rename to src/cpp/ripple/TransactionMeta.h
diff --git a/src/UniqueNodeList.cpp b/src/cpp/ripple/UniqueNodeList.cpp
similarity index 100%
rename from src/UniqueNodeList.cpp
rename to src/cpp/ripple/UniqueNodeList.cpp
diff --git a/src/UniqueNodeList.h b/src/cpp/ripple/UniqueNodeList.h
similarity index 100%
rename from src/UniqueNodeList.h
rename to src/cpp/ripple/UniqueNodeList.h
diff --git a/src/ValidationCollection.cpp b/src/cpp/ripple/ValidationCollection.cpp
similarity index 100%
rename from src/ValidationCollection.cpp
rename to src/cpp/ripple/ValidationCollection.cpp
diff --git a/src/ValidationCollection.h b/src/cpp/ripple/ValidationCollection.h
similarity index 100%
rename from src/ValidationCollection.h
rename to src/cpp/ripple/ValidationCollection.h
diff --git a/src/Version.h b/src/cpp/ripple/Version.h
similarity index 100%
rename from src/Version.h
rename to src/cpp/ripple/Version.h
diff --git a/src/WSConnection.cpp b/src/cpp/ripple/WSConnection.cpp
similarity index 100%
rename from src/WSConnection.cpp
rename to src/cpp/ripple/WSConnection.cpp
diff --git a/src/WSConnection.h b/src/cpp/ripple/WSConnection.h
similarity index 100%
rename from src/WSConnection.h
rename to src/cpp/ripple/WSConnection.h
diff --git a/src/WSDoor.cpp b/src/cpp/ripple/WSDoor.cpp
similarity index 100%
rename from src/WSDoor.cpp
rename to src/cpp/ripple/WSDoor.cpp
diff --git a/src/WSDoor.h b/src/cpp/ripple/WSDoor.h
similarity index 100%
rename from src/WSDoor.h
rename to src/cpp/ripple/WSDoor.h
diff --git a/src/WSHandler.h b/src/cpp/ripple/WSHandler.h
similarity index 100%
rename from src/WSHandler.h
rename to src/cpp/ripple/WSHandler.h
diff --git a/src/Wallet.cpp b/src/cpp/ripple/Wallet.cpp
similarity index 100%
rename from src/Wallet.cpp
rename to src/cpp/ripple/Wallet.cpp
diff --git a/src/Wallet.h b/src/cpp/ripple/Wallet.h
similarity index 100%
rename from src/Wallet.h
rename to src/cpp/ripple/Wallet.h
diff --git a/src/base58.h b/src/cpp/ripple/base58.h
similarity index 100%
rename from src/base58.h
rename to src/cpp/ripple/base58.h
diff --git a/src/bignum.h b/src/cpp/ripple/bignum.h
similarity index 100%
rename from src/bignum.h
rename to src/cpp/ripple/bignum.h
diff --git a/src/key.h b/src/cpp/ripple/key.h
similarity index 100%
rename from src/key.h
rename to src/cpp/ripple/key.h
diff --git a/src/main.cpp b/src/cpp/ripple/main.cpp
similarity index 100%
rename from src/main.cpp
rename to src/cpp/ripple/main.cpp
diff --git a/src/rfc1751.cpp b/src/cpp/ripple/rfc1751.cpp
similarity index 100%
rename from src/rfc1751.cpp
rename to src/cpp/ripple/rfc1751.cpp
diff --git a/src/rfc1751.h b/src/cpp/ripple/rfc1751.h
similarity index 100%
rename from src/rfc1751.h
rename to src/cpp/ripple/rfc1751.h
diff --git a/src/ripple.proto b/src/cpp/ripple/ripple.proto
similarity index 100%
rename from src/ripple.proto
rename to src/cpp/ripple/ripple.proto
diff --git a/src/rpc.cpp b/src/cpp/ripple/rpc.cpp
similarity index 100%
rename from src/rpc.cpp
rename to src/cpp/ripple/rpc.cpp
diff --git a/src/types.h b/src/cpp/ripple/types.h
similarity index 100%
rename from src/types.h
rename to src/cpp/ripple/types.h
diff --git a/src/uint256.h b/src/cpp/ripple/uint256.h
similarity index 100%
rename from src/uint256.h
rename to src/cpp/ripple/uint256.h
diff --git a/src/utils.cpp b/src/cpp/ripple/utils.cpp
similarity index 100%
rename from src/utils.cpp
rename to src/cpp/ripple/utils.cpp
diff --git a/src/utils.h b/src/cpp/ripple/utils.h
similarity index 100%
rename from src/utils.h
rename to src/cpp/ripple/utils.h
diff --git a/websocketpp b/src/cpp/websocketpp
similarity index 100%
rename from websocketpp
rename to src/cpp/websocketpp
diff --git a/js/amount.js b/src/js/amount.js
similarity index 100%
rename from js/amount.js
rename to src/js/amount.js
diff --git a/js/cryptojs b/src/js/cryptojs
similarity index 100%
rename from js/cryptojs
rename to src/js/cryptojs
diff --git a/js/events.js b/src/js/events.js
similarity index 100%
rename from js/events.js
rename to src/js/events.js
diff --git a/js/jsbn.js b/src/js/jsbn.js
similarity index 100%
rename from js/jsbn.js
rename to src/js/jsbn.js
diff --git a/js/nodeutils.js b/src/js/nodeutils.js
similarity index 100%
rename from js/nodeutils.js
rename to src/js/nodeutils.js
diff --git a/js/remote.js b/src/js/remote.js
similarity index 100%
rename from js/remote.js
rename to src/js/remote.js
diff --git a/js/serializer.js b/src/js/serializer.js
similarity index 100%
rename from js/serializer.js
rename to src/js/serializer.js
diff --git a/js/sjcl b/src/js/sjcl
similarity index 100%
rename from js/sjcl
rename to src/js/sjcl
diff --git a/js/utils.js b/src/js/utils.js
similarity index 100%
rename from js/utils.js
rename to src/js/utils.js
diff --git a/test/amount-test.js b/test/amount-test.js
index 4da029162..4c7388708 100644
--- a/test/amount-test.js
+++ b/test/amount-test.js
@@ -1,12 +1,12 @@
 var buster  = require("buster");
 
-var jsbn    = require('../js/jsbn.js');
+var jsbn    = require('../src/js/jsbn.js');
 var BigInteger	= jsbn.BigInteger;
 var nbi		= jsbn.nbi;
 
-var amount  = require("../js/amount.js");
-var Amount  = require("../js/amount.js").Amount;
-var UInt160 = require("../js/amount.js").UInt160;
+var amount  = require("../src/js/amount.js");
+var Amount  = require("../src/js/amount.js").Amount;
+var UInt160 = require("../src/js/amount.js").UInt160;
 
 var config  = require('./config.js');
 
diff --git a/test/offer-test.js b/test/offer-test.js
index 9290235c4..b4b5e437e 100644
--- a/test/offer-test.js
+++ b/test/offer-test.js
@@ -2,8 +2,8 @@
 var async   = require("async");
 var buster  = require("buster");
 
-var Amount = require("../js/amount.js").Amount;
-var Remote  = require("../js/remote.js").Remote;
+var Amount = require("../src/js/amount.js").Amount;
+var Remote  = require("../src/js/remote.js").Remote;
 var Server  = require("./server.js").Server;
 
 var testutils  = require("./testutils.js");
diff --git a/test/remote-test.js b/test/remote-test.js
index a085676c5..f2596cbfb 100644
--- a/test/remote-test.js
+++ b/test/remote-test.js
@@ -1,7 +1,7 @@
 var buster  = require("buster");
 
-var Amount = require("../js/amount.js").Amount;
-var Remote  = require("../js/remote.js").Remote;
+var Amount = require("../src/js/amount.js").Amount;
+var Remote  = require("../src/js/remote.js").Remote;
 var Server  = require("./server.js").Server;
 
 var testutils  = require("./testutils.js");
diff --git a/test/send-test.js b/test/send-test.js
index d5f4cb969..ad316ffa3 100644
--- a/test/send-test.js
+++ b/test/send-test.js
@@ -1,8 +1,8 @@
 var async   = require("async");
 var buster  = require("buster");
 
-var Amount = require("../js/amount.js").Amount;
-var Remote  = require("../js/remote.js").Remote;
+var Amount = require("../src/js/amount.js").Amount;
+var Remote  = require("../src/js/remote.js").Remote;
 var Server  = require("./server.js").Server;
 
 var testutils  = require("./testutils.js");
diff --git a/test/server.js b/test/server.js
index aca9b3984..fde2dfae0 100644
--- a/test/server.js
+++ b/test/server.js
@@ -23,7 +23,7 @@ var util      	  = require("util");
 var EventEmitter  = require('events').EventEmitter;
 
 var config	  = require("./config.js");
-var nodeutils 	  = require("../js/nodeutils.js");
+var nodeutils 	  = require("../src/js/nodeutils.js");
 
 // Create a server object
 var Server = function (name, config, verbose) {
diff --git a/test/testutils.js b/test/testutils.js
index c11fdaf04..94883eaf4 100644
--- a/test/testutils.js
+++ b/test/testutils.js
@@ -1,8 +1,8 @@
 var async   = require("async");
 // var buster  = require("buster");
 
-var Amount  = require("../js/amount.js").Amount;
-var Remote  = require("../js/remote.js").Remote;
+var Amount  = require("../src/js/amount.js").Amount;
+var Remote  = require("../src/js/remote.js").Remote;
 var Server  = require("./server.js").Server;
 
 var config  = require("./config.js");
diff --git a/test/utils-test.js b/test/utils-test.js
index 5b22fb5cc..cea1f4364 100644
--- a/test/utils-test.js
+++ b/test/utils-test.js
@@ -1,7 +1,7 @@
 var fs	    = require("fs");
 var buster  = require("buster");
 
-var utils   = require("../js/utils.js");
+var utils   = require("../src/js/utils.js");
 
 buster.testCase("Utils", {
   "hexToString and stringToHex" : {
diff --git a/test/websocket-test.js b/test/websocket-test.js
index dcfc25d5b..1afccc943 100644
--- a/test/websocket-test.js
+++ b/test/websocket-test.js
@@ -1,7 +1,7 @@
 var buster  = require("buster");
 
 var Server  = require("./server.js").Server;
-var Remote  = require("../js/remote.js").Remote;
+var Remote  = require("../src/js/remote.js").Remote;
 
 // How long to wait for server to start.
 var serverDelay = 1500;