diff --git a/vscarchitecture.bb b/vscarchitecture.bb
index 488d259..1225527 100644
--- a/vscarchitecture.bb
+++ b/vscarchitecture.bb
@@ -4,7 +4,7 @@ LICENSE     = "GPL"
 DEPENDS     = "pcsc-lite linux-libc-headers"
 RDEPENDS    = "pcsc-lite kernel-module-gadgetfs python-pycrypto python-crypt python-textutils python-imaging python-pickle"
 
-SRC_URI = "svn://vsmartcard.svn.sourceforge.net/svnroot/;module=vsmartcard;proto=https;rev=1"
+SRC_URI = "svn://vsmartcard.svn.sourceforge.net/svnroot/;module=vsmartcard;proto=https;rev=2"
 
 S = "${WORKDIR}"
 serialdropdir	   = ${libdir}/pcsc/drivers/serial
@@ -31,14 +31,14 @@ FILES_${PN} = "\
 "
 
 do_compile() {
-    ${CC} ${S}/NFC/ccid/ccid.c ${S}/NFC/ccid/usbstring.c -o ccid \
+    ${CC} ${S}/vsmartcard/ccid/ccid.c ${S}/vsmartcard/ccid/usbstring.c -o ccid \
         ${LIBPCSCLITE_CFLAGS} ${GADGETFS_CFLAGS} ${PTHREAD_CFLAGS} ${CFLAGS}
 
-    ${CC} ${S}/NFC/picc_to_pcsc/picc_to_pcsc.c -o picc_to_pcsc \
+    ${CC} ${S}/vsmartcard/picc_to_pcsc/picc_to_pcsc.c -o picc_to_pcsc \
         ${LIBPCSCLITE_CFLAGS} ${CFLAGS}
 
-    ${CC} -c ${S}/NFC/virtualsmartcard/vpcd/vpcd.c \
-        ${S}/NFC/virtualsmartcard/vpcd/vpcd.h \
+    ${CC} -c ${S}/vsmartcard/virtualsmartcard/vpcd/vpcd.c \
+        ${S}/vsmartcard/virtualsmartcard/vpcd/vpcd.h \
         ${LIBPCSCLITE_CFLAGS} ${SO_CFLAGS} ${CFLAGS}
     ${CC} vpcd.o -o libvpcd.so \
         ${LIBPCSCLITE_CFLAGS} ${SO_LDFLAGS} ${LDFLAGS}
@@ -66,16 +66,16 @@ do_install() {
     ${INSTALL_PROGRAM} virtualsmartcard ${D}${bindir}
     ${INSTALL_PROGRAM} libvpcd.so       ${D}${serialdropdir}
     ${INSTALL_DATA} vpcd.conf           ${D}${readerconfdir}
-    ${INSTALL_DATA} ${S}/NFC/virtualsmartcard/vpicc/ConstantDefinitions.py ${D}${python_sitelib}
-    ${INSTALL_DATA} ${S}/NFC/virtualsmartcard/vpicc/CryptoUtils.py         ${D}${python_sitelib}
-    ${INSTALL_DATA} ${S}/NFC/virtualsmartcard/vpicc/SEutils.py             ${D}${python_sitelib}
-    ${INSTALL_DATA} ${S}/NFC/virtualsmartcard/vpicc/SmartcardFilesystem.py ${D}${python_sitelib}
-    ${INSTALL_DATA} ${S}/NFC/virtualsmartcard/vpicc/SmartcardSAM.py        ${D}${python_sitelib}
-    ${INSTALL_DATA} ${S}/NFC/virtualsmartcard/vpicc/SWutils.py             ${D}${python_sitelib}
-    ${INSTALL_DATA} ${S}/NFC/virtualsmartcard/vpicc/TLVutils.py            ${D}${python_sitelib}
-    ${INSTALL_DATA} ${S}/NFC/virtualsmartcard/vpicc/utils.py               ${D}${python_sitelib}
-    ${INSTALL_DATA} ${S}/NFC/virtualsmartcard/vpicc/VirtualSmartcard.py    ${D}${python_sitelib}
-    ${INSTALL_DATA} ${S}/NFC/virtualsmartcard/vpicc/testconfig.sam         ${D}${python_sitelib}
-    ${INSTALL_DATA} ${S}/NFC/virtualsmartcard/vpicc/testconfig.mf          ${D}${python_sitelib}
-    ${INSTALL_DATA} ${S}/NFC/virtualsmartcard/vpicc/jp2.jpg                ${D}${python_sitelib}
+    ${INSTALL_DATA} ${S}/vsmartcard/virtualsmartcard/vpicc/ConstantDefinitions.py ${D}${python_sitelib}
+    ${INSTALL_DATA} ${S}/vsmartcard/virtualsmartcard/vpicc/CryptoUtils.py         ${D}${python_sitelib}
+    ${INSTALL_DATA} ${S}/vsmartcard/virtualsmartcard/vpicc/SEutils.py             ${D}${python_sitelib}
+    ${INSTALL_DATA} ${S}/vsmartcard/virtualsmartcard/vpicc/SmartcardFilesystem.py ${D}${python_sitelib}
+    ${INSTALL_DATA} ${S}/vsmartcard/virtualsmartcard/vpicc/SmartcardSAM.py        ${D}${python_sitelib}
+    ${INSTALL_DATA} ${S}/vsmartcard/virtualsmartcard/vpicc/SWutils.py             ${D}${python_sitelib}
+    ${INSTALL_DATA} ${S}/vsmartcard/virtualsmartcard/vpicc/TLVutils.py            ${D}${python_sitelib}
+    ${INSTALL_DATA} ${S}/vsmartcard/virtualsmartcard/vpicc/utils.py               ${D}${python_sitelib}
+    ${INSTALL_DATA} ${S}/vsmartcard/virtualsmartcard/vpicc/VirtualSmartcard.py    ${D}${python_sitelib}
+    ${INSTALL_DATA} ${S}/vsmartcard/virtualsmartcard/vpicc/testconfig.sam         ${D}${python_sitelib}
+    ${INSTALL_DATA} ${S}/vsmartcard/virtualsmartcard/vpicc/testconfig.mf          ${D}${python_sitelib}
+    ${INSTALL_DATA} ${S}/vsmartcard/virtualsmartcard/vpicc/jp2.jpg                ${D}${python_sitelib}
 }