Start whacking Makefiles

svn path=/branches/tk685/; revision=5758

23 files changed, 323 insertions, 601 deletions

diff --git a/Makefile.in b/Makefile.in
index 1247ff0d..1394a6cb 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,16 +1,38 @@
 # $Id$
 
-PYTHON = @PYTHON@
+CFLAGS		= @CFLAGS@
+LDFLAGS		= @LDFLAGS@ @POW_LDFLAGS@
+LIBS		= @LIBS@
 
-abs_top_builddir = @abs_top_builddir@
+PYTHON		= @PYTHON@
+INSTALL		= @INSTALL@ -m 555 
 
-SUBDIRS = @TOP_LEVEL_SUBDIRS@
+prefix		= @prefix@
+exec_prefix	= @exec_prefix@
+datarootdir	= @datarootdir@
+datadir		= @datadir@
+localstatedir	= @localstatedir@
+sharedstatedir	= @sharedstatedir@
+sysconfdir	= @sysconfdir@
+bindir		= @bindir@
+sbindir		= @sbindir@
+libexecdir	= @libexecdir@
+sysconfdir	= @sysconfdir@
+
+abs_builddir	= @abs_builddir@
+abs_top_srcdir	= @abs_top_srcdir@
+abs_top_builddir= @abs_top_builddir@
+srcdir          = @srcdir@
+
+SUBDIRS		= @TOP_LEVEL_SUBDIRS@
+
+SETUP_PY_INSTALL_LAYOUT = @SETUP_PY_INSTALL_LAYOUT@
 
 default: all
 
 test:: all
 
-all:: VERSION
+all:: VERSION rpki/autoconf.py setup_autoconf.py
 
 all install clean test distclean deinstall uninstall::
 	@for i in ${SUBDIRS}; do echo "Making $@ in $$i"; (cd $$i && ${MAKE} $@); done
@@ -30,3 +52,59 @@ VERSION: .FORCE
 	${PYTHON} buildtools/make-version.py
 
 .FORCE:
+
+rpki/autoconf.py: Makefile
+	@echo 'Generating $@';							\
+	(echo '# Automatically generated.  DO NOT EDIT.';			\
+	 echo ;									\
+	 echo 'bindir	      = "${bindir}"';					\
+	 echo 'datarootdir    = "${datarootdir}"';				\
+	 echo 'localstatedir  = "${localstatedir}"';				\
+	 echo 'sbindir	      = "${sbindir}"';					\
+	 echo 'sharedstatedir = "${sharedstatedir}"';				\
+	 echo 'sysconfdir     = "${sysconfdir}"';				\
+	 echo 'libexecdir     = "${libexecdir}"';				\
+	 echo ;									\
+	 echo 'WSGI_DAEMON_PROCESS	    = "${WSGI_DAEMON_PROCESS}"';	\
+	 echo 'WSGI_PROCESS_GROUP	    = "${WSGI_PROCESS_GROUP}"';		\
+	 echo 'RCYNIC_HTML_DIR		    = "${RCYNIC_HTML_DIR}"';		\
+	 echo 'APACHE_VERSION		    = "${APACHE_VERSION}"';		\
+	 echo 'WSGI_PYTHON_EGG_CACHE_DIR    = "${WSGI_PYTHON_EGG_CACHE_DIR}"';	\
+	 echo 'WSGI_PYTHON_EGG_CACHE_USER   = "${WSGI_PYTHON_EGG_CACHE_USER}"';	\
+	) > $@
+
+clean::
+	rm -f rpki/autoconf.py
+
+setup_autoconf.py: rpki/autoconf.py
+	@echo 'Generating $@';					\
+	(cat rpki/autoconf.py;					\
+	 echo ;							\
+	 echo 'CFLAGS         = """${CFLAGS}"""';               \
+	 echo 'LDFLAGS        = """${LDFLAGS}"""';              \
+	 echo 'LIBS           = """${LIBS}"""';                 \
+	) > $@
+
+clean::
+	rm -f setup_autoconf.py setup_autoconf.pyc
+
+SETUP_PY_ROOT = `${PYTHON} -c 'import sys; print "--root " + sys.argv[1] if sys.argv[1] else ""' '${DESTDIR}'`
+
+POW_SO	= rpki/POW/_POW.so
+
+all:: setup_autoconf.py ${POW_SO} build/stamp
+
+.FORCE:
+
+${POW_SO}: .FORCE setup_autoconf.py
+	${PYTHON} setup.py build_ext --inplace
+
+build/stamp: .FORCE setup_autoconf.py
+	${PYTHON} setup.py build
+	touch $@
+
+clean::
+	rm -rf ${POW_SO} build dist
+
+clean::
+	find . -type f -name '*.py[co]' -delete
diff --git a/buildtools/make-version.py b/buildtools/make-version.py
index af513b5d..a73a89ab 100644
--- a/buildtools/make-version.py
+++ b/buildtools/make-version.py
@@ -63,7 +63,7 @@ if v == unknown:
     sys.stderr.write("Warning: Could not determine software version\n")
 
 if old is None or v != old:
+  with open("rpki/version.py", "w") as f:
+    f.write("VERSION = \"%s\"\n" % v)
   with open("VERSION", "w") as f:
     f.write(v + "\n")
-  with open("rpkid/rpki/version.py", "w") as f:
-    f.write("VERSION = \"%s\"\n" % v)
diff --git a/ca/Makefile.in b/ca/Makefile.in
index d36a3163..0764edc1 100644
--- a/ca/Makefile.in
+++ b/ca/Makefile.in
@@ -33,58 +33,12 @@ APACHE_VERSION			= @APACHE_VERSION@
 WSGI_PYTHON_EGG_CACHE_DIR	= @WSGI_PYTHON_EGG_CACHE_DIR@
 WSGI_PYTHON_EGG_CACHE_USER	= @WSGI_PYTHON_EGG_CACHE_USER@
 
-RPKID_INSTALL_TARGETS	= @RPKID_INSTALL_TARGETS@
-
-SETUP_PY_INSTALL_LAYOUT = @SETUP_PY_INSTALL_LAYOUT@
-
-SETUP_PY_ROOT = `${PYTHON} -c 'import sys; print "--root " + sys.argv[1] if sys.argv[1] else ""' '${DESTDIR}'`
-
-POW_SO = rpki/POW/_POW.so
-
-all:: rpki/autoconf.py setup_autoconf.py rpki/relaxng.py myrpki.rng rpki/sql_schemas.py ${POW_SO} build/stamp
-
-.FORCE:
-
-${POW_SO}: .FORCE setup_autoconf.py
-	${PYTHON} setup.py build_ext --inplace
-
-build/stamp: .FORCE setup_autoconf.py
-	${PYTHON} setup.py build
-	touch $@
+CA_INSTALL_TARGETS	= @CA_INSTALL_TARGETS@
 
 clean::
-	rm -rf ${POW_SO} build dist
-
-RNGS = left-right-schema.rng up-down-schema.rng publication-schema.rng myrpki.rng router-certificate-schema.rng
-
-rpki/relaxng.py: ${abs_top_srcdir}/buildtools/make-relaxng.py ${RNGS}
-	${PYTHON} ${abs_top_srcdir}/buildtools/make-relaxng.py ${RNGS} >$@.tmp
-	mv $@.tmp $@
-
-left-right-schema.rng: left-right-schema.rnc
-	${TRANG} left-right-schema.rnc left-right-schema.rng
-
-up-down-schema.rng: up-down-schema.rnc
-	${TRANG} up-down-schema.rnc up-down-schema.rng
-
-publication-schema.rng: publication-schema.rnc
-	${TRANG} publication-schema.rnc publication-schema.rng
-
-myrpki.rng: myrpki.rnc
-	${TRANG} myrpki.rnc myrpki.rng
-
-router-certificate-schema.rng: router-certificate-schema.rnc
-	${TRANG} router-certificate-schema.rnc router-certificate-schema.rng
-
-rpki/sql_schemas.py: ${abs_top_srcdir}/buildtools/make-sql-schemas.py rpkid.sql pubd.sql
-	${PYTHON} ${abs_top_srcdir}/buildtools/make-sql-schemas.py >$@.tmp
-	mv $@.tmp $@
-
-clean::
-	find . -type f -name '*.py[co]' -delete
 	cd tests; $(MAKE) $@
 
