#
#
# delete "bootstrap"
# 
# rename "administrator.cc"
#     to "src/administrator.cc"
# 
# rename "administrator.hh"
#     to "src/administrator.hh"
# 
# rename "basic_io_serverlist_reader.cc"
#     to "src/basic_io_serverlist_reader.cc"
# 
# rename "basic_io_serverlist_reader.hh"
#     to "src/basic_io_serverlist_reader.hh"
# 
# rename "buffer.cc"
#     to "src/buffer.cc"
# 
# rename "buffer.hh"
#     to "src/buffer.hh"
# 
# rename "channel.cc"
#     to "src/channel.cc"
# 
# rename "channel.hh"
#     to "src/channel.hh"
# 
# rename "err.cc"
#     to "src/err.cc"
# 
# rename "err.hh"
#     to "src/err.hh"
# 
# rename "forked_server_manager.cc"
#     to "src/forked_server_manager.cc"
# 
# rename "forked_server_manager.hh"
#     to "src/forked_server_manager.hh"
# 
# rename "io.cc"
#     to "src/io.cc"
# 
# rename "io.hh"
#     to "src/io.hh"
# 
# rename "query_client.cc"
#     to "src/query_client.cc"
# 
# rename "query_client.hh"
#     to "src/query_client.hh"
# 
# rename "server.cc"
#     to "src/server.cc"
# 
# rename "server.hh"
#     to "src/server.hh"
# 
# rename "server_manager.cc"
#     to "src/server_manager.cc"
# 
# rename "server_manager.hh"
#     to "src/server_manager.hh"
# 
# rename "serverlist_reader.cc"
#     to "src/serverlist_reader.cc"
# 
# rename "serverlist_reader.hh"
#     to "src/serverlist_reader.hh"
# 
# rename "sock.cc"
#     to "src/sock.cc"
# 
# rename "sock.hh"
#     to "src/sock.hh"
# 
# rename "usher.cc"
#     to "src/usher.cc"
# 
# add_dir "src"
# 
# patch "Makefile.am"
#  from [2c6fe7555aecf248aa6bcc27a67d60a23a30aa68]
#    to [8c0d0c3b5133080e5f110608ceccbf562002eae0]
# 
# patch "configure.in"
#  from [a191b18290b0903b951d62b95ddd9a4f8e769e0b]
#    to [a6843cdbb26cf247fae713d4a5b6076e73ae5cbd]
#
============================================================
--- Makefile.am	2c6fe7555aecf248aa6bcc27a67d60a23a30aa68
+++ Makefile.am	8c0d0c3b5133080e5f110608ceccbf562002eae0
@@ -1,18 +1,19 @@ bin_PROGRAMS = usher
 
 bin_PROGRAMS = usher
 
-usher_SOURCES = administrator.cc administrator.hh \
-                basic_io_serverlist_reader.cc basic_io_serverlist_reader.hh \
-                buffer.cc buffer.hh \
-                channel.cc channel.hh \
-                err.cc err.hh \
-                io.cc io.hh \
-                query_client.cc query_client.hh \
-                server.cc server.hh \
-                serverlist_reader.cc serverlist_reader.hh \
-                server_manager.cc server_manager.hh \
-                sock.cc sock.hh \
-                usher.cc
+usher_SOURCES = src/administrator.cc src/administrator.hh \
+                src/basic_io_serverlist_reader.cc \
+                src/basic_io_serverlist_reader.hh \
+                src/buffer.cc src/buffer.hh \
+                src/channel.cc src/channel.hh \
+                src/err.cc src/err.hh \
+                src/io.cc src/io.hh \
+                src/query_client.cc src/query_client.hh \
+                src/server.cc src/server.hh \
+                src/serverlist_reader.cc src/serverlist_reader.hh \
+                src/server_manager.cc src/server_manager.hh \
+                src/sock.cc src/sock.hh \
+                src/usher.cc
 
 usher_CPPFLAGS = -Wall -pedantic -Wextra
 
============================================================
--- configure.in	a191b18290b0903b951d62b95ddd9a4f8e769e0b
+++ configure.in	a6843cdbb26cf247fae713d4a5b6076e73ae5cbd
@@ -5,7 +5,7 @@ AM_INIT_AUTOMAKE
 AC_INIT(usher, 0.1, BUG-REPORT-ADDRESS)
 AM_INIT_AUTOMAKE
 
-AC_CONFIG_SRCDIR([usher.cc])
+AC_CONFIG_SRCDIR([src/usher.cc])
 AC_CONFIG_HEADER([config.h])
 
 # Checks for programs.