From 84c3fb07b0b8199c7f85c5de280e7100bad0786f Mon Sep 17 00:00:00 2001 From: Jaromil Date: Sat, 23 Apr 2011 11:49:47 +0200 Subject: [PATCH] directory re-organization (keeps the old build system) there is no internal modification of any file in this commit files are moved into directories according to established standards in sourcecode distribution; these directories contain: src - Files that are used in constructing the executable binaries, but are not installed. doc - Files in HTML and text format that document usage, quirks of the implementation, and contributor checklists. locale - Files that contain human language translation of strings used in the program contrib - Files contributed from distributions or other third party implementing scripts and auxiliary programs --- .gitignore | 6 +++--- license.txt => COPYING | 0 README | 1 + build-msw.txt => doc/build-msw.txt | 2 +- build-osx.txt => doc/build-osx.txt | 0 build-unix.txt => doc/build-unix.txt | 2 ++ coding.txt => doc/coding.txt | 0 {rc => share/pixmaps}/addressbook16.bmp | Bin {rc => share/pixmaps}/addressbook16mask.bmp | Bin {rc => share/pixmaps}/addressbook20.bmp | Bin {rc => share/pixmaps}/addressbook20mask.bmp | Bin {rc => share/pixmaps}/bitcoin-bc.ico | Bin {rc => share/pixmaps}/bitcoin.ico | Bin {rc => share/pixmaps}/check.ico | Bin {rc => share/pixmaps}/favicon.ico | Bin {rc => share/pixmaps}/send16.bmp | Bin {rc => share/pixmaps}/send16mask.bmp | Bin {rc => share/pixmaps}/send16masknoshadow.bmp | Bin {rc => share/pixmaps}/send20.bmp | Bin {rc => share/pixmaps}/send20mask.bmp | Bin setup.nsi => share/setup.nsi | 0 ui.rc => share/ui.rc | 0 uiproject.fbp => share/uiproject.fbp | 0 base58.h => src/base58.h | 0 bignum.h => src/bignum.h | 0 {cryptopp => src/cryptopp}/License.txt | 0 {cryptopp => src/cryptopp}/Readme.txt | 0 {cryptopp => src/cryptopp}/config.h | 0 {cryptopp => src/cryptopp}/cpu.cpp | 0 {cryptopp => src/cryptopp}/cpu.h | 0 {cryptopp => src/cryptopp}/cryptlib.h | 0 {cryptopp => src/cryptopp}/iterhash.h | 0 {cryptopp => src/cryptopp}/misc.h | 0 {cryptopp => src/cryptopp}/obj/.gitignore | 0 {cryptopp => src/cryptopp}/pch.h | 0 {cryptopp => src/cryptopp}/secblock.h | 0 {cryptopp => src/cryptopp}/sha.cpp | 0 {cryptopp => src/cryptopp}/sha.h | 0 {cryptopp => src/cryptopp}/simple.h | 0 {cryptopp => src/cryptopp}/smartptr.h | 0 {cryptopp => src/cryptopp}/stdcpp.h | 0 db.cpp => src/db.cpp | 0 db.h => src/db.h | 0 headers.h => src/headers.h | 0 init.cpp => src/init.cpp | 0 init.h => src/init.h | 0 irc.cpp => src/irc.cpp | 0 irc.h => src/irc.h | 0 {json => src/json}/LICENSE.txt | 0 {json => src/json}/json_spirit.h | 0 {json => src/json}/json_spirit_error_position.h | 0 {json => src/json}/json_spirit_reader.cpp | 0 {json => src/json}/json_spirit_reader.h | 0 {json => src/json}/json_spirit_reader_template.h | 0 {json => src/json}/json_spirit_stream_reader.h | 0 {json => src/json}/json_spirit_utils.h | 0 {json => src/json}/json_spirit_value.cpp | 0 {json => src/json}/json_spirit_value.h | 0 {json => src/json}/json_spirit_writer.cpp | 0 {json => src/json}/json_spirit_writer.h | 0 {json => src/json}/json_spirit_writer_template.h | 0 key.h => src/key.h | 0 main.cpp => src/main.cpp | 0 main.h => src/main.h | 0 makefile.mingw => src/makefile.mingw | 0 makefile.osx => src/makefile.osx | 0 makefile.unix => src/makefile.unix | 0 makefile.vc => src/makefile.vc | 0 net.cpp => src/net.cpp | 0 net.h => src/net.h | 0 noui.h => src/noui.h | 0 {obj => src/obj}/.gitignore | 0 {obj => src/obj}/nogui/.gitignore | 0 rpc.cpp => src/rpc.cpp | 0 rpc.h => src/rpc.h | 0 script.cpp => src/script.cpp | 0 script.h => src/script.h | 0 serialize.h => src/serialize.h | 0 sha256.cpp => src/sha256.cpp | 0 strlcpy.h => src/strlcpy.h | 0 ui.cpp => src/ui.cpp | 0 ui.h => src/ui.h | 0 uibase.cpp => src/uibase.cpp | 0 uibase.h => src/uibase.h | 0 uint256.h => src/uint256.h | 0 util.cpp => src/util.cpp | 0 util.h => src/util.h | 0 {xpm => src/xpm}/about.xpm | 0 {xpm => src/xpm}/addressbook16.xpm | 0 {xpm => src/xpm}/addressbook20.xpm | 0 {xpm => src/xpm}/bitcoin16.xpm | 0 {xpm => src/xpm}/bitcoin20.xpm | 0 {xpm => src/xpm}/bitcoin32.xpm | 0 {xpm => src/xpm}/bitcoin48.xpm | 0 {xpm => src/xpm}/bitcoin80.xpm | 0 {xpm => src/xpm}/check.xpm | 0 {xpm => src/xpm}/send16.xpm | 0 {xpm => src/xpm}/send16noshadow.xpm | 0 {xpm => src/xpm}/send20.xpm | 0 99 files changed, 7 insertions(+), 4 deletions(-) rename license.txt => COPYING (100%) create mode 120000 README rename build-msw.txt => doc/build-msw.txt (99%) rename build-osx.txt => doc/build-osx.txt (100%) rename build-unix.txt => doc/build-unix.txt (99%) rename coding.txt => doc/coding.txt (100%) rename {rc => share/pixmaps}/addressbook16.bmp (100%) rename {rc => share/pixmaps}/addressbook16mask.bmp (100%) rename {rc => share/pixmaps}/addressbook20.bmp (100%) rename {rc => share/pixmaps}/addressbook20mask.bmp (100%) rename {rc => share/pixmaps}/bitcoin-bc.ico (100%) rename {rc => share/pixmaps}/bitcoin.ico (100%) rename {rc => share/pixmaps}/check.ico (100%) rename {rc => share/pixmaps}/favicon.ico (100%) rename {rc => share/pixmaps}/send16.bmp (100%) rename {rc => share/pixmaps}/send16mask.bmp (100%) rename {rc => share/pixmaps}/send16masknoshadow.bmp (100%) rename {rc => share/pixmaps}/send20.bmp (100%) rename {rc => share/pixmaps}/send20mask.bmp (100%) rename setup.nsi => share/setup.nsi (100%) rename ui.rc => share/ui.rc (100%) rename uiproject.fbp => share/uiproject.fbp (100%) rename base58.h => src/base58.h (100%) rename bignum.h => src/bignum.h (100%) rename {cryptopp => src/cryptopp}/License.txt (100%) rename {cryptopp => src/cryptopp}/Readme.txt (100%) rename {cryptopp => src/cryptopp}/config.h (100%) rename {cryptopp => src/cryptopp}/cpu.cpp (100%) rename {cryptopp => src/cryptopp}/cpu.h (100%) rename {cryptopp => src/cryptopp}/cryptlib.h (100%) rename {cryptopp => src/cryptopp}/iterhash.h (100%) rename {cryptopp => src/cryptopp}/misc.h (100%) rename {cryptopp => src/cryptopp}/obj/.gitignore (100%) rename {cryptopp => src/cryptopp}/pch.h (100%) rename {cryptopp => src/cryptopp}/secblock.h (100%) rename {cryptopp => src/cryptopp}/sha.cpp (100%) rename {cryptopp => src/cryptopp}/sha.h (100%) rename {cryptopp => src/cryptopp}/simple.h (100%) rename {cryptopp => src/cryptopp}/smartptr.h (100%) rename {cryptopp => src/cryptopp}/stdcpp.h (100%) rename db.cpp => src/db.cpp (100%) rename db.h => src/db.h (100%) rename headers.h => src/headers.h (100%) rename init.cpp => src/init.cpp (100%) rename init.h => src/init.h (100%) rename irc.cpp => src/irc.cpp (100%) rename irc.h => src/irc.h (100%) rename {json => src/json}/LICENSE.txt (100%) rename {json => src/json}/json_spirit.h (100%) rename {json => src/json}/json_spirit_error_position.h (100%) rename {json => src/json}/json_spirit_reader.cpp (100%) rename {json => src/json}/json_spirit_reader.h (100%) rename {json => src/json}/json_spirit_reader_template.h (100%) rename {json => src/json}/json_spirit_stream_reader.h (100%) rename {json => src/json}/json_spirit_utils.h (100%) rename {json => src/json}/json_spirit_value.cpp (100%) rename {json => src/json}/json_spirit_value.h (100%) rename {json => src/json}/json_spirit_writer.cpp (100%) rename {json => src/json}/json_spirit_writer.h (100%) rename {json => src/json}/json_spirit_writer_template.h (100%) rename key.h => src/key.h (100%) rename main.cpp => src/main.cpp (100%) rename main.h => src/main.h (100%) rename makefile.mingw => src/makefile.mingw (100%) rename makefile.osx => src/makefile.osx (100%) rename makefile.unix => src/makefile.unix (100%) rename makefile.vc => src/makefile.vc (100%) rename net.cpp => src/net.cpp (100%) rename net.h => src/net.h (100%) rename noui.h => src/noui.h (100%) rename {obj => src/obj}/.gitignore (100%) rename {obj => src/obj}/nogui/.gitignore (100%) rename rpc.cpp => src/rpc.cpp (100%) rename rpc.h => src/rpc.h (100%) rename script.cpp => src/script.cpp (100%) rename script.h => src/script.h (100%) rename serialize.h => src/serialize.h (100%) rename sha256.cpp => src/sha256.cpp (100%) rename strlcpy.h => src/strlcpy.h (100%) rename ui.cpp => src/ui.cpp (100%) rename ui.h => src/ui.h (100%) rename uibase.cpp => src/uibase.cpp (100%) rename uibase.h => src/uibase.h (100%) rename uint256.h => src/uint256.h (100%) rename util.cpp => src/util.cpp (100%) rename util.h => src/util.h (100%) rename {xpm => src/xpm}/about.xpm (100%) rename {xpm => src/xpm}/addressbook16.xpm (100%) rename {xpm => src/xpm}/addressbook20.xpm (100%) rename {xpm => src/xpm}/bitcoin16.xpm (100%) rename {xpm => src/xpm}/bitcoin20.xpm (100%) rename {xpm => src/xpm}/bitcoin32.xpm (100%) rename {xpm => src/xpm}/bitcoin48.xpm (100%) rename {xpm => src/xpm}/bitcoin80.xpm (100%) rename {xpm => src/xpm}/check.xpm (100%) rename {xpm => src/xpm}/send16.xpm (100%) rename {xpm => src/xpm}/send16noshadow.xpm (100%) rename {xpm => src/xpm}/send20.xpm (100%) diff --git a/.gitignore b/.gitignore index 1990117cfd..eec3751aa6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -*.exe -bitcoin -bitcoind +src/*.exe +src/bitcoin +src/bitcoind diff --git a/license.txt b/COPYING similarity index 100% rename from license.txt rename to COPYING diff --git a/README b/README new file mode 120000 index 0000000000..42061c01a1 --- /dev/null +++ b/README @@ -0,0 +1 @@ +README.md \ No newline at end of file diff --git a/build-msw.txt b/doc/build-msw.txt similarity index 99% rename from build-msw.txt rename to doc/build-msw.txt index a28c7ef859..e30b4ee726 100644 --- a/build-msw.txt +++ b/doc/build-msw.txt @@ -106,7 +106,7 @@ Get miniupnpc-1.5.20110215.tar.gz and copy *.h to \upnpc-exe-win32-20110215\mini Bitcoin ------- DOS prompt: -cd \bitcoin +cd \bitcoin\src mingw32-make bitcoin.exe bitcoind.exe -f makefile.mingw strip bitcoin.exe strip bitcoind.exe diff --git a/build-osx.txt b/doc/build-osx.txt similarity index 100% rename from build-osx.txt rename to doc/build-osx.txt diff --git a/build-unix.txt b/doc/build-unix.txt similarity index 99% rename from build-unix.txt rename to doc/build-unix.txt index b959f1a2d9..4494c752da 100644 --- a/build-unix.txt +++ b/doc/build-unix.txt @@ -13,6 +13,8 @@ UNIX BUILD NOTES To Build -------- +cd src/ + make -f makefile.unix # Bitcoin with wxWidgets GUI or make -f makefile.unix bitcoind # Headless bitcoin diff --git a/coding.txt b/doc/coding.txt similarity index 100% rename from coding.txt rename to doc/coding.txt diff --git a/rc/addressbook16.bmp b/share/pixmaps/addressbook16.bmp similarity index 100% rename from rc/addressbook16.bmp rename to share/pixmaps/addressbook16.bmp diff --git a/rc/addressbook16mask.bmp b/share/pixmaps/addressbook16mask.bmp similarity index 100% rename from rc/addressbook16mask.bmp rename to share/pixmaps/addressbook16mask.bmp diff --git a/rc/addressbook20.bmp b/share/pixmaps/addressbook20.bmp similarity index 100% rename from rc/addressbook20.bmp rename to share/pixmaps/addressbook20.bmp diff --git a/rc/addressbook20mask.bmp b/share/pixmaps/addressbook20mask.bmp similarity index 100% rename from rc/addressbook20mask.bmp rename to share/pixmaps/addressbook20mask.bmp diff --git a/rc/bitcoin-bc.ico b/share/pixmaps/bitcoin-bc.ico similarity index 100% rename from rc/bitcoin-bc.ico rename to share/pixmaps/bitcoin-bc.ico diff --git a/rc/bitcoin.ico b/share/pixmaps/bitcoin.ico similarity index 100% rename from rc/bitcoin.ico rename to share/pixmaps/bitcoin.ico diff --git a/rc/check.ico b/share/pixmaps/check.ico similarity index 100% rename from rc/check.ico rename to share/pixmaps/check.ico diff --git a/rc/favicon.ico b/share/pixmaps/favicon.ico similarity index 100% rename from rc/favicon.ico rename to share/pixmaps/favicon.ico diff --git a/rc/send16.bmp b/share/pixmaps/send16.bmp similarity index 100% rename from rc/send16.bmp rename to share/pixmaps/send16.bmp diff --git a/rc/send16mask.bmp b/share/pixmaps/send16mask.bmp similarity index 100% rename from rc/send16mask.bmp rename to share/pixmaps/send16mask.bmp diff --git a/rc/send16masknoshadow.bmp b/share/pixmaps/send16masknoshadow.bmp similarity index 100% rename from rc/send16masknoshadow.bmp rename to share/pixmaps/send16masknoshadow.bmp diff --git a/rc/send20.bmp b/share/pixmaps/send20.bmp similarity index 100% rename from rc/send20.bmp rename to share/pixmaps/send20.bmp diff --git a/rc/send20mask.bmp b/share/pixmaps/send20mask.bmp similarity index 100% rename from rc/send20mask.bmp rename to share/pixmaps/send20mask.bmp diff --git a/setup.nsi b/share/setup.nsi similarity index 100% rename from setup.nsi rename to share/setup.nsi diff --git a/ui.rc b/share/ui.rc similarity index 100% rename from ui.rc rename to share/ui.rc diff --git a/uiproject.fbp b/share/uiproject.fbp similarity index 100% rename from uiproject.fbp rename to share/uiproject.fbp diff --git a/base58.h b/src/base58.h similarity index 100% rename from base58.h rename to src/base58.h diff --git a/bignum.h b/src/bignum.h similarity index 100% rename from bignum.h rename to src/bignum.h diff --git a/cryptopp/License.txt b/src/cryptopp/License.txt similarity index 100% rename from cryptopp/License.txt rename to src/cryptopp/License.txt diff --git a/cryptopp/Readme.txt b/src/cryptopp/Readme.txt similarity index 100% rename from cryptopp/Readme.txt rename to src/cryptopp/Readme.txt diff --git a/cryptopp/config.h b/src/cryptopp/config.h similarity index 100% rename from cryptopp/config.h rename to src/cryptopp/config.h diff --git a/cryptopp/cpu.cpp b/src/cryptopp/cpu.cpp similarity index 100% rename from cryptopp/cpu.cpp rename to src/cryptopp/cpu.cpp diff --git a/cryptopp/cpu.h b/src/cryptopp/cpu.h similarity index 100% rename from cryptopp/cpu.h rename to src/cryptopp/cpu.h diff --git a/cryptopp/cryptlib.h b/src/cryptopp/cryptlib.h similarity index 100% rename from cryptopp/cryptlib.h rename to src/cryptopp/cryptlib.h diff --git a/cryptopp/iterhash.h b/src/cryptopp/iterhash.h similarity index 100% rename from cryptopp/iterhash.h rename to src/cryptopp/iterhash.h diff --git a/cryptopp/misc.h b/src/cryptopp/misc.h similarity index 100% rename from cryptopp/misc.h rename to src/cryptopp/misc.h diff --git a/cryptopp/obj/.gitignore b/src/cryptopp/obj/.gitignore similarity index 100% rename from cryptopp/obj/.gitignore rename to src/cryptopp/obj/.gitignore diff --git a/cryptopp/pch.h b/src/cryptopp/pch.h similarity index 100% rename from cryptopp/pch.h rename to src/cryptopp/pch.h diff --git a/cryptopp/secblock.h b/src/cryptopp/secblock.h similarity index 100% rename from cryptopp/secblock.h rename to src/cryptopp/secblock.h diff --git a/cryptopp/sha.cpp b/src/cryptopp/sha.cpp similarity index 100% rename from cryptopp/sha.cpp rename to src/cryptopp/sha.cpp diff --git a/cryptopp/sha.h b/src/cryptopp/sha.h similarity index 100% rename from cryptopp/sha.h rename to src/cryptopp/sha.h diff --git a/cryptopp/simple.h b/src/cryptopp/simple.h similarity index 100% rename from cryptopp/simple.h rename to src/cryptopp/simple.h diff --git a/cryptopp/smartptr.h b/src/cryptopp/smartptr.h similarity index 100% rename from cryptopp/smartptr.h rename to src/cryptopp/smartptr.h diff --git a/cryptopp/stdcpp.h b/src/cryptopp/stdcpp.h similarity index 100% rename from cryptopp/stdcpp.h rename to src/cryptopp/stdcpp.h diff --git a/db.cpp b/src/db.cpp similarity index 100% rename from db.cpp rename to src/db.cpp diff --git a/db.h b/src/db.h similarity index 100% rename from db.h rename to src/db.h diff --git a/headers.h b/src/headers.h similarity index 100% rename from headers.h rename to src/headers.h diff --git a/init.cpp b/src/init.cpp similarity index 100% rename from init.cpp rename to src/init.cpp diff --git a/init.h b/src/init.h similarity index 100% rename from init.h rename to src/init.h diff --git a/irc.cpp b/src/irc.cpp similarity index 100% rename from irc.cpp rename to src/irc.cpp diff --git a/irc.h b/src/irc.h similarity index 100% rename from irc.h rename to src/irc.h diff --git a/json/LICENSE.txt b/src/json/LICENSE.txt similarity index 100% rename from json/LICENSE.txt rename to src/json/LICENSE.txt diff --git a/json/json_spirit.h b/src/json/json_spirit.h similarity index 100% rename from json/json_spirit.h rename to src/json/json_spirit.h diff --git a/json/json_spirit_error_position.h b/src/json/json_spirit_error_position.h similarity index 100% rename from json/json_spirit_error_position.h rename to src/json/json_spirit_error_position.h diff --git a/json/json_spirit_reader.cpp b/src/json/json_spirit_reader.cpp similarity index 100% rename from json/json_spirit_reader.cpp rename to src/json/json_spirit_reader.cpp diff --git a/json/json_spirit_reader.h b/src/json/json_spirit_reader.h similarity index 100% rename from json/json_spirit_reader.h rename to src/json/json_spirit_reader.h diff --git a/json/json_spirit_reader_template.h b/src/json/json_spirit_reader_template.h similarity index 100% rename from json/json_spirit_reader_template.h rename to src/json/json_spirit_reader_template.h diff --git a/json/json_spirit_stream_reader.h b/src/json/json_spirit_stream_reader.h similarity index 100% rename from json/json_spirit_stream_reader.h rename to src/json/json_spirit_stream_reader.h diff --git a/json/json_spirit_utils.h b/src/json/json_spirit_utils.h similarity index 100% rename from json/json_spirit_utils.h rename to src/json/json_spirit_utils.h diff --git a/json/json_spirit_value.cpp b/src/json/json_spirit_value.cpp similarity index 100% rename from json/json_spirit_value.cpp rename to src/json/json_spirit_value.cpp diff --git a/json/json_spirit_value.h b/src/json/json_spirit_value.h similarity index 100% rename from json/json_spirit_value.h rename to src/json/json_spirit_value.h diff --git a/json/json_spirit_writer.cpp b/src/json/json_spirit_writer.cpp similarity index 100% rename from json/json_spirit_writer.cpp rename to src/json/json_spirit_writer.cpp diff --git a/json/json_spirit_writer.h b/src/json/json_spirit_writer.h similarity index 100% rename from json/json_spirit_writer.h rename to src/json/json_spirit_writer.h diff --git a/json/json_spirit_writer_template.h b/src/json/json_spirit_writer_template.h similarity index 100% rename from json/json_spirit_writer_template.h rename to src/json/json_spirit_writer_template.h diff --git a/key.h b/src/key.h similarity index 100% rename from key.h rename to src/key.h diff --git a/main.cpp b/src/main.cpp similarity index 100% rename from main.cpp rename to src/main.cpp diff --git a/main.h b/src/main.h similarity index 100% rename from main.h rename to src/main.h diff --git a/makefile.mingw b/src/makefile.mingw similarity index 100% rename from makefile.mingw rename to src/makefile.mingw diff --git a/makefile.osx b/src/makefile.osx similarity index 100% rename from makefile.osx rename to src/makefile.osx diff --git a/makefile.unix b/src/makefile.unix similarity index 100% rename from makefile.unix rename to src/makefile.unix diff --git a/makefile.vc b/src/makefile.vc similarity index 100% rename from makefile.vc rename to src/makefile.vc diff --git a/net.cpp b/src/net.cpp similarity index 100% rename from net.cpp rename to src/net.cpp diff --git a/net.h b/src/net.h similarity index 100% rename from net.h rename to src/net.h diff --git a/noui.h b/src/noui.h similarity index 100% rename from noui.h rename to src/noui.h diff --git a/obj/.gitignore b/src/obj/.gitignore similarity index 100% rename from obj/.gitignore rename to src/obj/.gitignore diff --git a/obj/nogui/.gitignore b/src/obj/nogui/.gitignore similarity index 100% rename from obj/nogui/.gitignore rename to src/obj/nogui/.gitignore diff --git a/rpc.cpp b/src/rpc.cpp similarity index 100% rename from rpc.cpp rename to src/rpc.cpp diff --git a/rpc.h b/src/rpc.h similarity index 100% rename from rpc.h rename to src/rpc.h diff --git a/script.cpp b/src/script.cpp similarity index 100% rename from script.cpp rename to src/script.cpp diff --git a/script.h b/src/script.h similarity index 100% rename from script.h rename to src/script.h diff --git a/serialize.h b/src/serialize.h similarity index 100% rename from serialize.h rename to src/serialize.h diff --git a/sha256.cpp b/src/sha256.cpp similarity index 100% rename from sha256.cpp rename to src/sha256.cpp diff --git a/strlcpy.h b/src/strlcpy.h similarity index 100% rename from strlcpy.h rename to src/strlcpy.h diff --git a/ui.cpp b/src/ui.cpp similarity index 100% rename from ui.cpp rename to src/ui.cpp diff --git a/ui.h b/src/ui.h similarity index 100% rename from ui.h rename to src/ui.h diff --git a/uibase.cpp b/src/uibase.cpp similarity index 100% rename from uibase.cpp rename to src/uibase.cpp diff --git a/uibase.h b/src/uibase.h similarity index 100% rename from uibase.h rename to src/uibase.h diff --git a/uint256.h b/src/uint256.h similarity index 100% rename from uint256.h rename to src/uint256.h diff --git a/util.cpp b/src/util.cpp similarity index 100% rename from util.cpp rename to src/util.cpp diff --git a/util.h b/src/util.h similarity index 100% rename from util.h rename to src/util.h diff --git a/xpm/about.xpm b/src/xpm/about.xpm similarity index 100% rename from xpm/about.xpm rename to src/xpm/about.xpm diff --git a/xpm/addressbook16.xpm b/src/xpm/addressbook16.xpm similarity index 100% rename from xpm/addressbook16.xpm rename to src/xpm/addressbook16.xpm diff --git a/xpm/addressbook20.xpm b/src/xpm/addressbook20.xpm similarity index 100% rename from xpm/addressbook20.xpm rename to src/xpm/addressbook20.xpm diff --git a/xpm/bitcoin16.xpm b/src/xpm/bitcoin16.xpm similarity index 100% rename from xpm/bitcoin16.xpm rename to src/xpm/bitcoin16.xpm diff --git a/xpm/bitcoin20.xpm b/src/xpm/bitcoin20.xpm similarity index 100% rename from xpm/bitcoin20.xpm rename to src/xpm/bitcoin20.xpm diff --git a/xpm/bitcoin32.xpm b/src/xpm/bitcoin32.xpm similarity index 100% rename from xpm/bitcoin32.xpm rename to src/xpm/bitcoin32.xpm diff --git a/xpm/bitcoin48.xpm b/src/xpm/bitcoin48.xpm similarity index 100% rename from xpm/bitcoin48.xpm rename to src/xpm/bitcoin48.xpm diff --git a/xpm/bitcoin80.xpm b/src/xpm/bitcoin80.xpm similarity index 100% rename from xpm/bitcoin80.xpm rename to src/xpm/bitcoin80.xpm diff --git a/xpm/check.xpm b/src/xpm/check.xpm similarity index 100% rename from xpm/check.xpm rename to src/xpm/check.xpm diff --git a/xpm/send16.xpm b/src/xpm/send16.xpm similarity index 100% rename from xpm/send16.xpm rename to src/xpm/send16.xpm diff --git a/xpm/send16noshadow.xpm b/src/xpm/send16noshadow.xpm similarity index 100% rename from xpm/send16noshadow.xpm rename to src/xpm/send16noshadow.xpm diff --git a/xpm/send20.xpm b/src/xpm/send20.xpm similarity index 100% rename from xpm/send20.xpm rename to src/xpm/send20.xpm