-install:: ${RPKID_INSTALL_TARGETS}
+install:: ${CA_INSTALL_TARGETS}
 
 install-always:: all
 	${PYTHON} setup.py install ${SETUP_PY_ROOT} ${SETUP_PY_INSTALL_LAYOUT} --record installed
@@ -171,7 +125,7 @@ distclean:: clean docclean
 
 all:: examples/rpki.conf
 
-examples/rpki.conf: rpki/autoconf.py rpki-confgen rpki-confgen.xml
+examples/rpki.conf: ${abs_top_srcdir}/rpki/autoconf.py rpki-confgen rpki-confgen.xml
 	${PYTHON} rpki-confgen \
 		--read-xml rpki-confgen.xml \
 		--autoconf \
@@ -185,41 +139,6 @@ examples/rpki.conf: rpki/autoconf.py rpki-confgen rpki-confgen.xml
 clean::
 	rm -f examples/rpki.conf
 
-rpki/autoconf.py: Makefile
-	@echo 'Generating $@';							\
-	(echo '# Automatically generated.  DO NOT EDIT.';			\
-	 echo ;									\
-	 echo 'bindir	      = "${bindir}"';					\
-	 echo 'datarootdir    = "${datarootdir}"';				\
-	 echo 'localstatedir  = "${localstatedir}"';				\
-	 echo 'sbindir	      = "${sbindir}"';					\
-	 echo 'sharedstatedir = "${sharedstatedir}"';				\
-	 echo 'sysconfdir     = "${sysconfdir}"';				\
-	 echo 'libexecdir     = "${libexecdir}"';				\
-	 echo ;									\
-	 echo 'WSGI_DAEMON_PROCESS	    = "${WSGI_DAEMON_PROCESS}"';	\
-	 echo 'WSGI_PROCESS_GROUP	    = "${WSGI_PROCESS_GROUP}"';		\
-	 echo 'RCYNIC_HTML_DIR		    = "${RCYNIC_HTML_DIR}"';		\
-	 echo 'APACHE_VERSION		    = "${APACHE_VERSION}"';		\
-	 echo 'WSGI_PYTHON_EGG_CACHE_DIR    = "${WSGI_PYTHON_EGG_CACHE_DIR}"';	\
-	 echo 'WSGI_PYTHON_EGG_CACHE_USER   = "${WSGI_PYTHON_EGG_CACHE_USER}"';	\
-	) > $@
-
-clean::
-	rm -f rpki/autoconf.py
-
-setup_autoconf.py: rpki/autoconf.py
-	@echo 'Generating $@';					\
-	(cat rpki/autoconf.py;					\
-	 echo ;							\
-	 echo 'CFLAGS         = """${CFLAGS}"""';               \
-	 echo 'LDFLAGS        = """${LDFLAGS}"""';              \
-	 echo 'LIBS           = """${LIBS}"""';                 \
-	) > $@
-
-clean::
-	rm -f setup_autoconf.py setup_autoconf.pyc
-
 install-postconf: \
 	install-user install-egg-cache install-conf install-apache install-mysql install-django install-bpki install-cron
 
diff --git a/ca/rpki b/ca/rpki
new file mode 120000
index 00000000..8d289d0b
--- /dev/null
+++ b/ca/rpki
@@ -0,0 +1 @@
+../rpki
\ No newline at end of file
diff --git a/configure b/configure
index 4a512935..711ec03d 100755
--- a/configure
+++ b/configure
@@ -582,7 +582,7 @@ PACKAGE_STRING='rpkitools 1.0'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
-ac_unique_file="rcynic/rcynic.c"
+ac_unique_file="rp/rcynic/rcynic.c"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
@@ -629,7 +629,7 @@ TOP_LEVEL_SUBDIRS
 WSGI_PYTHON_EGG_CACHE_USER
 WSGI_PYTHON_EGG_CACHE_DIR
 SETUP_PY_INSTALL_LAYOUT
-RPKID_INSTALL_TARGETS
+CA_INSTALL_TARGETS
 RTR_ORIGIN_INSTALL_TARGETS
 RCYNIC_INSTALL_TARGETS
 RCYNIC_HTML_DIR
@@ -714,7 +714,7 @@ PATH_SEPARATOR
 SHELL'
 ac_subst_files='RCYNIC_MAKE_RULES
 RTR_ORIGIN_MAKE_RULES
-RPKID_MAKE_RULES'
+CA_MAKE_RULES'
 ac_user_opts='
 enable_option_checking
 with_system_openssl
@@ -4571,28 +4571,28 @@ $as_echo "$enable_target_installation" >&6; }
 # rcynic jail setup is complicated enough that it's simplest to have
 # different rule sets for different platforms.  Icky, but....
 # rpki-rtr isn't as complicated, but has similar issues, same hack.
-# rpkid isn't as complicated either, but same hack.
+# ca isn't as complicated either, but same hack.
 
 case $host_os in
 	darwin*)
-		RCYNIC_MAKE_RULES='rcynic/rules.darwin.mk'
-		RTR_ORIGIN_MAKE_RULES='rtr-origin/rules.darwin.mk'
-		RPKID_MAKE_RULES='rpkid/rules.darwin.mk'
+		RCYNIC_MAKE_RULES='rp/rcynic/rules.darwin.mk'
+		RTR_ORIGIN_MAKE_RULES='rp/rtr-origin/rules.darwin.mk'
+		CA_MAKE_RULES='ca/rules.darwin.mk'
 		;;
 	freebsd*)
-		RCYNIC_MAKE_RULES='rcynic/rules.freebsd.mk'
-		RTR_ORIGIN_MAKE_RULES='rtr-origin/rules.freebsd.mk'
-		RPKID_MAKE_RULES='rpkid/rules.freebsd.mk'
+		RCYNIC_MAKE_RULES='rp/rcynic/rules.freebsd.mk'
+		RTR_ORIGIN_MAKE_RULES='rp/rtr-origin/rules.freebsd.mk'
+		CA_MAKE_RULES='ca/rules.freebsd.mk'
 		;;
 	linux*)
-		RCYNIC_MAKE_RULES='rcynic/rules.linux.mk'
-		RTR_ORIGIN_MAKE_RULES='rtr-origin/rules.linux.mk'
-		RPKID_MAKE_RULES='rpkid/rules.linux.mk'
+		RCYNIC_MAKE_RULES='rp/rcynic/rules.linux.mk'
+		RTR_ORIGIN_MAKE_RULES='rp/rtr-origin/rules.linux.mk'
+		CA_MAKE_RULES='ca/rules.linux.mk'
 		;;
 	*)
-		RCYNIC_MAKE_RULES='rcynic/rules.unknown.mk'
-		RTR_ORIGIN_MAKE_RULES='rtr-origin/rules.unknown.mk'
-		RPKID_MAKE_RULES='rpkid/rules.unknown.mk'
+		RCYNIC_MAKE_RULES='rp/rcynic/rules.unknown.mk'
+		RTR_ORIGIN_MAKE_RULES='rp/rtr-origin/rules.unknown.mk'
+		CA_MAKE_RULES='ca/rules.unknown.mk'
 		;;
 esac
 
