17 files changed, 110 insertions, 123 deletions
diff --git a/.gitignore b/.gitignore
index cd9a488..c0e8007 100644
--- a/.gitignore
+++ b/.gitignore
@@ -56,10 +56,12 @@ temp.txt
 /doc/version.xml
 /doc/xml/
 
-/module/p11-kit.pc
+/p11-kit/p11-kit.pc
+/p11-kit/p11-kit-1.pc
 
 /po/POTFILES
 /po/stamp-po
+/po/remove-potcdate.sed
 
 /tests/coverage
 /tests/coverage.info
@@ -68,3 +70,5 @@ temp.txt
 /tests/uri-test
 
 /tools/p11-kit
+
+/p11-kit-?.?
diff --git a/configure.ac b/configure.ac
index d86c318..709df65 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ AC_CONFIG_MACRO_DIR([m4])
 
 AC_INIT([p11-kit],[0.1],[http://bugzilla.example.com])
 
-AC_CONFIG_SRCDIR([p11-kit/p11-kit-lib.c])
+AC_CONFIG_SRCDIR([p11-kit/modules.c])
 AC_CONFIG_HEADERS([config.h])
 
 dnl Other initialization
@@ -151,7 +151,7 @@ AC_CONFIG_FILES([Makefile
 	doc/version.xml
 	po/Makefile.in
 	p11-kit/Makefile
-	p11-kit/p11-kit.pc
+	p11-kit/p11-kit-1.pc
 	tests/Makefile
 	tools/Makefile
 ])
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 4672b20..de16a67 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -37,8 +37,8 @@ FIXXREF_OPTIONS=
 # Used for dependencies. The docs will be rebuilt if any of these change.
 # e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h
 # e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c
-HFILE_GLOB=$(top_srcdir)/p11-kit/p11-kit-*.h
-CFILE_GLOB=$(top_srcdir)/p11-kit/p11-kit-*.c
+HFILE_GLOB=$(top_srcdir)/p11-kit/*.h
+CFILE_GLOB=$(top_srcdir)/p11-kit/*.c
 
 # Header files to ignore when scanning.
 # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
diff --git a/p11-kit/Makefile.am b/p11-kit/Makefile.am
index 0b7e163..1f2de49 100644
--- a/p11-kit/Makefile.am
+++ b/p11-kit/Makefile.am
@@ -2,11 +2,11 @@
 INCLUDES = \
 	-DP11_KIT_API_SUBJECT_TO_CHANGE
 
-incdir = $(includedir)/p11-kit
+incdir = $(includedir)/p11-kit-1/p11-kit
 
 inc_HEADERS = \
 	p11-kit.h \
-	p11-kit-uri.h \
+	uri.h \
 	pkcs11.h
 
 MODULE_SRCS = \
@@ -14,11 +14,11 @@ MODULE_SRCS = \
 	debug.c debug.h \
 	hash.c hash.h \
 	util.c util.h \
-	p11-kit-lib.c \
-	p11-kit-proxy.c \
-	p11-kit-private.h \
-	p11-kit-messages.c \
-	p11-kit-uri.c \
+	modules.c \
+	proxy.c \
+	private.h \
+	messages.c \
+	uri.c \
 	$(inc_HEADERS)
 
 lib_LTLIBRARIES = \
@@ -38,7 +38,7 @@ libp11_kit_testable_la_LDFLAGS = \
 libp11_kit_testable_la_SOURCES = $(MODULE_SRCS)
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = p11-kit.pc
+pkgconfig_DATA = p11-kit-1.pc
 
 EXTRA_DIST = \
-	p11-kit.pc.in
-\ No newline at end of file
+	p11-kit-1.pc.in
+\ No newline at end of file
diff --git a/p11-kit/debug.h b/p11-kit/debug.h
index 47e5cc4..acc9ca6 100644
--- a/p11-kit/debug.h
+++ b/p11-kit/debug.h
@@ -55,13 +55,13 @@ void              debug_message                  (int flag,
  * more than once. So you can do:
  *
  * #define DEBUG_FLAG DEBUG_ONE_THING
- * #include "gkr-debug.h"
+ * #include "debug.h"
  * ...
  * DEBUG ("if we're debugging one thing");
  * ...
  * #undef DEBUG_FLAG
  * #define DEBUG_FLAG DEBUG_OTHER_THING
- * #include "gkr-debug.h"
+ * #include "debug.h"
  * ...
  * DEBUG ("if we're debugging the other thing");
  * ...
diff --git a/p11-kit/p11-kit-messages.c b/p11-kit/messages.c
index bfc637c..bfc637c 100644
--- a/p11-kit/p11-kit-messages.c
+++ b/p11-kit/messages.c
diff --git a/p11-kit/p11-kit-lib.c b/p11-kit/modules.c
index abc58f8..25fd204 100644
--- a/p11-kit/p11-kit-lib.c
+++ b/p11-kit/modules.c
@@ -41,7 +41,7 @@
 #include "hash.h"
 #include "pkcs11.h"
 #include "p11-kit.h"
-#include "p11-kit-private.h"
+#include "private.h"
 
 #include <sys/stat.h>
 #include <sys/types.h>
diff --git a/p11-kit/p11-kit.pc.in b/p11-kit/p11-kit-1.pc.in
index d80167e..c5bcdbd 100644
--- a/p11-kit/p11-kit.pc.in
+++ b/p11-kit/p11-kit-1.pc.in
@@ -14,4 +14,4 @@ Name: p11-kit
 Description: Library and proxy module for properly loading and sharing PKCS#11 modules.
 Version: @VERSION@
 Libs: -L${libdir} -lp11-kit
-Cflags: -I${includedir}/p11-kit
+Cflags: -I${includedir}/p11-kit-1
diff --git a/p11-kit/p11-kit.h b/p11-kit/p11-kit.h
index 7dcfa4f..6d90a8d 100644
--- a/p11-kit/p11-kit.h
+++ b/p11-kit/p11-kit.h
@@ -44,7 +44,7 @@
 #error "This API has not yet reached stability."
 #endif
 
-#include "pkcs11.h"
+#include "p11-kit/pkcs11.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/p11-kit/p11-kit.pc b/p11-kit/p11-kit.pc
deleted file mode 100644
index ce763cc..0000000
--- a/p11-kit/p11-kit.pc
+++ /dev/null
@@ -1,17 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-datarootdir=${prefix}/share
-datadir=${datarootdir}
-sysconfdir=/etc
-p11_system_conf=/etc/pkcs11/pkcs11.conf
-p11_system_modules=/etc/pkcs11/modules
-p11_user_conf=~/.pkcs11/pkcs11.conf
-p11_user_modules=~/.pkcs11/modules
-
-Name: p11-kit
-Description: Library and proxy module for properly loading and sharing PKCS#11 modules.
-Version: 0.1
-Libs: -L${libdir} -lp11-kit
-Cflags: -I${includedir}/p11-kit
diff --git a/p11-kit/p11-kit-private.h b/p11-kit/private.h
index 56d5394..56d5394 100644
--- a/p11-kit/p11-kit-private.h
+++ b/p11-kit/private.h
diff --git a/p11-kit/p11-kit-proxy.c b/p11-kit/proxy.c
index e8c4015..7160422 100644
--- a/p11-kit/p11-kit-proxy.c
+++ b/p11-kit/proxy.c
@@ -38,7 +38,7 @@
 #include "hash.h"
 #include "pkcs11.h"
 #include "p11-kit.h"
-#include "p11-kit-private.h"
+#include "private.h"
 #include "util.h"
 
 #include <sys/types.h>
diff --git a/p11-kit/p11-kit-uri.c b/p11-kit/uri.c
index f2ac3ad..14d00b1 100644
--- a/p11-kit/p11-kit-uri.c
+++ b/p11-kit/uri.c
@@ -37,7 +37,7 @@
 #define DEBUG_FLAG DEBUG_URI
 #include "debug.h"
 #include "pkcs11.h"
-#include "p11-kit-uri.h"
+#include "uri.h"
 #include "util.h"
 
 #include <assert.h>
diff --git a/p11-kit/p11-kit-uri.h b/p11-kit/uri.h
index a54f7a4..1cf5c00 100644
--- a/p11-kit/p11-kit-uri.h
+++ b/p11-kit/uri.h
@@ -44,7 +44,7 @@
 #error "This API has not yet reached stability."
 #endif
 
-#include "pkcs11.h"
+#include "p11-kit/pkcs11.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 0b42302..3e15306 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,2 +1,2 @@
 # List of source files which contain translatable strings.
-module/p11-kit-messages.c
-\ No newline at end of file
+p11-kit/messages.c
diff --git a/po/p11-kit.pot b/po/p11-kit.pot
index 066f91c..3e5c888 100644
--- a/po/p11-kit.pot
+++ b/po/p11-kit.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: p11-kit 0.1\n"
 "Report-Msgid-Bugs-To: http://bugzilla.example.com\n"
-"POT-Creation-Date: 2011-02-18 10:47+0100\n"
+"POT-Creation-Date: 2011-05-27 14:41+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,326 +17,326 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: module/p11-kit-messages.c:70
+#: p11-kit/messages.c:78
 msgid "The operation was cancelled"
 msgstr ""
 
-#: module/p11-kit-messages.c:73
+#: p11-kit/messages.c:81
 msgid "Insufficient memory available"
 msgstr ""
 
-#: module/p11-kit-messages.c:75
+#: p11-kit/messages.c:83
 msgid "The specified slot ID is not valid"
 msgstr ""
 
-#: module/p11-kit-messages.c:77
+#: p11-kit/messages.c:85
 msgid "Internal error"
 msgstr ""
 
-#: module/p11-kit-messages.c:79
+#: p11-kit/messages.c:87
 msgid "The operation failed"
 msgstr ""
 
-#: module/p11-kit-messages.c:81
+#: p11-kit/messages.c:89
 msgid "Invalid arguments"
 msgstr ""
 
-#: module/p11-kit-messages.c:83
+#: p11-kit/messages.c:91
 msgid "The module cannot create needed threads"
 msgstr ""
 
-#: module/p11-kit-messages.c:85
+#: p11-kit/messages.c:93
 msgid "The module cannot lock data properly"
 msgstr ""
 
-#: module/p11-kit-messages.c:87
+#: p11-kit/messages.c:95
 msgid "The field is read-only"
 msgstr ""
 
-#: module/p11-kit-messages.c:89
+#: p11-kit/messages.c:97
 msgid "The field is sensitive and cannot be revealed"
 msgstr ""
 
-#: module/p11-kit-messages.c:91
+#: p11-kit/messages.c:99
 msgid "The field is invalid or does not exist"
 msgstr ""
 
-#: module/p11-kit-messages.c:93
+#: p11-kit/messages.c:101
 msgid "Invalid value for field"
 msgstr ""
 
-#: module/p11-kit-messages.c:95
+#: p11-kit/messages.c:103
 msgid "The data is not valid or unrecognized"
 msgstr ""
 
-#: module/p11-kit-messages.c:97
+#: p11-kit/messages.c:105
 msgid "The data is too long"
 msgstr ""
 
-#: module/p11-kit-messages.c:99
+#: p11-kit/messages.c:107
 msgid "An error occurred on the device"
 msgstr ""
 
-#: module/p11-kit-messages.c:101
+#: p11-kit/messages.c:109
 msgid "Insufficient memory available on the device"
 msgstr ""
 
-#: module/p11-kit-messages.c:103
+#: p11-kit/messages.c:111
 msgid "The device was removed or unplugged"
 msgstr ""
 
-#: module/p11-kit-messages.c:105
+#: p11-kit/messages.c:113
 msgid "The encrypted data is not valid or unrecognized"
 msgstr ""
 
-#: module/p11-kit-messages.c:107
+#: p11-kit/messages.c:115
 msgid "The encrypted data is too long"
 msgstr ""
 
-#: module/p11-kit-messages.c:109
+#: p11-kit/messages.c:117
 msgid "This operation is not supported"
 msgstr ""
 
-#: module/p11-kit-messages.c:111
+#: p11-kit/messages.c:119
 msgid "The key is missing or invalid"
 msgstr ""
 
-#: module/p11-kit-messages.c:113
+#: p11-kit/messages.c:121
 msgid "The key is the wrong size"
 msgstr ""
 
-#: module/p11-kit-messages.c:115
+#: p11-kit/messages.c:123
 msgid "The key is of the wrong type"
 msgstr ""
 
-#: module/p11-kit-messages.c:117
+#: p11-kit/messages.c:125
 msgid "No key is needed"
 msgstr ""
 
-#: module/p11-kit-messages.c:119
+#: p11-kit/messages.c:127
 msgid "The key is different than before"
 msgstr ""
 
-#: module/p11-kit-messages.c:121
+#: p11-kit/messages.c:129
 msgid "A key is needed"
 msgstr ""
 
-#: module/p11-kit-messages.c:123
+#: p11-kit/messages.c:131
 msgid "Cannot include the key in the digest"
 msgstr ""
 
-#: module/p11-kit-messages.c:125
+#: p11-kit/messages.c:133
 msgid "This operation cannot be done with this key"
 msgstr ""
 
-#: module/p11-kit-messages.c:127
+#: p11-kit/messages.c:135
 msgid "The key cannot be wrapped"
 msgstr ""
 
-#: module/p11-kit-messages.c:129
+#: p11-kit/messages.c:137
 msgid "Cannot export this key"
 msgstr ""
 
-#: module/p11-kit-messages.c:131
+#: p11-kit/messages.c:139
 msgid "The crypto mechanism is invalid or unrecognized"
 msgstr ""
 
-#: module/p11-kit-messages.c:133
+#: p11-kit/messages.c:141
 msgid "The crypto mechanism has an invalid argument"
 msgstr ""
 
-#: module/p11-kit-messages.c:135
+#: p11-kit/messages.c:143
 msgid "The object is missing or invalid"
 msgstr ""
 
-#: module/p11-kit-messages.c:137
+#: p11-kit/messages.c:145
 msgid "Another operation is already taking place"
 msgstr ""
 
-#: module/p11-kit-messages.c:139
+#: p11-kit/messages.c:147
 msgid "No operation is taking place"
 msgstr ""
 
-#: module/p11-kit-messages.c:141
+#: p11-kit/messages.c:149
 msgid "The password or PIN is incorrect"
 msgstr ""
 
-#: module/p11-kit-messages.c:143
+#: p11-kit/messages.c:151
 msgid "The password or PIN is invalid"
 msgstr ""
 
-#: module/p11-kit-messages.c:145
+#: p11-kit/messages.c:153
 msgid "The password or PIN is of an invalid length"
 msgstr ""
 
-#: module/p11-kit-messages.c:147
+#: p11-kit/messages.c:155
 msgid "The password or PIN has expired"
 msgstr ""
 
-#: module/p11-kit-messages.c:149
+#: p11-kit/messages.c:157
 msgid "The password or PIN is locked"
 msgstr ""
 
-#: module/p11-kit-messages.c:151
+#: p11-kit/messages.c:159
 msgid "The session is closed"
 msgstr ""
 
-#: module/p11-kit-messages.c:153
+#: p11-kit/messages.c:161
 msgid "Too many sessions are active"
 msgstr ""
 
-#: module/p11-kit-messages.c:155
+#: p11-kit/messages.c:163
 msgid "The session is invalid"
 msgstr ""
 
-#: module/p11-kit-messages.c:157
+#: p11-kit/messages.c:165
 msgid "The session is read-only"
 msgstr ""
 
-#: module/p11-kit-messages.c:159
+#: p11-kit/messages.c:167
 msgid "An open session exists"
 msgstr ""
 
-#: module/p11-kit-messages.c:161
+#: p11-kit/messages.c:169
 msgid "A read-only session exists"
 msgstr ""
 
-#: module/p11-kit-messages.c:163
+#: p11-kit/messages.c:171
 msgid "An administrator session exists"
 msgstr ""
 
-#: module/p11-kit-messages.c:165
+#: p11-kit/messages.c:173
 msgid "The signature is bad or corrupted"
 msgstr ""
 
-#: module/p11-kit-messages.c:167
+#: p11-kit/messages.c:175
 msgid "The signature is unrecognized or corrupted"
 msgstr ""
 
-#: module/p11-kit-messages.c:169
+#: p11-kit/messages.c:177
 msgid "Certain required fields are missing"
 msgstr ""
 
-#: module/p11-kit-messages.c:171
+#: p11-kit/messages.c:179
 msgid "Certain fields have invalid values"
 msgstr ""
 
-#: module/p11-kit-messages.c:173
+#: p11-kit/messages.c:181
 msgid "The device is not present or unplugged"
 msgstr ""
 
-#: module/p11-kit-messages.c:175
+#: p11-kit/messages.c:183
 msgid "The device is invalid or unrecognizable"
 msgstr ""
 
-#: module/p11-kit-messages.c:177
+#: p11-kit/messages.c:185
 msgid "The device is write protected"
 msgstr ""
 
-#: module/p11-kit-messages.c:179
+#: p11-kit/messages.c:187
 msgid "Cannot import because the key is invalid"
 msgstr ""
 
-#: module/p11-kit-messages.c:181
+#: p11-kit/messages.c:189
 msgid "Cannot import because the key is of the wrong size"
 msgstr ""
 
-#: module/p11-kit-messages.c:183
+#: p11-kit/messages.c:191
 msgid "Cannot import because the key is of the wrong type"
 msgstr ""
 
-#: module/p11-kit-messages.c:185
+#: p11-kit/messages.c:193
 msgid "You are already logged in"
 msgstr ""
 
-#: module/p11-kit-messages.c:187
+#: p11-kit/messages.c:195
 msgid "No user has logged in"
 msgstr ""
 
-#: module/p11-kit-messages.c:189
+#: p11-kit/messages.c:197
 msgid "The user's password or PIN is not set"
 msgstr ""
 
-#: module/p11-kit-messages.c:191
+#: p11-kit/messages.c:199
 msgid "The user is of an invalid type"
 msgstr ""
 
-#: module/p11-kit-messages.c:193
+#: p11-kit/messages.c:201
 msgid "Another user is already logged in"
 msgstr ""
 
-#: module/p11-kit-messages.c:195
+#: p11-kit/messages.c:203
 msgid "Too many users of different types are logged in"
 msgstr ""
 
-#: module/p11-kit-messages.c:197
+#: p11-kit/messages.c:205
 msgid "Cannot import an invalid key"
 msgstr ""
 
-#: module/p11-kit-messages.c:199
+#: p11-kit/messages.c:207
 msgid "Cannot import a key of the wrong size"
 msgstr ""
 
-#: module/p11-kit-messages.c:201
+#: p11-kit/messages.c:209
 msgid "Cannot export because the key is invalid"
 msgstr ""
 
-#: module/p11-kit-messages.c:203
+#: p11-kit/messages.c:211
 msgid "Cannot export because the key is of the wrong size"
 msgstr ""
 
-#: module/p11-kit-messages.c:205
+#: p11-kit/messages.c:213
 msgid "Cannot export because the key is of the wrong type"
 msgstr ""
 
-#: module/p11-kit-messages.c:207
+#: p11-kit/messages.c:215
 msgid "Unable to initialize the random number generator"
 msgstr ""
 
-#: module/p11-kit-messages.c:209
+#: p11-kit/messages.c:217
 msgid "No random number generator available"
 msgstr ""
 
-#: module/p11-kit-messages.c:211
+#: p11-kit/messages.c:219
 msgid "The crypto mechanism has an invalid parameter"
 msgstr ""
 
-#: module/p11-kit-messages.c:213
+#: p11-kit/messages.c:221
 msgid "Not enough space to store the result"
 msgstr ""
 
-#: module/p11-kit-messages.c:215
+#: p11-kit/messages.c:223
 msgid "The saved state is invalid"
 msgstr ""
 
-#: module/p11-kit-messages.c:217
+#: p11-kit/messages.c:225
 msgid "The information is sensitive and cannot be revealed"
 msgstr ""
 
-#: module/p11-kit-messages.c:219
+#: p11-kit/messages.c:227
 msgid "The state cannot be saved"
 msgstr ""
 
-#: module/p11-kit-messages.c:221
+#: p11-kit/messages.c:229
 msgid "The module has not been initialized"
 msgstr ""
 
-#: module/p11-kit-messages.c:223
+#: p11-kit/messages.c:231
 msgid "The module has already been initialized"
 msgstr ""
 
-#: module/p11-kit-messages.c:225
+#: p11-kit/messages.c:233
 msgid "Cannot lock data"
 msgstr ""
 
-#: module/p11-kit-messages.c:227
+#: p11-kit/messages.c:235
 msgid "The data cannot be locked"
 msgstr ""
 
-#: module/p11-kit-messages.c:229
+#: p11-kit/messages.c:237
 msgid "The signature request was rejected by the user"
 msgstr ""
 
-#: module/p11-kit-messages.c:232
+#: p11-kit/messages.c:240
 msgid "Unknown error"
 msgstr ""
diff --git a/tests/uri-test.c b/tests/uri-test.c
index c3fd7f8..5a24398 100644
--- a/tests/uri-test.c
+++ b/tests/uri-test.c
@@ -40,7 +40,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "p11-kit-uri.h"
+#include "uri.h"
 
 static int
 is_module_empty (P11KitUri *uri)