@@ -4629,7 +4629,7 @@ esac
 
 RCYNIC_INSTALL_TARGETS='install-always'
 RTR_ORIGIN_INSTALL_TARGETS='install-always'
-RPKID_INSTALL_TARGETS='install-always'
+CA_INSTALL_TARGETS='install-always'
 
 if test $use_rcynic_jail = yes
 then
@@ -4640,7 +4640,7 @@ if test $enable_target_installation = yes
 then
 	RCYNIC_INSTALL_TARGETS="$RCYNIC_INSTALL_TARGETS install-postconf"
 	RTR_ORIGIN_INSTALL_TARGETS="$RTR_ORIGIN_INSTALL_TARGETS install-postconf"
-	RPKID_INSTALL_TARGETS="$RPKID_INSTALL_TARGETS install-postconf"
+	CA_INSTALL_TARGETS="$CA_INSTALL_TARGETS install-postconf"
 fi
 
 
@@ -4992,20 +4992,14 @@ fi
 
 			      TOP_LEVEL_SUBDIRS="h"
 test $build_openssl  = yes && TOP_LEVEL_SUBDIRS="$TOP_LEVEL_SUBDIRS openssl"
-test $build_rp_tools = yes && TOP_LEVEL_SUBDIRS="$TOP_LEVEL_SUBDIRS rcynic utils rtr-origin"
-test $build_ca_tools = yes && TOP_LEVEL_SUBDIRS="$TOP_LEVEL_SUBDIRS rpkid"
+test $build_rp_tools = yes && TOP_LEVEL_SUBDIRS="$TOP_LEVEL_SUBDIRS rp"
+test $build_ca_tools = yes && TOP_LEVEL_SUBDIRS="$TOP_LEVEL_SUBDIRS ca"
 
 
 
-ac_config_files="$ac_config_files Makefile h/Makefile"
+ac_config_files="$ac_config_files Makefile h/Makefile schemas/Makefile"
 
 
-if test "X$RCYNIC_STATIC_RSYNC" != "X"
-then
-	ac_config_files="$ac_config_files rcynic/static-rsync/Makefile"
-
-fi
-
 # OpenSSL has its own build system that bears no relationship to
 # anything but itself, and our use of it is a bit weird, so this is a
 # BFMI (Brute Force and Massive Ignorance) job.
@@ -5062,13 +5056,13 @@ fi
 
 if test $build_rp_tools = yes
 then
-	ac_config_files="$ac_config_files rcynic/Makefile utils/Makefile utils/find_roa/Makefile utils/hashdir/Makefile utils/print_rpki_manifest/Makefile utils/print_roa/Makefile utils/scan_roas/Makefile utils/scan_routercerts/Makefile utils/uri/Makefile rtr-origin/Makefile"
+	ac_config_files="$ac_config_files rp/Makefile rp/rcynic/Makefile rp/rcynic/static-rsync/Makefile rp/utils/Makefile rp/rtr-origin/Makefile"
 
 fi
 
 if test $build_ca_tools = yes
 then
-	ac_config_files="$ac_config_files rpkid/Makefile rpkid/tests/Makefile"
+	ac_config_files="$ac_config_files ca/Makefile ca/tests/Makefile"
 
 fi
 
@@ -5809,21 +5803,16 @@ do
   case $ac_config_target in
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "h/Makefile") CONFIG_FILES="$CONFIG_FILES h/Makefile" ;;
-    "rcynic/static-rsync/Makefile") CONFIG_FILES="$CONFIG_FILES rcynic/static-rsync/Makefile" ;;
+    "schemas/Makefile") CONFIG_FILES="$CONFIG_FILES schemas/Makefile" ;;
     "openssl/Makefile") CONFIG_FILES="$CONFIG_FILES openssl/Makefile" ;;
     "openssl/tests/Makefile") CONFIG_FILES="$CONFIG_FILES openssl/tests/Makefile" ;;
-    "rcynic/Makefile") CONFIG_FILES="$CONFIG_FILES rcynic/Makefile" ;;
-    "utils/Makefile") CONFIG_FILES="$CONFIG_FILES utils/Makefile" ;;
-    "utils/find_roa/Makefile") CONFIG_FILES="$CONFIG_FILES utils/find_roa/Makefile" ;;
-    "utils/hashdir/Makefile") CONFIG_FILES="$CONFIG_FILES utils/hashdir/Makefile" ;;
-    "utils/print_rpki_manifest/Makefile") CONFIG_FILES="$CONFIG_FILES utils/print_rpki_manifest/Makefile" ;;
-    "utils/print_roa/Makefile") CONFIG_FILES="$CONFIG_FILES utils/print_roa/Makefile" ;;
-    "utils/scan_roas/Makefile") CONFIG_FILES="$CONFIG_FILES utils/scan_roas/Makefile" ;;
-    "utils/scan_routercerts/Makefile") CONFIG_FILES="$CONFIG_FILES utils/scan_routercerts/Makefile" ;;
-    "utils/uri/Makefile") CONFIG_FILES="$CONFIG_FILES utils/uri/Makefile" ;;
-    "rtr-origin/Makefile") CONFIG_FILES="$CONFIG_FILES rtr-origin/Makefile" ;;
-    "rpkid/Makefile") CONFIG_FILES="$CONFIG_FILES rpkid/Makefile" ;;
-    "rpkid/tests/Makefile") CONFIG_FILES="$CONFIG_FILES rpkid/tests/Makefile" ;;
+    "rp/Makefile") CONFIG_FILES="$CONFIG_FILES rp/Makefile" ;;
+    "rp/rcynic/Makefile") CONFIG_FILES="$CONFIG_FILES rp/rcynic/Makefile" ;;
+    "rp/rcynic/static-rsync/Makefile") CONFIG_FILES="$CONFIG_FILES rp/rcynic/static-rsync/Makefile" ;;
+    "rp/utils/Makefile") CONFIG_FILES="$CONFIG_FILES rp/utils/Makefile" ;;
+    "rp/rtr-origin/Makefile") CONFIG_FILES="$CONFIG_FILES rp/rtr-origin/Makefile" ;;
+    "ca/Makefile") CONFIG_FILES="$CONFIG_FILES ca/Makefile" ;;
+    "ca/tests/Makefile") CONFIG_FILES="$CONFIG_FILES ca/tests/Makefile" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
diff --git a/configure.ac b/configure.ac
index 4f4aa244..65368e06 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ AC_INIT([rpkitools], [1.0])
 
 dnl AC_REVISION([$Revision$])
 
-AC_CONFIG_SRCDIR([rcynic/rcynic.c])
+AC_CONFIG_SRCDIR([rp/rcynic/rcynic.c])
 AC_CONFIG_AUX_DIR([buildtools])
 
 # I'm not sure we should really be using the $host_* variables as we
@@ -383,34 +383,34 @@ AC_MSG_RESULT([$enable_target_installation])
 # rcynic jail setup is complicated enough that it's simplest to have
 # different rule sets for different platforms.  Icky, but....
 # rpki-rtr isn't as complicated, but has similar issues, same hack.
-# rpkid isn't as complicated either, but same hack.
+# ca isn't as complicated either, but same hack.
 
 case $host_os in
 	darwin*)
-		RCYNIC_MAKE_RULES='rcynic/rules.darwin.mk'
-		RTR_ORIGIN_MAKE_RULES='rtr-origin/rules.darwin.mk'
-		RPKID_MAKE_RULES='rpkid/rules.darwin.mk'
+		RCYNIC_MAKE_RULES='rp/rcynic/rules.darwin.mk'
+		RTR_ORIGIN_MAKE_RULES='rp/rtr-origin/rules.darwin.mk'
+		CA_MAKE_RULES='ca/rules.darwin.mk'
 		;;
 	freebsd*)
-		RCYNIC_MAKE_RULES='rcynic/rules.freebsd.mk'
-		RTR_ORIGIN_MAKE_RULES='rtr-origin/rules.freebsd.mk'
-		RPKID_MAKE_RULES='rpkid/rules.freebsd.mk'
+		RCYNIC_MAKE_RULES='rp/rcynic/rules.freebsd.mk'
+		RTR_ORIGIN_MAKE_RULES='rp/rtr-origin/rules.freebsd.mk'
+		CA_MAKE_RULES='ca/rules.freebsd.mk'
 		;;
 	linux*)
-		RCYNIC_MAKE_RULES='rcynic/rules.linux.mk'
-		RTR_ORIGIN_MAKE_RULES='rtr-origin/rules.linux.mk'
-		RPKID_MAKE_RULES='rpkid/rules.linux.mk'
+		RCYNIC_MAKE_RULES='rp/rcynic/rules.linux.mk'
+		RTR_ORIGIN_MAKE_RULES='rp/rtr-origin/rules.linux.mk'
+		CA_MAKE_RULES='ca/rules.linux.mk'
 		;;
 	*)
-		RCYNIC_MAKE_RULES='rcynic/rules.unknown.mk'
-		RTR_ORIGIN_MAKE_RULES='rtr-origin/rules.unknown.mk'
-		RPKID_MAKE_RULES='rpkid/rules.unknown.mk'
+		RCYNIC_MAKE_RULES='rp/rcynic/rules.unknown.mk'
+		RTR_ORIGIN_MAKE_RULES='rp/rtr-origin/rules.unknown.mk'
+		CA_MAKE_RULES='ca/rules.unknown.mk'
 		;;
 esac
 
 AC_SUBST_FILE(RCYNIC_MAKE_RULES)
 AC_SUBST_FILE(RTR_ORIGIN_MAKE_RULES)
-AC_SUBST_FILE(RPKID_MAKE_RULES)
+AC_SUBST_FILE(CA_MAKE_RULES)
 
 # Where to put HTML files is similarly platform dependent, we have to know.
 # rcynic-cron will skip generating HTML files if it has no place to put them.
@@ -441,7 +441,7 @@ AC_SUBST(RCYNIC_HTML_DIR)
 
 RCYNIC_INSTALL_TARGETS='install-always'
 RTR_ORIGIN_INSTALL_TARGETS='install-always'
-RPKID_INSTALL_TARGETS='install-always'
+CA_INSTALL_TARGETS='install-always'
 
 if test $use_rcynic_jail = yes
 then
@@ -452,12 +452,12 @@ if test $enable_target_installation = yes
 then
 	RCYNIC_INSTALL_TARGETS="$RCYNIC_INSTALL_TARGETS install-postconf"
 	RTR_ORIGIN_INSTALL_TARGETS="$RTR_ORIGIN_INSTALL_TARGETS install-postconf"
-	RPKID_INSTALL_TARGETS="$RPKID_INSTALL_TARGETS install-postconf"
+	CA_INSTALL_TARGETS="$CA_INSTALL_TARGETS install-postconf"
 fi
 
 AC_SUBST(RCYNIC_INSTALL_TARGETS)
 AC_SUBST(RTR_ORIGIN_INSTALL_TARGETS)
-AC_SUBST(RPKID_INSTALL_TARGETS)
+AC_SUBST(CA_INSTALL_TARGETS)
 
 # Now a bunch of checks to figure out what we can do with Python.  If
 # we don't have Python at all, none of the rest of this matters.  If
@@ -754,18 +754,14 @@ fi
 
 			      TOP_LEVEL_SUBDIRS="h"
 test $build_openssl  = yes && TOP_LEVEL_SUBDIRS="$TOP_LEVEL_SUBDIRS openssl"
-test $build_rp_tools = yes && TOP_LEVEL_SUBDIRS="$TOP_LEVEL_SUBDIRS rcynic utils rtr-origin"
-test $build_ca_tools = yes && TOP_LEVEL_SUBDIRS="$TOP_LEVEL_SUBDIRS rpkid"
+test $build_rp_tools = yes && TOP_LEVEL_SUBDIRS="$TOP_LEVEL_SUBDIRS rp"
+test $build_ca_tools = yes && TOP_LEVEL_SUBDIRS="$TOP_LEVEL_SUBDIRS ca"
 
 AC_SUBST(TOP_LEVEL_SUBDIRS)
 
 AC_CONFIG_FILES([Makefile
-		 h/Makefile])
-
-if test "X$RCYNIC_STATIC_RSYNC" != "X"
-then
-	AC_CONFIG_FILES([rcynic/static-rsync/Makefile])
-fi
+		 h/Makefile
+		 schemas/Makefile])
 
 # OpenSSL has its own build system that bears no relationship to
 # anything but itself, and our use of it is a bit weird, so this is a
@@ -818,22 +814,17 @@ fi
 
 if test $build_rp_tools = yes
 then
-	AC_CONFIG_FILES([rcynic/Makefile
-			 utils/Makefile
-			 utils/find_roa/Makefile
-			 utils/hashdir/Makefile
-			 utils/print_rpki_manifest/Makefile
-			 utils/print_roa/Makefile
-			 utils/scan_roas/Makefile
-			 utils/scan_routercerts/Makefile
-			 utils/uri/Makefile
-			 rtr-origin/Makefile])
+	AC_CONFIG_FILES([rp/Makefile
+			 rp/rcynic/Makefile
+			 rp/rcynic/static-rsync/Makefile
+			 rp/utils/Makefile
+			 rp/rtr-origin/Makefile])
 fi
 
 if test $build_ca_tools = yes
 then
-	AC_CONFIG_FILES([rpkid/Makefile
-			 rpkid/tests/Makefile])
+	AC_CONFIG_FILES([ca/Makefile
+			 ca/tests/Makefile])
 fi
 
 if test $build_ca_tools = yes &&
diff --git a/potpourri/rpki b/potpourri/rpki
index 168548eb..8d289d0b 120000
--- a/potpourri/rpki
+++ b/potpourri/rpki
@@ -1 +1 @@
-../rpkid/rpki
\ No newline at end of file
+../rpki
\ No newline at end of file
diff --git a/rp/Makefile.in b/rp/Makefile.in
new file mode 100644
index 00000000..ceeef9f1
--- /dev/null
+++ b/rp/Makefile.in
@@ -0,0 +1,9 @@
+# $Id$
+
+SUBDIRS = rcynic rtr-origin utils
+
+all clean test distclean install deinstall uninstall::
+	@for i in ${SUBDIRS}; do echo "Making $@ in $$i"; (cd $$i && ${MAKE} $@); done
+
+distclean::
+	rm -f Makefile
diff --git a/rp/rcynic/Makefile.in b/rp/rcynic/Makefile.in
index 06f7d9cd..972f1de6 100644
--- a/rp/rcynic/Makefile.in
+++ b/rp/rcynic/Makefile.in
@@ -65,11 +65,11 @@ RPKIRTR_USER		= rpkirtr
 
 SCRIPTS = rcynic-text rcynic-html rcynic-svn validation_status rcynic-cron
 
-all: ${BIN} ${SCRIPTS} ${RCYNIC_STATIC_RSYNC}
+all: ${BIN} ${RCYNIC_STATIC_RSYNC}
 
 clean:
 	if test -r static-rsync/Makefile; then cd static-rsync; ${MAKE} $@; fi
-	rm -f ${BIN} ${OBJS} ${SCRIPTS}
+	rm -f ${BIN} ${OBJS}
 
 ${OBJ}: ${SRC} ${GEN}
 
@@ -80,39 +80,6 @@ ${GEN}: ${SRC}
 	${PYTHON} ${abs_top_srcdir}/buildtools/defstack.py ${SRC} >$@.tmp
 	mv $@.tmp $@
 
-COMPILE_PYTHON = \
-	AC_PYTHON_INTERPRETER='${PYTHON}' \
-	AC_RRDTOOL_BINARY='${RRDTOOL}' \
-	${PYTHON} ${abs_top_srcdir}/buildtools/make-rcynic-script.py <$? >$@; \
-	chmod 755 $@
-
-COMPILE_PYTHON_CRON = \
-	AC_PYTHON_INTERPRETER='${PYTHON}' \
-	AC_RCYNIC_USER='${RCYNIC_USER}' \
-	AC_RCYNIC_DIR='${RCYNIC_DIR}' \
-	AC_bindir='${bindir}' \
-	AC_sbindir='${sbindir}' \
-	AC_sysconfdir='${sysconfdir}' \
-	AC_libexecdir='${libexecdir}' \
-	AC_RCYNIC_HTML_DIR='${RCYNIC_HTML_DIR}' \
-	${PYTHON} ${abs_top_srcdir}/buildtools/make-rcynic-script.py <$? >$@; \
-	chmod 755 $@
-
-rcynic-text: rcynic-text.py
-	${COMPILE_PYTHON}
-
-rcynic-html: rcynic-html.py
-	${COMPILE_PYTHON}
-
-rcynic-svn: rcynic-svn.py
-	${COMPILE_PYTHON}
-
-validation_status: validation_status.py
-	${COMPILE_PYTHON}
-
-rcynic-cron: rcynic-cron.py
-	${COMPILE_PYTHON_CRON}
-
 tags: TAGS
 
 TAGS: ${SRC} ${GEN}
diff --git a/rp/rcynic/rcynic-cron b/rp/rcynic/rcynic-cron
index fbe1ebeb..4da1d5cd 100755
--- a/rp/rcynic/rcynic-cron
+++ b/rp/rcynic/rcynic-cron
@@ -37,13 +37,13 @@ def run(*cmd, **kwargs):
   pid = os.fork()
   if pid == 0:
     if chroot_this:
-      os.chdir(ac_rcynic_dir)
+      os.chdir(rpki.autoconf.rcynic_dir)
     elif cwd is not None:
       os.chdir(cwd)
     if we_are_root:
       os.initgroups(pw.pw_name, pw.pw_gid)
     if chroot_this:
-      os.chroot(ac_rcynic_dir)
+      os.chroot(rpki.autoconf.rcynic_dir)
     if we_are_root:
       os.setgid(pw.pw_gid)
       os.setuid(pw.pw_uid)
@@ -71,12 +71,12 @@ if args.chroot and not we_are_root:
   sys.exit("Only root can --chroot")
 
 try:
-  pw = pwd.getpwnam(ac_rcynic_user)
+  pw = pwd.getpwnam(rpki.autoconf.rcynic_user)
 except KeyError:
-  sys.exit("Could not find passwd entry for user %s" % ac_rcynic_user)
+  sys.exit("Could not find passwd entry for user %s" % rpki.autoconf.rcynic_user)
 
 try:
-  lock = os.open(os.path.join(ac_rcynic_dir, "data/lock"), os.O_RDONLY | os.O_CREAT | os.O_NONBLOCK, 0666)
+  lock = os.open(os.path.join(rpki.autoconf.rcynic_dir, "data/lock"), os.O_RDONLY | os.O_CREAT | os.O_NONBLOCK, 0666)
   fcntl.flock(lock, fcntl.LOCK_EX | fcntl.LOCK_NB)
   if we_are_root:
     os.fchown(lock, pw.pw_uid, pw.pw_gid)
@@ -84,23 +84,23 @@ except (IOError, OSError), e:
   if e.errno == errno.EAGAIN:
     sys.exit(0)                         # Another instance of this script is already running, exit silently
   else:
-    sys.exit("Error %r opening lock %r" % (e.strerror, os.path.join(ac_rcynic_dir, "data/lock")))
+    sys.exit("Error %r opening lock %r" % (e.strerror, os.path.join(rpki.autoconf.rcynic_dir, "data/lock")))
 
 if args.chroot:
   run("/bin/rcynic", "-c", "/etc/rcynic.conf", chroot_this = True)
 else:
-  run(os.path.join(ac_bindir, "rcynic"), "-c", os.path.join(ac_sysconfdir, "rcynic.conf"))
+  run(os.path.join(rpki.autoconf.bindir, "rcynic"), "-c", os.path.join(rpki.autoconf.sysconfdir, "rcynic.conf"))
 
-run(os.path.join(ac_bindir, "rtr-origin"),
+run(os.path.join(rpki.autoconf.bindir, "rtr-origin"),
     "--cronjob", 
-    os.path.join(ac_rcynic_dir, "data/authenticated"),
-    cwd = os.path.join(ac_rcynic_dir, "rpki-rtr"))
+    os.path.join(rpki.autoconf.rcynic_dir, "data/authenticated"),
+    cwd = os.path.join(rpki.autoconf.rcynic_dir, "rpki-rtr"))
 
-prog = os.path.join(ac_libexecdir, "rpkigui-rcynic")
+prog = os.path.join(rpki.autoconf.libexecdir, "rpkigui-rcynic")
 if os.path.exists(prog):
   run(prog)
 
-if ac_rcynic_html_dir and os.path.exists(os.path.dirname(ac_rcynic_html_dir)):
-  run(os.path.join(ac_bindir, "rcynic-html"),
-      os.path.join(ac_rcynic_dir, "data/rcynic.xml"),
-      ac_rcynic_html_dir)
+if rpki.autoconf.rcynic_html_dir and os.path.exists(os.path.dirname(rpki.autoconf.rcynic_html_dir)):
+  run(os.path.join(rpki.autoconf.bindir, "rcynic-html"),
+      os.path.join(rpki.autoconf.rcynic_dir, "data/rcynic.xml"),
+      rpki.autoconf.rcynic_html_dir)
diff --git a/rp/rcynic/rcynic-html b/rp/rcynic/rcynic-html
index 58e65dde..6070cd13 100755
--- a/rp/rcynic/rcynic-html
+++ b/rp/rcynic/rcynic-html
@@ -41,7 +41,7 @@ def parse_options():
   global args
 
   try:
-    default_rrdtool_binary = ac_rrdtool_binary
+    default_rrdtool_binary = rpki.autoconf.rrdtool_binary
   except NameError:
     default_rrdtool_binary = "rrdtool"
 
diff --git a/rp/rtr-origin/Makefile.in b/rp/rtr-origin/Makefile.in
index daa18009..e587305b 100644
--- a/rp/rtr-origin/Makefile.in
+++ b/rp/rtr-origin/Makefile.in
@@ -1,8 +1,6 @@
 # $Id$
 
-BASE		= rtr-origin
-SRC		= ${BASE}.py
-BIN		= ${BASE}
+BIN		= rtr-origin
 
 INSTALL		= @INSTALL@
 PYTHON		= @PYTHON@
@@ -30,10 +28,8 @@ RPKI_RTR_PORT	= 43779
 SCAN_ROAS	= ${bindir}/scan_roas
 
 
-all: ${BIN}
-
-clean:
-	rm -f ${BIN}
+all clean test::
+	@true
 
 install: all ${RTR_ORIGIN_INSTALL_TARGETS}
 
@@ -48,14 +44,6 @@ distclean: clean
 	rm -rf current sockets *.ax *.ix.*
 	rm -f Makefile
 
-${BIN} : ${SRC}
-	AC_PYTHON_INTERPRETER='${PYTHON}' AC_SCAN_ROAS='${SCAN_ROAS}' \
-	${PYTHON} ${abs_top_srcdir}/buildtools/make-rcynic-script.py <${SRC} >$@
-	chmod a+x $@
-
-test:
-	@true
-
 .FORCE:
 
 # Platform-specific rules below here.
diff --git a/rp/rtr-origin/rtr-origin b/rp/rtr-origin/rtr-origin
index f37d2ce0..e1e82ccf 100755
--- a/rp/rtr-origin/rtr-origin
+++ b/rp/rtr-origin/rtr-origin
@@ -2163,7 +2163,7 @@ def bgpdump_server_main(argv):
 # Figure out where the scan_roas utility program is today
 try:
   # Set from autoconf
-  scan_roas = ac_scan_roas
+  scan_roas = rpki.autoconf.scan_roas
 except NameError:
   # Source directory
   scan_roas = os.path.normpath(os.path.join(sys.path[0], "..", "utils",
@@ -2175,7 +2175,7 @@ if not os.path.exists(scan_roas):
 # Same thing for scan_routercerts
 try:
   # Set from autoconf
-  scan_routercerts = ac_scan_routercerts
+  scan_routercerts = rpki.autoconf.scan_routercerts
 except NameError:
   # Source directory
   scan_routercerts = os.path.normpath(os.path.join(sys.path[0], "..", "utils",
diff --git a/rp/utils/Makefile.in b/rp/utils/Makefile.in
index c89fdff5..03c041a4 100644
--- a/rp/utils/Makefile.in
+++ b/rp/utils/Makefile.in
@@ -1,9 +1,62 @@
 # $Id$
 
-SUBDIRS = uri print_rpki_manifest print_roa hashdir find_roa scan_roas scan_routercerts
+CFLAGS		= @CFLAGS@
+LDFLAGS		= @LDFLAGS@
+LIBS		= @LIBS@
 
-all clean test distclean install deinstall uninstall::
-	@for i in ${SUBDIRS}; do echo "Making $@ in $$i"; (cd $$i && ${MAKE} $@); done
+INSTALL		= @INSTALL@ -m 555 
 
-distclean::
+prefix		= @prefix@
+exec_prefix	= @exec_prefix@
+datarootdir	= @datarootdir@
+datadir		= @datadir@
+localstatedir	= @localstatedir@
+sharedstatedir	= @sharedstatedir@
+sysconfdir	= @sysconfdir@
+bindir		= @bindir@
+sbindir		= @sbindir@
+libexecdir	= @libexecdir@
+libdir		= @libdir@
+
+abs_top_srcdir	 = @abs_top_srcdir@
+abs_top_builddir = @abs_top_builddir@
+
+BINS		= find_roa hashdir print_rpki_manifest print_roa scan_roas uri
+
+SCRIPTS		= scan_routercerts
+
+all: ${BINS}
+
+clean:
+	rm -rf ${BINS} *.o *.dSYM
+
+test:
+	@true
+
+install: all
+	if test -d ${DESTDIR}${bindir} ; then :; else ${INSTALL} -d ${DESTDIR}${bindir}; fi
+	${INSTALL} ${BINS} ${SCRIPTS} ${DESTDIR}${bindir}
+
+deinstall uninstall:
+	for i in ${BINS} ${SCRIPTS}; do rm -f ${DESTDIR}${bindir}/$$i; done
+
+distclean: clean
 	rm -f Makefile
+
+find_roa: find_roa.c
+	${CC} ${CFLAGS} -o $@ find_roa.c ${LDFLAGS} ${LIBS}
+
+hashdir: hashdir.c
+	${CC} ${CFLAGS} -o $@ hashdir.c ${LDFLAGS} ${LIBS}
+
+print_roa: print_roa.c
+	${CC} ${CFLAGS} -o $@ print_roa.c ${LDFLAGS} ${LIBS}
+
+print_rpki_manifest: print_rpki_manifest.c
+	${CC} ${CFLAGS} -o $@ print_rpki_manifest.c ${LDFLAGS} ${LIBS}
+
+scan_roas: scan_roas.c
+	${CC} ${CFLAGS} -o $@ scan_roas.c ${LDFLAGS} ${LIBS}
+
+uri: uri.c
+	${CC} ${CFLAGS} -o $@ uri.c ${LDFLAGS} ${LIBS}
diff --git a/rp/utils/find_roa/Makefile.in b/rp/utils/find_roa/Makefile.in
deleted file mode 100644
index 36c68e01..00000000
--- a/rp/utils/find_roa/Makefile.in
+++ /dev/null
@@ -1,56 +0,0 @@
-# $Id$
-
-NAME = find_roa
-
-BIN = ${NAME}
-SRC = ${NAME}.c
-OBJ = ${NAME}.o
-
-CFLAGS = @CFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-
-INSTALL		= @INSTALL@ -m 555 
-
-prefix		= @prefix@
-exec_prefix	= @exec_prefix@
-datarootdir	= @datarootdir@
-datadir		= @datadir@
-localstatedir	= @localstatedir@
-sharedstatedir	= @sharedstatedir@
-sysconfdir	= @sysconfdir@
-bindir		= @bindir@
-sbindir		= @sbindir@
-libexecdir	= @libexecdir@
-libdir		= @libdir@
-
-abs_top_srcdir	 = @abs_top_srcdir@
-abs_top_builddir = @abs_top_builddir@
-
-all: ${BIN}
-
-clean:
-	rm -rf ${BIN} ${OBJ} ${BIN}.dSYM
-
-${BIN}: ${SRC}
-	${CC} ${CFLAGS} -o $@ ${SRC} ${LDFLAGS} ${LIBS}
-
-
-ROA_DIR = ${abs_top_builddir}/rcynic/rcynic-data/authenticated
-
-TEST_ARGS = ${ROA_DIR} 10.3.0.44 10.2.0.6 10.0.0.0/24
-
-test: ${BIN}
-#	if test -d ${ROA_DIR}; then ./${BIN} ${TEST_ARGS} ; else :; fi
-	if test -d ${ROA_DIR}; then sh ./test_roa.sh ${TEST_ARGS} ; else :; fi
-
-install: all
-	if test -d ${DESTDIR}${bindir} ; then :; else ${INSTALL} -d ${DESTDIR}${bindir}; fi
-	${INSTALL} ${BIN} ${DESTDIR}${bindir}
-
-deinstall uninstall:
-	rm -f ${DESTDIR}${bindir}/${BIN}
-
-distclean: clean
-	rm -rf hashed-pem-dir
-	rm -f Makefile
diff --git a/rp/utils/hashdir/Makefile.in b/rp/utils/hashdir/Makefile.in
deleted file mode 100644
index c0cf448a..00000000
--- a/rp/utils/hashdir/Makefile.in
+++ /dev/null
@@ -1,55 +0,0 @@
-# $Id$
-
-NAME = hashdir
-
-BIN = ${NAME}
-SRC = ${NAME}.c
-OBJ = ${NAME}.o
-
-CFLAGS = @CFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-
-INSTALL		= @INSTALL@ -m 555 
-
-prefix		= @prefix@
-exec_prefix	= @exec_prefix@
-datarootdir	= @datarootdir@
-datadir		= @datadir@
-localstatedir	= @localstatedir@
-sharedstatedir	= @sharedstatedir@
-sysconfdir	= @sysconfdir@
-bindir		= @bindir@
-sbindir		= @sbindir@
-libexecdir	= @libexecdir@
-libdir		= @libdir@
-
-abs_top_srcdir	 = @abs_top_srcdir@
-abs_top_builddir = @abs_top_builddir@
-
-all: ${BIN}
-
-clean::
-	rm -rf ${BIN} ${OBJ} ${BIN}.dSYM
-
-${BIN}: ${SRC}
-	${CC} ${CFLAGS} -o $@ ${SRC} ${LDFLAGS} ${LIBS}
-
-INPUT  = ${abs_top_builddir}/rcynic/rcynic-data/authenticated
-OUTPUT = hashed-pem-dir
-
-test: ${BIN}
-	if test -d ${INPUT}; then rm -rf ${OUTPUT} && mkdir ${OUTPUT} && ./hashdir ${INPUT} ${OUTPUT}; else :; fi
-
-clean::
-	rm -rf ${OUTPUT}
-
-install: all
-	if test -d ${DESTDIR}${bindir} ; then :; else ${INSTALL} -d ${DESTDIR}${bindir}; fi
-	${INSTALL} ${BIN} ${DESTDIR}${bindir}
-
-deinstall uninstall:
-	rm -f ${DESTDIR}${bindir}/${BIN}
-
-distclean: clean
-	rm -f Makefile
diff --git a/rp/utils/print_roa/Makefile.in b/rp/utils/print_roa/Makefile.in
deleted file mode 100644
index 5999b351..00000000
--- a/rp/utils/print_roa/Makefile.in
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id$
-
-NAME = print_roa
-
-BIN = ${NAME}
-SRC = ${NAME}.c
-OBJ = ${NAME}.o
-
-CFLAGS = @CFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-
-INSTALL		= @INSTALL@ -m 555 
-
-prefix		= @prefix@
-exec_prefix	= @exec_prefix@
-datarootdir	= @datarootdir@
-datadir		= @datadir@
-localstatedir	= @localstatedir@
-sharedstatedir	= @sharedstatedir@
-sysconfdir	= @sysconfdir@
-bindir		= @bindir@
-sbindir		= @sbindir@
-libexecdir	= @libexecdir@
-libdir		= @libdir@
-
-abs_top_srcdir	 = @abs_top_srcdir@
-abs_top_builddir = @abs_top_builddir@
-
-all: ${BIN}
-
-clean:
-	rm -rf ${BIN} ${OBJ} ${BIN}.dSYM
-
-${BIN}: ${SRC}
-	${CC} ${CFLAGS} -o $@ ${SRC} ${LDFLAGS} ${LIBS}
-
-ROA_DIR = ${abs_top_builddir}/rpkid/tests/smoketest.dir/publication
-
-test: all
-	-date -u +'now:            %Y%m%d%H%M%SZ'
-	if test -d ${ROA_DIR}; then find ${ROA_DIR} -type f -name '*.roa' -print -exec ./${BIN} {} \; ; else :; fi
-
-install: all
-	if test -d ${DESTDIR}${bindir} ; then :; else ${INSTALL} -d ${DESTDIR}${bindir}; fi
-	${INSTALL} ${BIN} ${DESTDIR}${bindir}
-
-deinstall uninstall:
-	rm -f ${DESTDIR}${bindir}/${BIN}
-
-distclean: clean
-	rm -f Makefile
diff --git a/rp/utils/print_rpki_manifest/Makefile.in b/rp/utils/print_rpki_manifest/Makefile.in
deleted file mode 100644
index 22f1b16b..00000000
--- a/rp/utils/print_rpki_manifest/Makefile.in
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id$
-
-NAME = print_rpki_manifest
-
-BIN = ${NAME}
-SRC = ${NAME}.c
-OBJ = ${NAME}.o
-
-CFLAGS = @CFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-
-INSTALL		= @INSTALL@ -m 555 
-
-prefix		= @prefix@
-exec_prefix	= @exec_prefix@
-datarootdir	= @datarootdir@
-datadir		= @datadir@
-localstatedir	= @localstatedir@
-sharedstatedir	= @sharedstatedir@
-sysconfdir	= @sysconfdir@
-bindir		= @bindir@
-sbindir		= @sbindir@
-libexecdir	= @libexecdir@
-libdir		= @libdir@
-
-abs_top_srcdir	 = @abs_top_srcdir@
-abs_top_builddir = @abs_top_builddir@
-
-all: ${BIN}
-
-clean:
-	rm -rf ${BIN} ${OBJ} ${BIN}.dSYM
-
-${BIN}: ${SRC}
-	${CC} ${CFLAGS} -o $@ ${SRC} ${LDFLAGS} ${LIBS}
-
-MANIFEST_DIR = ${abs_top_builddir}/rpkid/tests/smoketest.dir/publication
-
-test: all
-	-date -u +'now:            %Y%m%d%H%M%SZ'
-	if test -d ${MANIFEST_DIR}; then find ${MANIFEST_DIR} -type f -name '*.mnf' -print -exec ./${BIN} {} \; ; else :; fi
-
-install: all
-	if test -d ${DESTDIR}${bindir} ; then :; else ${INSTALL} -d ${DESTDIR}${bindir}; fi
-	${INSTALL} ${BIN} ${DESTDIR}${bindir}
-
-deinstall uninstall:
-	rm -f ${DESTDIR}${bindir}/${BIN}
-
-distclean: clean
-	rm -f Makefile
diff --git a/rp/utils/scan_roas/Makefile.in b/rp/utils/scan_roas/Makefile.in
deleted file mode 100644
index 7707969c..00000000
--- a/rp/utils/scan_roas/Makefile.in
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id$
-
-NAME = scan_roas
-
-BIN = ${NAME}
-SRC = ${NAME}.c
-OBJ = ${NAME}.o
-
-CFLAGS = @CFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-
-INSTALL		= @INSTALL@ -m 555 
-
-prefix		= @prefix@
-exec_prefix	= @exec_prefix@
-datarootdir	= @datarootdir@
-datadir		= @datadir@
-localstatedir	= @localstatedir@
-sharedstatedir	= @sharedstatedir@
-sysconfdir	= @sysconfdir@
-bindir		= @bindir@
-sbindir		= @sbindir@
-libexecdir	= @libexecdir@
-libdir		= @libdir@
-
-abs_top_srcdir	 = @abs_top_srcdir@
-abs_top_builddir = @abs_top_builddir@
-
-all: ${BIN}
-
-clean:
-	rm -rf ${BIN} ${OBJ} ${BIN}.dSYM
-
-${BIN}: ${SRC}
-	${CC} ${CFLAGS} -o $@ ${SRC} ${LDFLAGS} ${LIBS}
-
-ROA_DIR = ${abs_top_builddir}/rpkid/tests/smoketest.dir/publication
-
-test: all
-	-date -u +'now:            %Y%m%d%H%M%SZ'
-	if test -d ${ROA_DIR}; then  ./${BIN} ${ROA_DIR} ; else :; fi
-
-install: all
-	if test -d ${DESTDIR}${bindir} ; then :; else ${INSTALL} -d ${DESTDIR}${bindir}; fi
-	${INSTALL} ${BIN} ${DESTDIR}${bindir}
-
-deinstall uninstall:
-	rm -f ${DESTDIR}${bindir}/${BIN}
-
-distclean: clean
-	rm -f Makefile
diff --git a/rp/utils/scan_routercerts/Makefile.in b/rp/utils/scan_routercerts/Makefile.in
deleted file mode 100644
index 715d1325..00000000
--- a/rp/utils/scan_routercerts/Makefile.in
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id$
-
-NAME = scan_routercerts
-
-BIN = ${NAME}
-
-INSTALL		= @INSTALL@ -m 555 
-
-prefix		= @prefix@
-exec_prefix	= @exec_prefix@
-datarootdir	= @datarootdir@
-datadir		= @datadir@
-localstatedir	= @localstatedir@
-sharedstatedir	= @sharedstatedir@
-sysconfdir	= @sysconfdir@
-bindir		= @bindir@
-sbindir		= @sbindir@
-libexecdir	= @libexecdir@
-libdir		= @libdir@
-
-abs_top_srcdir	 = @abs_top_srcdir@
-abs_top_builddir = @abs_top_builddir@
-
-all clean:
-	@true
-
-ROUTERCERT_DIR = ${abs_top_builddir}/rpkid/tests/smoketest.dir/publication
-
-test: all
-	-date -u +'now:            %Y%m%d%H%M%SZ'
-	if test -d ${ROUTERCERT_DIR}; then ./${BIN} ; else :; fi
-
-install: all
-	if test -d ${DESTDIR}${bindir} ; then :; else ${INSTALL} -d ${DESTDIR}${bindir}; fi
-	${INSTALL} ${BIN} ${DESTDIR}${bindir}
-
-deinstall uninstall:
-	rm -f ${DESTDIR}${bindir}/${BIN}
-
-distclean: clean
-	rm -f Makefile
diff --git a/rp/utils/uri/Makefile.in b/rp/utils/uri/Makefile.in
deleted file mode 100644
index fc545060..00000000
--- a/rp/utils/uri/Makefile.in
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id$
-
-NAME = uri
-
-BIN = ${NAME}
-SRC = ${NAME}.c
-OBJ = ${NAME}.o
-
-CFLAGS = @CFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-
-abs_top_srcdir	 = @abs_top_srcdir@
-abs_top_builddir = @abs_top_builddir@
-
-all: ${BIN}
-
-clean:
-	rm -rf ${BIN} ${OBJ} ${BIN}.dSYM
-
-${BIN}: ${SRC}
-	${CC} ${CFLAGS} -o $@ ${SRC} ${LDFLAGS} ${LIBS}
-
-test:
-	@true
-
-install deinstall uninstall:
-	@true
-
-distclean: clean
-	rm -f Makefile
diff --git a/schemas/Makefile.in b/schemas/Makefile.in
new file mode 100644
index 00000000..3451d987
--- /dev/null
+++ b/schemas/Makefile.in
@@ -0,0 +1,66 @@
+# $Id$
+
+PYTHON		= @PYTHON@
+TRANG		= @TRANG@
+
+CFLAGS		= @CFLAGS@
+LDFLAGS		= @LDFLAGS@ @POW_LDFLAGS@
+LIBS		= @LIBS@
+
+INSTALL		= @INSTALL@ -m 555 
+
+prefix		= @prefix@
+exec_prefix	= @exec_prefix@
+datarootdir	= @datarootdir@
+datadir		= @datadir@
+localstatedir	= @localstatedir@
+sharedstatedir	= @sharedstatedir@
+sysconfdir	= @sysconfdir@
+bindir		= @bindir@
+sbindir		= @sbindir@
+libexecdir	= @libexecdir@
+sysconfdir	= @sysconfdir@
+
+abs_builddir	= @abs_builddir@
+abs_top_srcdir	= @abs_top_srcdir@
+abs_top_builddir= @abs_top_builddir@
+srcdir          = @srcdir@
+
+all:: ${abs_top_srcdir}/rpki/relaxng.py ${abs_top_srcdir}/rpki/sql_schemas.py
+
+install clean test distclean deinstall uninstall::
+	@true
+
+RNGS =  relaxng/left-right-schema.rng		\
+	relaxng/up-down-schema.rng		\
+	relaxng/publication-schema.rng		\
+	relaxng/myrpki.rng			\
+	relaxng/router-certificate-schema.rng
+
+SQLS =	sql/rpkid.sql sql/pubd.sql
+
+${abs_top_srcdir}/rpki/relaxng.py: ${abs_top_srcdir}/buildtools/make-relaxng.py ${RNGS}
+	${PYTHON} ${abs_top_srcdir}/buildtools/make-relaxng.py ${RNGS} >$@.tmp
+	mv $@.tmp $@
+
+${abs_top_srcdir}/rpki/sql_schemas.py: ${abs_top_srcdir}/buildtools/make-sql-schemas.py ${SQLS}
+	${PYTHON} ${abs_top_srcdir}/buildtools/make-sql-schemas.py >$@.tmp
+	mv $@.tmp $@
+
+relaxng/left-right-schema.rng: relaxng/left-right-schema.rnc
+	${TRANG} relaxng/left-right-schema.rnc relaxng/left-right-schema.rng
+
+relaxng/up-down-schema.rng: relaxng/up-down-schema.rnc
+	${TRANG} relaxng/up-down-schema.rnc relaxng/up-down-schema.rng
+
+relaxng/publication-schema.rng: relaxng/publication-schema.rnc
+	${TRANG} relaxng/publication-schema.rnc relaxng/publication-schema.rng
+
+relaxng/myrpki.rng: relaxng/myrpki.rnc
+	${TRANG} relaxng/myrpki.rnc relaxng/myrpki.rng
+
+relaxng/router-certificate-schema.rng: relaxng/router-certificate-schema.rnc
+	${TRANG} relaxng/router-certificate-schema.rnc relaxng/router-certificate-schema.rng
+
+dont-run-trang:
+	touch relaxng/*.rng
diff --git a/setup.py b/setup.py
index 653d2d31..f370e5aa 100644
--- a/setup.py
+++ b/setup.py
@@ -62,27 +62,27 @@ setup(name              = "rpkitoolkit",
                            "rpki.gui.cacheview" :
                              ["templates/*/*.html"]},
       scripts           = [(autoconf.sbindir,
-                            ["rpkic",
-                             "rpki-confgen",
-                             "rpki-start-servers",
-                             "rpki-sql-backup",
-                             "rpki-sql-setup",
-                             "portal-gui/scripts/rpki-manage",
-                             "portal-gui/scripts/rpkigui-query-routes",
-                             "irbe_cli"]),
+                            ["ca/rpkic",
+                             "ca/rpki-confgen",
+                             "ca/rpki-start-servers",
+                             "ca/rpki-sql-backup",
+                             "ca/rpki-sql-setup",
+                             "ca/rpki-manage",
+                             "ca/rpkigui-query-routes",
+                             "ca/irbe_cli"]),
                            (autoconf.libexecdir,
-                            ["irdbd",
-                             "pubd",
-                             "rootd",
-                             "rpkid",
-                             "portal-gui/scripts/rpkigui-import-routes",
-                             "portal-gui/scripts/rpkigui-check-expired",
-                             "portal-gui/scripts/rpkigui-rcynic",
-                             "portal-gui/scripts/rpkigui-apache-conf-gen"])],
+                            ["ca/irdbd",
+                             "ca/pubd",
+                             "ca/rootd",
+                             "ca/rpkid",
+                             "ca/rpkigui-import-routes",
+                             "ca/rpkigui-check-expired",
+                             "ca/rpkigui-rcynic",
+                             "ca/rpkigui-apache-conf-gen"])],
       data_files        = [(autoconf.sysconfdir  + "/rpki",
-                            ["rpki-confgen.xml"]),
+                            ["ca/rpki-confgen.xml"]),
                            (autoconf.datarootdir + "/rpki/wsgi",
-                            ["portal-gui/rpki.wsgi"]),
+                            ["ca/rpki.wsgi"]),
                            (autoconf.datarootdir + "/rpki/media/css",
                             glob("rpki/gui/app/static/css/*")),
                            (autoconf.datarootdir + "/rpki/media/js",
@@ -90,4 +90,4 @@ setup(name              = "rpkitoolkit",
                            (autoconf.datarootdir + "/rpki/media/img",
                             glob("rpki/gui/app/static/img/*")),
                            (autoconf.datarootdir + "/rpki/upgrade-scripts",
-                            glob("upgrade-scripts/*"))])
+                            glob("ca/upgrade-scripts/*"))])