Imported Upstream version 1.5.8

156 files changed, 0 insertions, 27456 deletions

diff --git a/src/modules/Makefile b/src/modules/Makefile
deleted file mode 100644
index ef8eccd..0000000
--- a/src/modules/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-
-root := ../..
-
-all:
-	make -C ${root}
diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am
deleted file mode 100644
index 944dc18..0000000
--- a/src/modules/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-modulesdir = $(top_srcdir)/src/modules
-
-libsword_la_SOURCES += $(modulesdir)/swmodule.cpp
-
-include ../src/modules/common/Makefile.am
-include ../src/modules/filters/Makefile.am
-include ../src/modules/genbook/Makefile.am
-include ../src/modules/texts/Makefile.am
-include ../src/modules/comments/Makefile.am
-include ../src/modules/lexdict/Makefile.am
diff --git a/src/modules/comments/Makefile b/src/modules/comments/Makefile
deleted file mode 100644
index 1a2d00d..0000000
--- a/src/modules/comments/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-
-root := ../../..
-
-all:
-	make -C ${root}
diff --git a/src/modules/comments/Makefile.am b/src/modules/comments/Makefile.am
deleted file mode 100644
index 1568544..0000000
--- a/src/modules/comments/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-commentsdir = $(top_srcdir)/src/modules/comments
-
-libsword_la_SOURCES += $(commentsdir)/swcom.cpp
-
-include ../src/modules/comments/rawcom/Makefile.am
-include ../src/modules/comments/rawfiles/Makefile.am
-include ../src/modules/comments/zcom/Makefile.am
-include ../src/modules/comments/hrefcom/Makefile.am
diff --git a/src/modules/comments/hrefcom/Makefile b/src/modules/comments/hrefcom/Makefile
deleted file mode 100644
index 35d6648..0000000
--- a/src/modules/comments/hrefcom/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-
-root := ../../../..
-
-all:
-	make -C ${root}
diff --git a/src/modules/comments/hrefcom/Makefile.am b/src/modules/comments/hrefcom/Makefile.am
deleted file mode 100644
index a6a2115..0000000
--- a/src/modules/comments/hrefcom/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-hrefcomdir = $(top_srcdir)/src/modules/comments/hrefcom
-
-libsword_la_SOURCES += $(hrefcomdir)/hrefcom.cpp
-
diff --git a/src/modules/comments/hrefcom/hrefcom.cpp b/src/modules/comments/hrefcom/hrefcom.cpp
deleted file mode 100644
index 42b2745..0000000
--- a/src/modules/comments/hrefcom/hrefcom.cpp
+++ /dev/null
@@ -1,90 +0,0 @@
-/******************************************************************************
- *  hrefcom.cpp - code for class 'HREFCom'- a module that produces HTML HREFs
- *			pointing to actual text desired.  Uses standard
- *			files:	ot and nt using indexs ??.bks ??.cps ??.vss
- */
-
-
-#include <ctype.h>
-#include <stdio.h>
-#include <fcntl.h>
-
-#ifndef __GNUC__
-#include <io.h>
-#else
-#include <unistd.h>
-#endif
-
-#include <utilfuns.h>
-#include <rawverse.h>
-#include <hrefcom.h>
-
-SWORD_NAMESPACE_START
-
- /******************************************************************************
- * HREFCom Constructor - Initializes data for instance of HREFCom
- *
- * ENT:	iname - Internal name for module
- *	iprefix - string to prepend to each HREF (e.g. "file://mods/com/jfb/")
- *	idesc - Name to display to user for module
- *	idisp	 - Display object to use for displaying
- */
-
-HREFCom::HREFCom(const char *ipath, const char *iprefix, const char *iname, const char *idesc, SWDisplay *idisp) : RawVerse(ipath), SWCom(iname, idesc, idisp)
-{
-	prefix   = 0;
-	stdstr(&prefix, iprefix);
-}
-
-
-/******************************************************************************
- * HREFCom Destructor - Cleans up instance of HREFCom
- */
-
-HREFCom::~HREFCom()
-{
-	if (prefix)
-		delete [] prefix;
-}
-
-
-/******************************************************************************
- * HREFCom::operator char *	- Returns the correct verse when char * cast
- *					is requested
- *
- * RET: string buffer with verse
- */
-
-SWBuf &HREFCom::getRawEntryBuf() {
-	long  start;
-	unsigned short size;
-	VerseKey *key = 0;
-
-#ifndef _WIN32_WCE
-	try {
-#endif
-		key = SWDYNAMIC_CAST(VerseKey, this->key);
-#ifndef _WIN32_WCE
-	}
-	catch ( ... ) {}
-#endif
-	if (!key)
-		key = new VerseKey(this->key);
-
-	findOffset(key->Testament(), key->Index(), &start, &size);
-	entrySize = size;        // support getEntrySize call
-
-	SWBuf tmpbuf;
-
-	readText(key->Testament(), start, size, tmpbuf);
-	entryBuf = prefix;
-	entryBuf += tmpbuf.c_str();
-	prepText(entryBuf);
-
-	if (key != this->key)
-		delete key;
-
-	return entryBuf;
-}
-
-SWORD_NAMESPACE_END
diff --git a/src/modules/comments/hrefcom/jfbgen.cpp b/src/modules/comments/hrefcom/jfbgen.cpp
deleted file mode 100644
index 8b66a60..0000000
--- a/src/modules/comments/hrefcom/jfbgen.cpp
+++ /dev/null
@@ -1,242 +0,0 @@
-/*****************************************************************************
- *
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-
-#ifndef __GNUC__
-#include <io.h>
-#else
-#include <unistd.h>
-#endif
-
-#include <fcntl.h>
-#include <versekey.h>
-
-#ifndef O_BINARY
-	#define O_BINARY 0
-#endif
-
-void writeidx(VerseKey &key1, VerseKey &key2, VerseKey &key3, long offset, short size);
-char findbreak(int fp, long *offset, int *num1, int *num2, int *rangemax, short *size);
-void openfiles();
-void checkparams(int argc, char **argv);
-void charsetconvert(char *data);
-
-
-VerseKey key1, key2, key3;
-int fp, vfp, cfp, bfp;
-long chapoffset;
-short chapsize;
-char testmnt;
-char startflag = 0;
-
-
-main(int argc, char **argv)
-{
-	long pos, offset;
-	int num1, num2, rangemax, curbook = 0, curchap = 0, curverse = 0;
-	char buf[127];
-	short size, tmp;
-	extern struct zonline online;
-
-	checkparams(argc, argv);
-
-	key1 = key2 = key3 = "Genesis 1:1";
-
-	openfiles();
-
-	num1    = key1.Chapter();
-	num2    = key1.Verse();
-
-	while(!findbreak(fp, &offset, &num1, &num2, &rangemax, &size)) {
-		if (!startflag) {
-			startflag = 1;
-		}
-		else {
-			if (num2 < key2.Verse()) {            // new chapter
-				if (num1 <= key2.Chapter()) { // new book
-					key2.Verse(1);
-					key2.Chapter(1);
-					key2.Book(key2.Book()+1);
-				}
-				printf("Found Chapter Break: %d ('%s')\n", num1, (const char *)key2);
-				chapoffset = offset;
-				chapsize = size;
-//				continue;
-			}
-		}
-		key2.Verse(1);
-		key2.Chapter(num1);
-		key2.Verse(num2);
-
-		key3 = key2;
-//		key3 += (rangemax - key3.Verse());
-
-		writeidx(key1, key2, key3, offset, size);
-	}
-	close(vfp);
-	close(cfp);
-	close(bfp);
-	close(fp);
-}
-
-
-/**************************************************************************
- * ENT:	key1	- current location of index
- * 	key2	- minimum keyval for which this offset is valid
- * 	key3	- maximum keyval for which this offset is valid
- */
-
-void writeidx(VerseKey &key1, VerseKey &key2, VerseKey &key3, long offset, short size)
-{
-	long pos;
-	short tmp;
-
-		if (key1.Verse() == 1) {	// new chapter
-			if (key1.Chapter() == 1) {	// new book
-				pos = lseek(cfp, 0, SEEK_CUR);
-				write(bfp, &pos, 4);
-				pos = lseek(vfp, 0, SEEK_CUR); /* Book intro (cps) */
-				write(cfp, &pos, 4);
-				write(vfp, &chapoffset, 4);  /* Book intro (vss)  set to same as chap for now(it should be chap 1 which usually contains the book into anyway)*/
-				write(vfp, &chapsize, 2);
-			}
-			pos = lseek(vfp, 0, SEEK_CUR);
-			write(cfp, &pos, 4);
-			write(vfp, &chapoffset, 4);  /* Chapter intro */
-			write(vfp, &chapsize, 2);
-		}
-		if (key1 >= key2) {
-			write(vfp, &offset, 4);
-			write(vfp, &size, 2);
-		}
-		else	{
-			pos = 0;
-			tmp = 0;
-			write(vfp, &pos, 4);
-			write(vfp, &tmp, 2);
-		}
-		key1++;
-}
-
-
-static VerseKey inckey = "Genesis 1:1";
-
-char findbreak(int fp, long *offset, int *num1, int *num2, int *rangemax, short *size)
-{
-	char buf[7];
-	char buf2[20];
-	char ch;
-	char loop;
-	long offset2;
-	int ch2, vs2, rm2;
-	bool flag;
-	long chapstart = 0; 
-	static int olbvnum = 0;
-	char data[256];
-	char *bookabrev[66] = {"Ge", "Ex", "Le", "Nu", "De", "Jos", "Jud", "Ru",
-		"1Sa", "2Sa", "1Ki", "2Ki", "1Ch", "2Ch", "Ezr", "Ne", "Es",
-		"Job", "Ps", "Pr", "Ec", "So", "Isa", "Jer", "La", "Eze", "Da",
-		"Ho", "Joe", "Am", "Ob", "Jon", "Mic", "Na", "Heb", "Zep",
-		"Hag", "Zec", "Mal",
-		"Mt", "Mr", "Lu", "Joh", "Ac", "Ro", "1Co", "2Co", "Ga",
-		"Eph", "Php", "Col", "1Th", "2Th", "1Ti", "2Ti", "Tit", "Phm",
-		"Heb", "Jas", "1Pe", "2Pe", "1Jo", "2Jo", "3Jo", "Jude", "Re" };
-
-	if (++olbvnum <= 31102) {
-
-		if (olbvnum == 23146) {	// "Matthew 1:1"	
-			close(vfp);
-			close(cfp);
-			close(bfp);
-			close(fp);
-			key1 = key2 = key3 = inckey = "Matthew 1:1";
-			openfiles();
-			startflag = 0;
-		}
-
-
-		*offset = lseek(fp, 0, SEEK_CUR);
-
-		if ((olbvnum!=1) && (olbvnum != 23146))
-			inckey++;
-			
-		*num1 = inckey.Chapter();
-		*num2 = inckey.Verse();
-	
-		sprintf(data, "JFB%.2d.htm#%s%d_%d", inckey.Book() + ((inckey.Testament()>1)?39:0), bookabrev[inckey.Book() + ((inckey.Testament()>1)?39:0)-1], inckey.Chapter(), inckey.Verse());
-		write(fp, data, strlen(data));
-
-		*size = lseek(fp, 0, SEEK_CUR) - *offset;
-		write(fp, "\n", 1);
-		return 0;
-	}
-	return 1;
-}
-
-
-void openfiles()
-{
-	char buf[255];
-	char fname[5];
-	long pos;
-	short size;
-	
-	testmnt = key1.Testament();
-
-	strcpy(fname, (testmnt==2) ? "nt" : "ot");
-	unlink(fname);
-	if ((fp = open(fname, O_CREAT|O_RDWR|O_BINARY)) == -1) {
-		fprintf(stderr, "Couldn't open file: %s\n", fname);
-		exit(1);
-	}
-
-	sprintf(buf, "%s.vss", fname);
-	unlink(buf);
-	if ((vfp = open(buf, O_CREAT|O_WRONLY|O_BINARY)) == -1) {
-		fprintf(stderr, "Couldn't open file: %s\n", buf);
-		exit(1);
-	}
-
-	sprintf(buf, "%s.cps", fname);
-	unlink(buf);
-	if ((cfp = open(buf, O_CREAT|O_WRONLY|O_BINARY)) == -1) {
-		fprintf(stderr, "Couldn't open file: %s\n", buf);
-		exit(1);
-	}
-
-	sprintf(buf, "%s.bks", fname);
-	unlink(buf);
-	if ((bfp = open(buf, O_CREAT|O_WRONLY|O_BINARY)) == -1) {
-		fprintf(stderr, "Couldn't open file: %s\n", buf);
-		exit(1);
-	}
-
-	pos  = 0;
-	write(bfp, &pos, 4);  /* Book    offset for testament intros */
-	pos = 4;
-	write(cfp, &pos, 4);  /* Chapter offset for testament intro */
-
-
-/*	Right now just zero out intros until parsing correctly */
-	pos = 0;
-	size = 0;
-	write(vfp, &pos, 4);  /* Module intro */
-	write(vfp, &size, 2);
-	write(vfp, &pos, 4);  /* Testament intro */
-	write(vfp, &size, 2);
-
-}
-
-
-void checkparams(int argc, char **argv)
-{
-	if (argc !=1) {
-		fprintf(stderr, "usage: %s\n", argv[0]);
-		exit(1);
-	}
-}
diff --git a/src/modules/comments/rawcom/Makefile b/src/modules/comments/rawcom/Makefile
deleted file mode 100644
index 35d6648..0000000
--- a/src/modules/comments/rawcom/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-
-root := ../../../..
-
-all:
-	make -C ${root}
diff --git a/src/modules/comments/rawcom/Makefile.am b/src/modules/comments/rawcom/Makefile.am
deleted file mode 100644
index 901cf6b..0000000
--- a/src/modules/comments/rawcom/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-rawcomdir = $(top_srcdir)/src/modules/comments/rawcom
-
-libsword_la_SOURCES += $(rawcomdir)/rawcom.cpp
-
diff --git a/src/modules/comments/rawcom/mhcidx.cpp b/src/modules/comments/rawcom/mhcidx.cpp
deleted file mode 100644
index df16f55..0000000
--- a/src/modules/comments/rawcom/mhcidx.cpp
+++ /dev/null
@@ -1,292 +0,0 @@
-/*****************************************************************************
- *
- *	This code wreaks but works (at least for MHC).  Good luck!
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-
-#ifndef __GNUC__
-#include <io.h>
-#else
-#include <unistd.h>
-#endif
-
-#include <fcntl.h>
-#include <versekey.h>
-
-
-void writeidx(VerseKey &key1, VerseKey &key2, VerseKey &key3, long offset, short size);
-char findbreak(int fp, long *offset, int *num1, int *num2, int *rangemax, short *size);
-void openfiles(char *fname);
-void checkparams(int argc, char **argv);
-
-
-VerseKey key1, key2, key3;
-int fp, vfp, cfp, bfp;
-long chapoffset;
-short chapsize;
-char testmnt;
-
-
-main(int argc, char **argv)
-{
-	long pos, offset;
-	int num1, num2, rangemax, curbook = 0, curchap = 0, curverse = 0;
-	char buf[127], startflag = 0;
-	short size, tmp;
-
-	checkparams(argc, argv);
-
-	openfiles(argv[1]);
-
-	testmnt = key1.Testament();
-	pos  = 0;
-	write(bfp, &pos, 4);  /* Book    offset for testament intros */
-	pos = 4;
-	write(cfp, &pos, 4);  /* Chapter offset for testament intro */
-
-
-/*	Right now just zero out intros until parsing correctly */
-	pos = 0;
-	size = 0;
-	write(vfp, &pos, 4);  /* Module intro */
-	write(vfp, &size, 2);
-	write(vfp, &pos, 4);  /* Testament intro */
-	write(vfp, &size, 2);
-
-	while(!findbreak(fp, &offset, &num1, &num2, &rangemax, &size)) {
-		if (num2) {				
-			key2.Verse(1);
-			key2.Chapter(num1);
-			key2.Verse(num2);
-		}
-		else {
-			key2.Verse(1);
-			if (!startflag) {
-				startflag = 1;
-			}
-			else {
-				if (num1 <= key2.Chapter()) { // new book
-					key2.Chapter(1);
-					key2.Book(key2.Book()+1);
-				}
-			}
-			key2.Chapter(num1);
-			printf("Found Chapter Break: %d ('%s')\n", num1, (const char *)key2);
-			chapoffset = offset;
-			chapsize = size;
-			continue;
-		}
-
-		key3 = key2;
-		key3 += (rangemax - key3.Verse());
-
-		writeidx(key1, key2, key3, offset, size);
-	}
-	close(vfp);
-	close(cfp);
-	close(bfp);
-	close(fp);
-}
-
-
-/**************************************************************************
- * ENT:	key1	- current location of index
- * 	key2	- minimum keyval for which this offset is valid
- * 	key3	- maximum keyval for which this offset is valid
- */
-
-void writeidx(VerseKey &key1, VerseKey &key2, VerseKey &key3, long offset, short size)
-{
-	long pos;
-	short tmp;
-
-	for (; ((key1 <= key3) && (key1.Error() != KEYERR_OUTOFBOUNDS) && (key1.Testament() == testmnt)); key1+=1) {
-		if (key1.Verse() == 1) {	// new chapter
-			if (key1.Chapter() == 1) {	// new book
-				pos = lseek(cfp, 0, SEEK_CUR);
-				write(bfp, &pos, 4);
-				pos = lseek(vfp, 0, SEEK_CUR); /* Book intro (cps) */
-				write(cfp, &pos, 4);
-				write(vfp, &chapoffset, 4);  /* Book intro (vss)  set to same as chap for now(it should be chap 1 which usually contains the book into anyway)*/
-				write(vfp, &chapsize, 2);
-			}
-			pos = lseek(vfp, 0, SEEK_CUR);
-			write(cfp, &pos, 4);
-			write(vfp, &chapoffset, 4);  /* Chapter intro */
-			write(vfp, &chapsize, 2);
-		}
-		if (key1 >= key2) {
-			write(vfp, &offset, 4);
-			write(vfp, &size, 2);
-		}
-		else	{
-			pos = 0;
-			tmp = 0;
-			write(vfp, &pos, 4);
-			write(vfp, &tmp, 2);
-		}
-	}
-}
-
-
-char startentry(char *buf)
-{
-	char loop;
-
-	if (buf[0] != 10)
-		return 0;
-	if (buf[1] != '#')
-		return 0;
-	if (!isdigit(buf[2]))
-		return 0;
-	for (loop = 3; loop < 7; loop++) {
-		if (buf[loop] == ' ')
-			break;
-		if ((!isdigit(buf[loop])) && (buf[loop] != ',') && (buf[loop] != '-'))
-			return 0;
-	}
-	return 1;
-}
-
-
-char findbreak(int fp, long *offset, int *num1, int *num2, int *rangemax, short *size)
-{
-	char buf[7];
-	char buf2[20];
-	char ch;
-	char loop;
-	long offset2;
-	int ch2, vs2, rm2;
-	
-	memset(buf, ' ', 7);
-
-	while (1) {
-		if (startentry(buf)) {
-			memset(buf, ' ', 2);
-			for (loop = 2; loop < 7; loop++) {
-				if ((buf[loop] == '-') || (buf[loop] == ',') || (buf[loop] == ' ')) {
-					buf[loop] = 0;
-					*num2 = atoi(buf);
-					break;
-				}
-			}
-			for (ch = loop + 1; ch < 7; ch++) {
-				if (buf[ch] == ' ') {
-					break;
-				}
-			}
-			buf[ch] = 0;
-			*rangemax = atoi(&buf[loop+1]);
-			if (!*rangemax)
-				*rangemax = *num2;
-			*offset = lseek(fp, 0, SEEK_CUR) - 5;
-			if (size) {
-				if (findbreak(fp, &offset2, &ch2, &vs2, &rm2, 0)) {
-					*size = (short) (lseek(fp, 0, SEEK_END) - (*offset));
-				}
-				else {
-					if (vs2) {
-						*size = (offset2 - (*offset)) - 3;
-					}
-					else {
-						sprintf(buf2, "$-$-$- XX:%d", ch2);
-						*size = (offset2 - (*offset)) - ((strlen(buf2) + 4));
-					}
-				}
-				lseek(fp, *offset, SEEK_SET);
-			}
-			return 0;
-		}
-					
-		if (!strncmp(buf, "$-$-$-", 6)) {
-			memset(buf2, 0, 7);
-			loop = 0;
-			while ((read(fp, &buf2[loop], 1) == 1) && (loop < 7)) {
-				if ((buf2[loop] == 10) || (buf2[loop] == 13)) {
-					buf2[loop] = 0;
-					break;
-				}
-				loop++;
-			}
-			while (read(fp, &ch, 1) == 1) {
-				if (ch == '*')
-					break;
-			}
-			
-			*offset = lseek(fp, 0, SEEK_CUR) - 1;
-			*num2 = 0;
-			for (loop = strlen(buf2) - 1; loop; loop--) {
-				if (buf2[loop] == ':')
-					break;
-			}
-			*num1 = atoi(&buf2[loop+1]);
-			printf("Chapter marker: %s\n", buf2);
-			if (size) {
-				if (findbreak(fp, &offset2, &ch2, &vs2, &rm2, 0)) {
-					*size = (short) (lseek(fp, 0, SEEK_END) - (*offset));
-				}
-				else {
-					if (vs2) {
-						*size = (offset2 - (*offset)) - 3;
-					}
-					else {
-						sprintf(buf2, "$-$-$- XX:%d", ch2);
-						*size = (offset2 - (*offset)) - ((strlen(buf2) + 4));
-					}
-				}
-				lseek(fp, *offset, SEEK_SET);
-			}
-			return 0;
-		}
-				 
-				
-		memmove(buf, &buf[1], 6);
-		if (read(fp, &buf[6], 1) != 1)
-			return 1;
-	}
-}
-
-
-void openfiles(char *fname)
-{
-	char buf[255];
-
-	if ((fp = open(fname, O_RDONLY)) == -1) {
-		fprintf(stderr, "Couldn't open file: %s\n", fname);
-		exit(1);
-	}
-
-	sprintf(buf, "%s.vss", fname);
-	if ((vfp = open(buf, O_CREAT|O_WRONLY)) == -1) {
-		fprintf(stderr, "Couldn't open file: %s\n", buf);
-		exit(1);
-	}
-
-	sprintf(buf, "%s.cps", fname);
-	if ((cfp = open(buf, O_CREAT|O_WRONLY)) == -1) {
-		fprintf(stderr, "Couldn't open file: %s\n", buf);
-		exit(1);
-	}
-
-	sprintf(buf, "%s.bks", fname);
-	if ((bfp = open(buf, O_CREAT|O_WRONLY)) == -1) {
-		fprintf(stderr, "Couldn't open file: %s\n", buf);
-		exit(1);
-	}
-}
-
-
-void checkparams(int argc, char **argv)
-{
-	if (argc < 2) {
-		fprintf(stderr, "usage: %s <file to process> [nt - for new testmt file]\n", argv[0]);
-		exit(1);
-	}
-	if (argc == 3)
-		key1 = key2 = key3 = "Matthew 1:1";
-	else	key1 = key2 = key3 = "Genesis 1:1";
-}
diff --git a/src/modules/comments/rawcom/rawcom.cpp b/src/modules/comments/rawcom/rawcom.cpp
deleted file mode 100644
index e34af2e..0000000
--- a/src/modules/comments/rawcom/rawcom.cpp
+++ /dev/null
@@ -1,184 +0,0 @@
-/******************************************************************************
- *  rawcom.cpp - code for class 'RawCom'- a module that reads raw commentary
- *			files:	ot and nt using indexs ??.bks ??.cps ??.vss
- */
-
-
-#include <ctype.h>
-#include <stdio.h>
-#include <fcntl.h>
-
-#ifndef __GNUC__
-#include <io.h>
-#else
-#include <unistd.h>
-#endif
-
-#include <utilfuns.h>
-#include <rawverse.h>
-#include <rawcom.h>
-
-SWORD_NAMESPACE_START
-
- /******************************************************************************
- * RawCom Constructor - Initializes data for instance of RawCom
- *
- * ENT:	iname - Internal name for module
- *	idesc - Name to display to user for module
- *	idisp	 - Display object to use for displaying
- */
-
-RawCom::RawCom(const char *ipath, const char *iname, const char *idesc, SWDisplay *idisp, SWTextEncoding encoding, SWTextDirection dir, SWTextMarkup markup, const char* ilang)
-		: RawVerse(ipath),
-            SWCom(iname, idesc, idisp, encoding, dir, markup, ilang){
-}
-
-
-/******************************************************************************
- * RawCom Destructor - Cleans up instance of RawCom
- */
-
-RawCom::~RawCom()
-{
-}
-
-
-/******************************************************************************
- * RawCom::getRawEntry()	- Returns the correct verse when char * cast
- *					is requested
- *
- * RET: string buffer with verse
- */
-
-SWBuf &RawCom::getRawEntryBuf() {
-	long  start = 0;
-	unsigned short size = 0;
-	VerseKey *key = &getVerseKey();
-
-	findOffset(key->Testament(), key->Index(), &start, &size);
-	entrySize = size;        // support getEntrySize call
-
-	entryBuf = "";
-	readText(key->Testament(), start, size, entryBuf);
-
-	rawFilter(entryBuf, 0);	// hack, decipher
-	rawFilter(entryBuf, key);
-
-//	if (!isUnicode())
-		prepText(entryBuf);
-
-	return entryBuf;
-}
-
-
-/******************************************************************************
- * RawCom::increment	- Increments module key a number of entries
- *
- * ENT:	steps	- Number of entries to jump forward
- *
- * RET: *this
- */
-
-void RawCom::increment(int steps) {
-	long  start;
-	unsigned short size;
-	VerseKey *tmpkey = &getVerseKey();
-
-	findOffset(tmpkey->Testament(), tmpkey->Index(), &start, &size);
-
-	SWKey lastgood = *tmpkey;
-	while (steps) {
-		long laststart = start;
-		unsigned short lastsize = size;
-		SWKey lasttry = *tmpkey;
-		(steps > 0) ? (*key)++ : (*key)--;
-		tmpkey = &getVerseKey();
-
-		if ((error = key->Error())) {
-			*key = lastgood;
-			break;
-		}
-		long index = tmpkey->Index();
-		findOffset(tmpkey->Testament(), index, &start, &size);
-		if (
-			(((laststart != start) || (lastsize != size))	// we're a different entry
-//				&& (start > 0)
-				&& (size))	// and we actually have a size
-				||(!skipConsecutiveLinks)) {	// or we don't want to skip consecutive links
-			steps += (steps < 0) ? 1 : -1;
-			lastgood = *tmpkey;
-		}
-	}
-	error = (error) ? KEYERR_OUTOFBOUNDS : 0;
-}
-
-
-void RawCom::setEntry(const char *inbuf, long len) {
-	VerseKey *key = &getVerseKey();
-	doSetText(key->Testament(), key->Index(), inbuf, len);
-}
-
-
-void RawCom::linkEntry(const SWKey *inkey) {
-	VerseKey *destkey = &getVerseKey();
-	const VerseKey *srckey = 0;
-
-	// see if we have a VerseKey * or decendant
-	try {
-		srckey = SWDYNAMIC_CAST(VerseKey, inkey);
-	}
-	catch ( ... ) {}
-	// if we don't have a VerseKey * decendant, create our own
-	if (!srckey)
-		srckey = new VerseKey(inkey);
-
-	doLinkEntry(destkey->Testament(), destkey->Index(), srckey->Index());
-
-	if (inkey != srckey) // free our key if we created a VerseKey
-		delete srckey;
-}
-
-
-/******************************************************************************
- * RawCom::deleteEntry	- deletes this entry
- *
- * RET: *this
- */
-
-void RawCom::deleteEntry() {
-
-	VerseKey *key = &getVerseKey();
-	doSetText(key->Testament(), key->Index(), "");
-}
-
-
-VerseKey &RawCom::getVerseKey() {
-	static VerseKey tmpVK;
-	VerseKey *key;
-	// see if we have a VerseKey * or decendant
-	try {
-		key = SWDYNAMIC_CAST(VerseKey, this->key);
-	}
-	catch ( ... ) {	}
-	if (!key) {
-		ListKey *lkTest = 0;
-		try {
-			lkTest = SWDYNAMIC_CAST(ListKey, this->key);
-		}
-		catch ( ... ) {	}
-		if (lkTest) {
-			try {
-				key = SWDYNAMIC_CAST(VerseKey, lkTest->GetElement());
-			}
-			catch ( ... ) {	}
-		}
-	}
-	if (!key) {
-		tmpVK = *(this->key);
-		return tmpVK;
-	}
-	else	return *key;
-}
-
-
-SWORD_NAMESPACE_END
diff --git a/src/modules/comments/rawcom/rtfidx.cpp b/src/modules/comments/rawcom/rtfidx.cpp
deleted file mode 100644
index 38b38bc..0000000
--- a/src/modules/comments/rawcom/rtfidx.cpp
+++ /dev/null
@@ -1,292 +0,0 @@
-/*****************************************************************************
- *
- *	This code wreaks but works (at least for MHC).  Good luck!
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-
-#ifndef __GNUC__
-#include <io.h>
-#else
-#include <unistd.h>
-#endif
-
-#include <fcntl.h>
-#include <versekey.h>
-
-
-void writeidx(VerseKey &key1, VerseKey &key2, VerseKey &key3, long offset, short size);
-char findbreak(int fp, long *offset, int *num1, int *num2, int *rangemax, short *size);
-void openfiles(char *fname);
-void checkparams(int argc, char **argv);
-
-
-VerseKey key1, key2, key3;
-int fp, vfp, cfp, bfp;
-long chapoffset;
-short chapsize;
-char testmnt;
-
-
-main(int argc, char **argv)
-{
-	long pos, offset;
-	int num1, num2, rangemax, curbook = 0, curchap = 0, curverse = 0;
-	char buf[127], startflag = 0;
-	short size, tmp;
-
-	checkparams(argc, argv);
-
-	openfiles(argv[1]);
-
-	testmnt = key1.Testament();
-	pos  = 0;
-	write(bfp, &pos, 4);  /* Book    offset for testament intros */
-	pos = 4;
-	write(cfp, &pos, 4);  /* Chapter offset for testament intro */
-
-
-/*	Right now just zero out intros until parsing correctly */
-	pos = 0;
-	size = 0;
-	write(vfp, &pos, 4);  /* Module intro */
-	write(vfp, &size, 2);
-	write(vfp, &pos, 4);  /* Testament intro */
-	write(vfp, &size, 2);
-
-	while(!findbreak(fp, &offset, &num1, &num2, &rangemax, &size)) {
-		if (num2) {				
-			key2.Verse(1);
-			key2.Chapter(num1);
-			key2.Verse(num2);
-		}
-		else {
-			key2.Verse(1);
-			if (!startflag) {
-				startflag = 1;
-			}
-			else {
-				if (num1 <= key2.Chapter()) { // new book
-					key2.Chapter(1);
-					key2.Book(key2.Book()+1);
-				}
-			}
-			key2.Chapter(num1);
-			printf("Found Chapter Break: %d ('%s')\n", num1, (char *)key2);
-			chapoffset = offset;
-			chapsize = size;
-			continue;
-		}
-
-		key3 = key2;
-		key3 += (rangemax - key3.Verse());
-
-		writeidx(key1, key2, key3, offset, size);
-	}
-	close(vfp);
-	close(cfp);
-	close(bfp);
-	close(fp);
-}
-
-
-/**************************************************************************
- * ENT:	key1	- current location of index
- * 	key2	- minimum keyval for which this offset is valid
- * 	key3	- maximum keyval for which this offset is valid
- */
-
-void writeidx(VerseKey &key1, VerseKey &key2, VerseKey &key3, long offset, short size)
-{
-	long pos;
-	short tmp;
-
-	for (; ((key1 <= key3) && (key1.Error() != KEYERR_OUTOFBOUNDS) && (key1.Testament() == testmnt)); key1+=1) {
-		if (key1.Verse() == 1) {	// new chapter
-			if (key1.Chapter() == 1) {	// new book
-				pos = lseek(cfp, 0, SEEK_CUR);
-				write(bfp, &pos, 4);
-				pos = lseek(vfp, 0, SEEK_CUR); /* Book intro (cps) */
-				write(cfp, &pos, 4);
-				write(vfp, &chapoffset, 4);  /* Book intro (vss)  set to same as chap for now(it should be chap 1 which usually contains the book into anyway)*/
-				write(vfp, &chapsize, 2);
-			}
-			pos = lseek(vfp, 0, SEEK_CUR);
-			write(cfp, &pos, 4);
-			write(vfp, &chapoffset, 4);  /* Chapter intro */
-			write(vfp, &chapsize, 2);
-		}
-		if (key1 >= key2) {
-			write(vfp, &offset, 4);
-			write(vfp, &size, 2);
-		}
-		else	{
-			pos = 0;
-			tmp = 0;
-			write(vfp, &pos, 4);
-			write(vfp, &tmp, 2);
-		}
-	}
-}
-
-
-char startentry(char *buf)
-{
-	char loop;
-
-	if (buf[0] != 10)
-		return 0;
-	if (buf[1] != '#')
-		return 0;
-	if (!isdigit(buf[2]))
-		return 0;
-	for (loop = 3; loop < 7; loop++) {
-		if (buf[loop] == ' ')
-			break;
-		if ((!isdigit(buf[loop])) && (buf[loop] != ',') && (buf[loop] != '-'))
-			return 0;
-	}
-	return 1;
-}
-
-
-char findbreak(int fp, long *offset, int *num1, int *num2, int *rangemax, short *size)
-{
-	char buf[7];
-	char buf2[20];
-	char ch;
-	char loop;
-	long offset2;
-	int ch2, vs2, rm2;
-	
-	memset(buf, ' ', 7);
-
-	while (1) {
-		if (startentry(buf)) {
-			memset(buf, ' ', 2);
-			for (loop = 2; loop < 7; loop++) {
-				if ((buf[loop] == '-') || (buf[loop] == ',') || (buf[loop] == ' ')) {
-					buf[loop] = 0;
-					*num2 = atoi(buf);
-					break;
-				}
-			}
-			for (ch = loop + 1; ch < 7; ch++) {
-				if (buf[ch] == ' ') {
-					break;
-				}
-			}
-			buf[ch] = 0;
-			*rangemax = atoi(&buf[loop+1]);
-			if (!*rangemax)
-				*rangemax = *num2;
-			*offset = lseek(fp, 0, SEEK_CUR) - 5;
-			if (size) {
-				if (findbreak(fp, &offset2, &ch2, &vs2, &rm2, 0)) {
-					*size = (short) (lseek(fp, 0, SEEK_END) - (*offset));
-				}
-				else {
-					if (vs2) {
-						*size = (offset2 - (*offset)) - 3;
-					}
-					else {
-						sprintf(buf2, "$-$-$- XX:%d", ch2);
-						*size = (offset2 - (*offset)) - ((strlen(buf2) + 4));
-					}
-				}
-				lseek(fp, *offset, SEEK_SET);
-			}
-			return 0;
-		}
-					
-		if (!strncmp(buf, "$-$-$-", 6)) {
-			memset(buf2, 0, 7);
-			loop = 0;
-			while ((read(fp, &buf2[loop], 1) == 1) && (loop < 7)) {
-				if ((buf2[loop] == 10) || (buf2[loop] == 13)) {
-					buf2[loop] = 0;
-					break;
-				}
-				loop++;
-			}
-			while (read(fp, &ch, 1) == 1) {
-				if (ch == '*')
-					break;
-			}
-			
-			*offset = lseek(fp, 0, SEEK_CUR) - 1;
-			*num2 = 0;
-			for (loop = strlen(buf2) - 1; loop; loop--) {
-				if (buf2[loop] == ':')
-					break;
-			}
-			*num1 = atoi(&buf2[loop+1]);
-			printf("Chapter marker: %s\n", buf2);
-			if (size) {
-				if (findbreak(fp, &offset2, &ch2, &vs2, &rm2, 0)) {
-					*size = (short) (lseek(fp, 0, SEEK_END) - (*offset));
-				}
-				else {
-					if (vs2) {
-						*size = (offset2 - (*offset)) - 3;
-					}
-					else {
-						sprintf(buf2, "$-$-$- XX:%d", ch2);
-						*size = (offset2 - (*offset)) - ((strlen(buf2) + 4));
-					}
-				}
-				lseek(fp, *offset, SEEK_SET);
-			}
-			return 0;
-		}
-				 
-				
-		memmove(buf, &buf[1], 6);
-		if (read(fp, &buf[6], 1) != 1)
-			return 1;
-	}
-}
-
-
-void openfiles(char *fname)
-{
-	char buf[255];
-
-	if ((fp = open(fname, O_RDONLY)) == -1) {
-		fprintf(stderr, "Couldn't open file: %s\n", fname);
-		exit(1);
-	}
-
-	sprintf(buf, "%s.vss", fname);
-	if ((vfp = open(buf, O_CREAT|O_WRONLY)) == -1) {
-		fprintf(stderr, "Couldn't open file: %s\n", buf);
-		exit(1);
-	}
-
-	sprintf(buf, "%s.cps", fname);
-	if ((cfp = open(buf, O_CREAT|O_WRONLY)) == -1) {
-		fprintf(stderr, "Couldn't open file: %s\n", buf);
-		exit(1);
-	}
-
-	sprintf(buf, "%s.bks", fname);
-	if ((bfp = open(buf, O_CREAT|O_WRONLY)) == -1) {
-		fprintf(stderr, "Couldn't open file: %s\n", buf);
-		exit(1);
-	}
-}
-
-
-void checkparams(int argc, char **argv)
-{
-	if (argc < 2) {
-		fprintf(stderr, "usage: %s <file to process> [nt - for new testmt file]\n", argv[0]);
-		exit(1);
-	}
-	if (argc == 3)
-		key1 = key2 = key3 = "Matthew 1:1";
-	else	key1 = key2 = key3 = "Genesis 1:1";
-}
diff --git a/src/modules/comments/rawcom/rwpidx.cpp b/src/modules/comments/rawcom/rwpidx.cpp
deleted file mode 100644
index afcbd81..0000000
--- a/src/modules/comments/rawcom/rwpidx.cpp
+++ /dev/null
@@ -1,266 +0,0 @@
-/*****************************************************************************
- *
- *	This code wreaks but works (at least for RWP).  Good luck!
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-
-#ifndef __GNUC__
-#include <io.h>
-#else
-#include <unistd.h>
-#endif
-
-#include <fcntl.h>
-#include <versekey.h>
-
-
-void writeidx(VerseKey &key1, VerseKey &key2, VerseKey &key3, long offset, short size);
-char findbreak(int fp, long *offset, int *num1, int *num2, int *rangemax, short *size);
-void openfiles(char *fname);
-void checkparams(int argc, char **argv);
-
-
-VerseKey key1, key2, key3;
-int fp, vfp, cfp, bfp;
-long chapoffset;
-short chapsize;
-char testmnt;
-
-
-main(int argc, char **argv)
-{
-	long pos, offset;
-	int num1 = 0, num2 = 0, rangemax, curbook = 0, curchap = 0, curverse = 0;
-	char buf[127], startflag = 0;
-	short size, tmp;
-
-	checkparams(argc, argv);
-
-	openfiles(argv[1]);
-
-	testmnt = key1.Testament();
-	pos  = 0;
-	write(bfp, &pos, 4);  /* Book    offset for testament intros */
-	pos = 4;
-	write(cfp, &pos, 4);  /* Chapter offset for testament intro */
-
-
-/*	Right now just zero out intros until parsing correctly */
-	pos = 0;
-	size = 0;
-	write(vfp, &pos, 4);  /* Module intro */
-	write(vfp, &size, 2);
-	write(vfp, &pos, 4);  /* Testament intro */
-	write(vfp, &size, 2);
-
-	while(!findbreak(fp, &offset, &num1, &num2, &rangemax, &size)) {
-		if (num2) {				
-			key2.Verse(1);
-			key2.Chapter(num1);
-			key2.Verse(num2);
-		}
-		else {
-			key2.Verse(1);
-			if (!startflag) {
-				startflag = 1;
-			}
-			else {
-				if (num1 <= key2.Chapter()) { // new book
-					key2.Chapter(1);
-					key2.Book(key2.Book()+1);
-				}
-			}
-			key2.Chapter(num1);
-			printf("Found Chapter Break: %d ('%s')\n", num1, (const char *)key2);
-			chapoffset = offset;
-			chapsize = size;
-			continue;
-		}
-
-		key3 = key2;
-		key3 += (rangemax - key3.Verse());
-
-		printf("Found verse Break: ('%s')\n", (const char *)key2);
-		writeidx(key1, key2, key3, offset, size);
-	}
-	close(vfp);
-	close(cfp);
-	close(bfp);
-	close(fp);
-}
-
-
-/**************************************************************************
- * ENT:	key1	- current location of index
- * 	key2	- minimum keyval for which this offset is valid
- * 	key3	- maximum keyval for which this offset is valid
- */
-
-void writeidx(VerseKey &key1, VerseKey &key2, VerseKey &key3, long offset, short size)
-{
-	long pos;
-	short tmp;
-
-	for (; ((key1 <= key3) && (key1.Error() != KEYERR_OUTOFBOUNDS) && (key1.Testament() == testmnt)); key1+=1) {
-		if (key1.Verse() == 1) {	// new chapter
-			if (key1.Chapter() == 1) {	// new book
-				pos = lseek(cfp, 0, SEEK_CUR);
-				write(bfp, &pos, 4);
-				pos = lseek(vfp, 0, SEEK_CUR); /* Book intro (cps) */
-				write(cfp, &pos, 4);
-				write(vfp, &chapoffset, 4);  /* Book intro (vss)  set to same as chap for now(it should be chap 1 which usually contains the book into anyway)*/
-				write(vfp, &chapsize, 2);
-			}
-			pos = lseek(vfp, 0, SEEK_CUR);
-			write(cfp, &pos, 4);
-			write(vfp, &chapoffset, 4);  /* Chapter intro */
-			write(vfp, &chapsize, 2);
-		}
-		if (key1 >= key2) {
-			write(vfp, &offset, 4);
-			write(vfp, &size, 2);
-		}
-		else	{
-			pos = 0;
-			tmp = 0;
-			write(vfp, &pos, 4);
-			write(vfp, &tmp, 2);
-		}
-	}
-}
-
-
-char startentry(char *buf)
-{
-	char colon = 0;
-
-	if (buf[0] != 10)
-		return 0;
-	if (buf[1] != 10)
-		return 0;
-	if (!isdigit(buf[2]))
-		return 0;
-	if (!isdigit(buf[3])) {
-		if (buf[3]!= ':')
-			return 0;
-		else	colon++;
-	}
-	if (!isdigit(buf[4])) {
-		if (buf[4]!= ':')
-			return 0;
-		else	colon++;
-	}
-	if (colon != 1)
-		return 0;
-	return 1;
-}
-
-
-char findbreak(int fp, long *offset, int *num1, int *num2, int *rangemax, short *size)
-{
-	char buf[7];
-	char buf2[20];
-	char ch;
-	char loop;
-	long offset2;
-	int ch2, vs2, rm2;
-	
-	memset(buf, ' ', 7);
-
-	while (1) {
-		if (startentry(buf)) {
-			buf[0] = ' ';
-			buf[1] = ' ';
-			sscanf(buf, "%d:%d", num1, num2);
-			*rangemax = *num2;
-			*offset = lseek(fp, 0, SEEK_CUR) - 5;
-			if (size) {
-				if (findbreak(fp, &offset2, &ch2, &vs2, &rm2, 0)) {
-					*size = (short) (lseek(fp, 0, SEEK_END) - (*offset));
-				}
-				else {
-					if (vs2) {
-						*size = (offset2 - (*offset)) - 2;
-					}
-					else {
-						*size = (offset2 - (*offset)) - 6;
-					}
-				}
-				lseek(fp, *offset, SEEK_SET);
-			}
-			return 0;
-		}
-					
-		if (!strncmp(buf, "$-$-$-", 6)) {
-			*offset = lseek(fp, 0, SEEK_CUR) - 1;
-			*num2 = 0;
-			(*num1)++;
-			printf("Book marker: %s\n", buf2);
-			if (size) {
-				if (findbreak(fp, &offset2, &ch2, &vs2, &rm2, 0)) {
-					*size = (short) (lseek(fp, 0, SEEK_END) - (*offset));
-				}
-				else {
-					if (vs2) {
-						*size = (offset2 - (*offset)) - 2;
-					}
-					else {
-						*size = (offset2 - (*offset)) - 6;
-					}
-				}
-				lseek(fp, *offset, SEEK_SET);
-			}
-			return 0;
-		}
-				 
-				
-		memmove(buf, &buf[1], 6);
-		if (read(fp, &buf[6], 1) != 1)
-			return 1;
-	}
-}
-
-
-void openfiles(char *fname)
-{
-	char buf[255];
-
-	if ((fp = open(fname, O_RDONLY)) == -1) {
-		fprintf(stderr, "Couldn't open file: %s\n", fname);
-		exit(1);
-	}
-
-	sprintf(buf, "%s.vss", fname);
-	if ((vfp = open(buf, O_CREAT|O_WRONLY)) == -1) {
-		fprintf(stderr, "Couldn't open file: %s\n", buf);
-		exit(1);
-	}
-
-	sprintf(buf, "%s.cps", fname);
-	if ((cfp = open(buf, O_CREAT|O_WRONLY)) == -1) {
-		fprintf(stderr, "Couldn't open file: %s\n", buf);
-		exit(1);
-	}
-
-	sprintf(buf, "%s.bks", fname);
-	if ((bfp = open(buf, O_CREAT|O_WRONLY)) == -1) {
-		fprintf(stderr, "Couldn't open file: %s\n", buf);
-		exit(1);
-	}
-}
-
-
-void checkparams(int argc, char **argv)
-{
-	if (argc < 2) {
-		fprintf(stderr, "usage: %s <file to process> [nt - for new testmt file]\n", argv[0]);
-		exit(1);
-	}
-	if (argc == 3)
-		key1 = key2 = key3 = "Matthew 1:1";
-	else	key1 = key2 = key3 = "Genesis 1:1";
-}
diff --git a/src/modules/comments/rawfiles/Makefile b/src/modules/comments/rawfiles/Makefile
deleted file mode 100644
index 35d6648..0000000
--- a/src/modules/comments/rawfiles/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-
-root := ../../../..
-
-all:
-	make -C ${root}
diff --git a/src/modules/comments/rawfiles/Makefile.am b/src/modules/comments/rawfiles/Makefile.am
deleted file mode 100644
index 53aadbe..0000000
--- a/src/modules/comments/rawfiles/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-rawfilesdir = $(top_srcdir)/src/modules/comments/rawfiles
-
-libsword_la_SOURCES += $(rawfilesdir)/rawfiles.cpp
diff --git a/src/modules/comments/rawfiles/rawfiles.cpp b/src/modules/comments/rawfiles/rawfiles.cpp
deleted file mode 100644
index 9ffa00f..0000000
--- a/src/modules/comments/rawfiles/rawfiles.cpp
+++ /dev/null
@@ -1,269 +0,0 @@
-/******************************************************************************
- *  rawfiles.cpp - code for class 'RawFiles'- a module that produces HTML HREFs
- *			pointing to actual text desired.  Uses standard
- *			files:	ot and nt using indexs ??.bks ??.cps ??.vss
- */
-
-
-#include <ctype.h>
-#include <stdio.h>
-#include <fcntl.h>
-
-#ifndef __GNUC__
-#include <io.h>
-#else
-#include <unistd.h>
-#endif
-
-#include <utilfuns.h>
-#include <rawverse.h>
-#include <rawfiles.h>
-#include <filemgr.h>
-
-#ifndef O_BINARY                // O_BINARY is needed in Borland C++ 4.53
-#define O_BINARY 0              // If it hasn't been defined than we probably
-#endif                          // don't need it.
-
-SWORD_NAMESPACE_START
-
- /******************************************************************************
- * RawFiles Constructor - Initializes data for instance of RawFiles
- *
- * ENT:	iname - Internal name for module
- *	idesc - Name to display to user for module
- *	idisp	 - Display object to use for displaying
- */
-
-RawFiles::RawFiles(const char *ipath, const char *iname, const char *idesc, SWDisplay *idisp, SWTextEncoding enc, SWTextDirection dir, SWTextMarkup mark, const char* ilang) : RawVerse(ipath, O_RDWR), SWCom(iname, idesc, idisp, enc, dir, mark, ilang)
-{
-}
-
-
-/******************************************************************************
- * RawFiles Destructor - Cleans up instance of RawFiles
- */
-
-RawFiles::~RawFiles()
-{
-}
-
-
-/******************************************************************************
- * RawFiles::getRawEntry	- Returns the correct verse when char * cast
- *					is requested
- *
- * RET: string buffer with verse
- */
-
-SWBuf &RawFiles::getRawEntryBuf() {
-	FileDesc *datafile;
-	long  start = 0;
-	unsigned short size = 0;
-	char *tmpbuf;
-	VerseKey *key = 0;
-
-#ifndef _WIN32_WCE
-	try {
-#endif
-		key = SWDYNAMIC_CAST(VerseKey, this->key);
-#ifndef _WIN32_WCE
-	}
-	catch ( ... ) {}
-#endif
-	if (!key)
-		key = new VerseKey(this->key);
-
-	findOffset(key->Testament(), key->Index(), &start, &size);
-
-	entryBuf = "";
-	if (size) {
-		SWBuf tmpbuf = path;
-		tmpbuf += '/';
-		readText(key->Testament(), start, size, entryBuf);
-		tmpbuf += entryBuf;
-		entryBuf = "";
-		datafile = FileMgr::systemFileMgr.open(tmpbuf.c_str(), O_RDONLY|O_BINARY);
-		if (datafile->getFd() > 0) {
-			size = lseek(datafile->getFd(), 0, SEEK_END);
-			char *tmpBuf = new char [ size + 1 ];
-			memset(tmpBuf, 0, size + 1);
-			lseek(datafile->getFd(), 0, SEEK_SET);
-			read(datafile->getFd(), tmpBuf, size);
-			entryBuf = tmpBuf;
-			delete [] tmpBuf;
-//			preptext(entrybuf);
-		}
-		FileMgr::systemFileMgr.close(datafile);
-	}
-
-	if (key != this->key)
-		delete key;
-
-	return entryBuf;
-}
-
-
-/******************************************************************************
- * RawFiles::setEntry(char *)- Update the modules current key entry with
- *				provided text
- */
-
-void RawFiles::setEntry(const char *inbuf, long len) {
-	FileDesc *datafile;
-	long  start;
-	unsigned short size;
-	VerseKey *key = 0;
-
-	len = (len<0)?strlen(inbuf):len;
-	try {
-		key = SWDYNAMIC_CAST(VerseKey, this->key);
-	}
-	catch ( ... ) {}
-	if (!key)
-		key = new VerseKey(this->key);
-
-	findOffset(key->Testament(), key->Index(), &start, &size);
-
-	if (size) {
-		SWBuf tmpbuf;
-		entryBuf = path;
-		entryBuf += '/';
-		readText(key->Testament(), start, size, tmpbuf);
-		entryBuf += tmpbuf;
-	}
-	else {
-		SWBuf tmpbuf;
-		entryBuf = path;
-		entryBuf += '/';
-		tmpbuf = getNextFilename();
-		doSetText(key->Testament(), key->Index(), tmpbuf);
-		entryBuf += tmpbuf;
-	}
-	datafile = FileMgr::systemFileMgr.open(entryBuf, O_CREAT|O_WRONLY|O_BINARY|O_TRUNC);
-	if (datafile->getFd() > 0) {
-		write(datafile->getFd(), inbuf, len);
-	}
-	FileMgr::systemFileMgr.close(datafile);
-	
-	if (key != this->key)
-		delete key;
-}
-
-
-/******************************************************************************
- * RawFiles::linkEntry(SWKey *)- Link the modules current key entry with
- *				another module entry
- *
- * RET: *this
- */
-
-void RawFiles::linkEntry(const SWKey *inkey) {
-
-	long  start;
-	unsigned short size;
-	char *tmpbuf;
-	const VerseKey *key = 0;
-
-	try {
-		key = SWDYNAMIC_CAST(VerseKey, inkey);
-	}
-	catch ( ... ) {}
-	if (!key)
-		key = new VerseKey(this->key);
-
-	findOffset(key->Testament(), key->Index(), &start, &size);
-
-	if (size) {
-		SWBuf tmpbuf;
-		readText(key->Testament(), start, size + 2, tmpbuf);
-
-		if (key != inkey)
-			delete key;
-		key = 0;
-
-		try {
-			key = SWDYNAMIC_CAST(VerseKey, inkey);
-		}
-		catch ( ... ) {}
-		if (!key)
-			key = new VerseKey(this->key);
-		doSetText(key->Testament(), key->Index(), tmpbuf.c_str());
-	}
-	
-	if (key != inkey)
-		delete key;
-}
-
-
-/******************************************************************************
- * RawFiles::deleteEntry	- deletes this entry
- *
- * RET: *this
- */
-
-void RawFiles::deleteEntry() {
-
-	VerseKey *key = 0;
-
-#ifndef _WIN32_WCE
-	try {
-#endif
-		key = SWDYNAMIC_CAST(VerseKey, this->key);
-#ifndef _WIN32_WCE
-	}
-	catch ( ... ) {}
-#endif
-	if (!key)
-		key = new VerseKey(this->key);
-
-	doSetText(key->Testament(), key->Index(), "");
-
-	if (key != this->key)
-		delete key;
-}
-
-
-/******************************************************************************
- * RawFiles::getNextfilename - generates a valid filename in which to store
- *				an entry
- *
- * RET: filename
- */
-
-char *RawFiles::getNextFilename() {
-	static char incfile[255];
-	long number;
-	FileDesc *datafile;
-
-	sprintf(incfile, "%s/incfile", path);
-	datafile = FileMgr::systemFileMgr.open(incfile, O_RDONLY|O_BINARY);
-	if (read(datafile->getFd(), &number, 4) != 4)
-		number = 0;
-	number++;
-	FileMgr::systemFileMgr.close(datafile);
-	
-	datafile = FileMgr::systemFileMgr.open(incfile, O_CREAT|O_WRONLY|O_BINARY|O_TRUNC);
-	write(datafile->getFd(), &number, 4);
-	FileMgr::systemFileMgr.close(datafile);
-	sprintf(incfile, "%.7ld", number-1);
-	return incfile;
-}
-
-
-char RawFiles::createModule (const char *path) {
-	char *incfile = new char [ strlen (path) + 16 ];
-    static long zero = 0;
-	FileDesc *datafile;
-
-	sprintf(incfile, "%s/incfile", path);
-	datafile = FileMgr::systemFileMgr.open(incfile, O_CREAT|O_WRONLY|O_BINARY|O_TRUNC);
-    delete [] incfile;
-	write(datafile->getFd(), &zero, 4);
-	FileMgr::systemFileMgr.close(datafile);
-
-    return RawVerse::createModule (path);
-}
-
-
-
-SWORD_NAMESPACE_END
diff --git a/src/modules/comments/rawfiles/rawfilesgen.cpp b/src/modules/comments/rawfiles/rawfilesgen.cpp
deleted file mode 100644
index f60c9e2..0000000
--- a/src/modules/comments/rawfiles/rawfilesgen.cpp
+++ /dev/null
@@ -1,236 +0,0 @@
-/*****************************************************************************
- *
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-
-#ifndef __GNUC__
-#include <io.h>
-#else
-#include <unistd.h>
-#endif
-
-#include <fcntl.h>
-#include <versekey.h>
-
-#ifndef O_BINARY
-	#define O_BINARY 0
-#endif
-
-void writeidx(VerseKey &key1, VerseKey &key2, VerseKey &key3, long offset, short size);
-char findbreak(int fp, long *offset, int *num1, int *num2, int *rangemax, short *size);
-void openfiles();
-void checkparams(int argc, char **argv);
-void charsetconvert(char *data);
-
-
-VerseKey key1, key2, key3;
-int fp, vfp, cfp, bfp;
-long chapoffset;
-short chapsize;
-char testmnt;
-char startflag = 0;
-
-
-main(int argc, char **argv)
-{
-	long pos, offset;
-	int num1, num2, rangemax, curbook = 0, curchap = 0, curverse = 0;
-	char buf[127];
-	short size, tmp;
-	extern struct zonline online;
-
-	checkparams(argc, argv);
-
-	key1 = key2 = key3 = "Genesis 1:1";
-
-	openfiles();
-
-	num1    = key1.Chapter();
-	num2    = key1.Verse();
-
-	while(!findbreak(fp, &offset, &num1, &num2, &rangemax, &size)) {
-		if (!startflag) {
-			startflag = 1;
-		}
-		else {
-			if (num2 < key2.Verse()) {            // new chapter
-				if (num1 <= key2.Chapter()) { // new book
-					key2.Verse(1);
-					key2.Chapter(1);
-					key2.Book(key2.Book()+1);
-				}
-				printf("Created Empty Entry: %d ('%s')\n", num1, (const char *)key2);
-				chapoffset = offset;
-				chapsize = size;
-//				continue;
-			}
-		}
-		key2.Verse(1);
-		key2.Chapter(num1);
-		key2.Verse(num2);
-
-		key3 = key2;
-//		key3 += (rangemax - key3.Verse());
-
-		writeidx(key1, key2, key3, offset, size);
-	}
-	close(vfp);
-	close(cfp);
-	close(bfp);
-	close(fp);
-}
-
-
-/**************************************************************************
- * ENT:	key1	- current location of index
- * 	key2	- minimum keyval for which this offset is valid
- * 	key3	- maximum keyval for which this offset is valid
- */
-
-void writeidx(VerseKey &key1, VerseKey &key2, VerseKey &key3, long offset, short size)
-{
-	long pos;
-	short tmp;
-
-		if (key1.Verse() == 1) {	// new chapter
-			if (key1.Chapter() == 1) {	// new book
-				pos = lseek(cfp, 0, SEEK_CUR);
-				write(bfp, &pos, 4);
-				pos = lseek(vfp, 0, SEEK_CUR); /* Book intro (cps) */
-				write(cfp, &pos, 4);
-				write(vfp, &chapoffset, 4);  /* Book intro (vss)  set to same as chap for now(it should be chap 1 which usually contains the book into anyway)*/
-				write(vfp, &chapsize, 2);
-			}
-			pos = lseek(vfp, 0, SEEK_CUR);
-			write(cfp, &pos, 4);
-			write(vfp, &chapoffset, 4);  /* Chapter intro */
-			write(vfp, &chapsize, 2);
-		}
-		if (key1 >= key2) {
-			write(vfp, &offset, 4);
-			size = 0;
-			write(vfp, &size, 2);
-		}
-		else	{
-			pos = 0;
-			tmp = 0;
-			write(vfp, &pos, 4);
-			write(vfp, &tmp, 2);
-		}
-		key1++;
-}
-
-
-static VerseKey inckey = "Genesis 1:1";
-
-char findbreak(int fp, long *offset, int *num1, int *num2, int *rangemax, short *size)
-{
-	char buf[7];
-	char buf2[20];
-	char ch;
-	char loop;
-	long offset2;
-	int ch2, vs2, rm2;
-	bool flag;
-	long chapstart = 0; 
-	static int olbvnum = 0;
-	char data[16];
-
-	memset (data,0,16);
-
-	if (++olbvnum <= 31102) {
-
-		if (olbvnum == 23146) {	// "Matthew 1:1"	
-			close(vfp);
-			close(cfp);
-			close(bfp);
-			close(fp);
-			key1 = key2 = key3 = inckey = "Matthew 1:1";
-			openfiles();
-			startflag = 0;
-		}
-
-
-		*offset = lseek(fp, 0, SEEK_CUR);
-
-		if ((olbvnum!=1) && (olbvnum != 23146))
-			inckey++;
-			
-		*num1 = inckey.Chapter();
-		*num2 = inckey.Verse();
-	
-		
-		write(fp, data, 16);
-
-		*size = lseek(fp, 0, SEEK_CUR) - *offset;
-		return 0;
-	}
-	return 1;
-}
-
-
-void openfiles()
-{
-	char buf[255];
-	char fname[5];
-	long pos;
-	short size;
-	
-	testmnt = key1.Testament();
-
-	strcpy(fname, (testmnt==2) ? "nt" : "ot");
-	unlink(fname);
-	if ((fp = open(fname, O_CREAT|O_RDWR|O_BINARY)) == -1) {
-		fprintf(stderr, "Couldn't open file: %s\n", fname);
-		exit(1);
-	}
-
-	sprintf(buf, "%s.vss", fname);
-	unlink(buf);
-	if ((vfp = open(buf, O_CREAT|O_WRONLY|O_BINARY)) == -1) {
-		fprintf(stderr, "Couldn't open file: %s\n", buf);
-		exit(1);
-	}
-
-	sprintf(buf, "%s.cps", fname);
-	unlink(buf);
-	if ((cfp = open(buf, O_CREAT|O_WRONLY|O_BINARY)) == -1) {
-		fprintf(stderr, "Couldn't open file: %s\n", buf);
-		exit(1);
-	}
-
-	sprintf(buf, "%s.bks", fname);
-	unlink(buf);
-	if ((bfp = open(buf, O_CREAT|O_WRONLY|O_BINARY)) == -1) {
-		fprintf(stderr, "Couldn't open file: %s\n", buf);
-		exit(1);
-	}
-
-	pos  = 0;
-	write(bfp, &pos, 4);  /* Book    offset for testament intros */
-	pos = 4;
-	write(cfp, &pos, 4);  /* Chapter offset for testament intro */
-
-
-/*	Right now just zero out intros until parsing correctly */
-	pos = 0;
-	size = 0;
-	write(vfp, &pos, 4);  /* Module intro */
-	write(vfp, &size, 2);
-	write(vfp, &pos, 4);  /* Testament intro */
-	write(vfp, &size, 2);
-
-}
-
-
-void checkparams(int argc, char **argv)
-{
-	if (argc !=1) {
-		fprintf(stderr, "usage: %s\n", argv[0]);
-		exit(1);
-	}
-}
diff --git a/src/modules/comments/swcom.cpp b/src/modules/comments/swcom.cpp
deleted file mode 100644
index 3f2b940..0000000
--- a/src/modules/comments/swcom.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-/******************************************************************************
- *  swcom.cpp  - code for base class 'SWCom'- The basis for all commentary
- *			modules
- */
-
-#include <swcom.h>
-
-SWORD_NAMESPACE_START
-
-/******************************************************************************
- * SWCom Constructor - Initializes data for instance of SWCom
- *
- * ENT:	imodname - Internal name for module
- *	imoddesc - Name to display to user for module
- *	idisp	 - Display object to use for displaying
- */
-
-SWCom::SWCom(const char *imodname, const char *imoddesc, SWDisplay *idisp, SWTextEncoding enc, SWTextDirection dir, SWTextMarkup mark, const char* ilang): SWModule(imodname, imoddesc, idisp, "Commentaries", enc, dir, mark, ilang)
-{
-	delete key;
-	key = CreateKey();
-}
-
-
-/******************************************************************************
- * SWCom Destructor - Cleans up instance of SWCom
- */
-
-SWCom::~SWCom()
-{
-}
-
-
-long SWCom::Index() const {
-	VerseKey *key = 0;
-	try {
-		key = SWDYNAMIC_CAST(VerseKey, this->key);
-	}
-	catch ( ... ) {}
-	if (!key)
-		key = new VerseKey(this->key);
-
-	entryIndex = key->NewIndex();
-
-	if (key != this->key)
-		delete key;
-
-	return entryIndex;
-}
-
-long SWCom::Index(long iindex) {
-	VerseKey *key = 0;
-	try {
-		key = SWDYNAMIC_CAST(VerseKey, this->key);
-	}
-	catch ( ... ) {}
-	if (!key)
-		key = new VerseKey(this->key);
-
-	key->Testament(1);
-	key->Index(iindex);
-
-	if (key != this->key) {
-		this->key->copyFrom(*key);
-		delete key;
-	}
-
-	return Index();
-}
-
-SWORD_NAMESPACE_END
diff --git a/src/modules/comments/zcom/Makefile b/src/modules/comments/zcom/Makefile
deleted file mode 100644
index 35d6648..0000000
--- a/src/modules/comments/zcom/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-
-root := ../../../..
-
-all:
-	make -C ${root}
diff --git a/src/modules/comments/zcom/Makefile.am b/src/modules/comments/zcom/Makefile.am
deleted file mode 100644
index ad1ef6a..0000000
--- a/src/modules/comments/zcom/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-zcomdir = $(top_srcdir)/src/modules/comments/zcom
-
-libsword_la_SOURCES += $(zcomdir)/zcom.cpp
-
diff --git a/src/modules/comments/zcom/makeidx.c b/src/modules/comments/zcom/makeidx.c
deleted file mode 100644
index 311103e..0000000
--- a/src/modules/comments/zcom/makeidx.c
+++ /dev/null
@@ -1,146 +0,0 @@
-#include <stdio.h>
-#include <fcntl.h>
-
-
-char findbreak(int fp, int *offset, int *num1, int *num2, short *size);
-
-
-main(int argc, char **argv)
-{
-	int fp, vfp, cfp, bfp;
-	long pos;
-	short size, tmp;
-	int num1, num2, offset, curbook = 0, curchap = 0, curverse = 0;
-	char buf[127];
-
-	if (argc != 2) {
-		fprintf(stderr, "usage: %s <file to process>\n", argv[0]);
-		exit(1);
-	}
-
-	if ((fp = open(argv[1], O_RDONLY)) == -1) {
-		fprintf(stderr, "Couldn't open file: %s\n", argv[1]);
-		exit(1);
-	}
-
-	sprintf(buf, "%s.vss", argv[1]);
-	if ((vfp = open(buf, O_CREAT|O_WRONLY)) == -1) {
-		fprintf(stderr, "Couldn't open file: %s\n", buf);
-		exit(1);
-	}
-
-	sprintf(buf, "%s.cps", argv[1]);
-	if ((cfp = open(buf, O_CREAT|O_WRONLY)) == -1) {
-		fprintf(stderr, "Couldn't open file: %s\n", buf);
-		exit(1);
-	}
-
-	sprintf(buf, "%s.bks", argv[1]);
-	if ((bfp = open(buf, O_CREAT|O_WRONLY)) == -1) {
-		fprintf(stderr, "Couldn't open file: %s\n", buf);
-		exit(1);
-	}
-
-	pos  = 0;
-	write(bfp, &pos, 4);  /* Book    offset for testament intros */
-	pos = 4;
-	write(cfp, &pos, 4);  /* Chapter offset for testament intro */
-
-
-/*	Right now just zero out intros until parsing correctly */
-	pos = 0;
-	size = 0;
-	write(vfp, &pos, 4);  /* Module intro */
-	write(vfp, &size, 2);
-	write(vfp, &pos, 4);  /* Testament intro */
-	write(vfp, &size, 2);
-
-	while (!findbreak(fp, &offset, &num1, &num2, &size)) {
-
-		if (num2 == 1) {  		/* if we're at a new chapter */
-			if (num1 == 1) {	/* if we're at a new book */
-				pos = lseek(cfp, 0, SEEK_CUR);
-				write(bfp, &pos, 4);
-				pos = lseek(vfp, 0, SEEK_CUR); /* Book intro (cps) */
-				write(cfp, &pos, 4);
-				pos  = 0;
-				tmp = 0;
-				write(vfp, &pos, 4);  /* Book intro (vss) */
-				write(vfp, &tmp, 2);
-				curbook++;
-				curchap = 0;
-			}
-			pos = lseek(vfp, 0, SEEK_CUR);
-			write(cfp, &pos, 4);
-			curverse = 1;
-			pos  = 0;
-			tmp = 0;
-			write(vfp, &pos, 4);  /* Chapter intro */
-			write(vfp, &tmp, 2);
-			curchap++;
-		}
-		else curverse++;
-	
-		printf("%2d:%3d:%3d found at offset: %7d\n", curbook, num1, num2, offset);
-
-		if (num1 != curchap) {
-			fprintf(stderr, "Error: Found chaptures out of sequence\n", buf);
-			break;
-		}
-		if (num2 != curverse) {
-			fprintf(stderr, "Error: Found verses out of sequence\n", buf);
-			break;
-		}
-		write(vfp, &offset, 4);
-		write(vfp, &size, 2);
-	}
-	
-	close(vfp);
-	close(cfp);
-	close(bfp);
-	close(fp);
-}
-
-
-char findbreak(int fp, int *offset, int *num1, int *num2, short *size)
-{
-	char buf[7];
-	char buf2[7];
-	char loop;
-	int offset2, ch2, vs2;
-	
-	memset(buf, ' ', 7);
-
-	while (1) {
-		if (buf[3] == ':') {
-			memcpy(buf2, buf, 7);
-			for (loop = 0; loop < 7; loop++) {
-				if (!isdigit(buf2[loop]))
-					buf2[loop] = ' ';
-			}
-			buf2[3] = 0;
-			*num1 = atoi(buf2);
-			*num2 = atoi(&buf2[4]);
-			if (*num1 && *num2) {
-				*offset = lseek(fp, 0, SEEK_CUR);
-				sprintf(buf2, "%d", *num2);
-				*offset -= 2 - strlen(buf2);
-				if (size) {
-					if (findbreak(fp, &offset2, &ch2, &vs2, 0)) {
-						*size = (short) (lseek(fp, 0, SEEK_END) - (*offset));
-					}
-					else {
-						sprintf(buf2, "%d:%d", ch2, vs2);
-						*size = (offset2 - (*offset)) - (strlen(buf2) + 2);
-					}
-					lseek(fp, *offset, SEEK_SET);
-				}
-				return 0;
-			}
-		}
-		memmove(buf, &buf[1], 6);
-		if (read(fp, &buf[6], 1) != 1)
-			return 1;
-	}
-}
-
diff --git a/src/modules/comments/zcom/rawtxt2z.cpp b/src/modules/comments/zcom/rawtxt2z.cpp
deleted file mode 100644
index f8c18d0..0000000
--- a/src/modules/comments/zcom/rawtxt2z.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
-#include <ctype.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <stdlib.h>
-
-#ifndef __GNUC__
-#include <io.h>
-#else
-#include <unistd.h>
-#endif
-
-#include <swcomprs.h>
-
-
-main(int argc, char **argv)
-{
-	SWCompress *zobj;
-	int ifd, ofd, ixfd, oxfd;
-	long offset, loffset, lzoffset;
-	short size, lsize, lzsize;
-	char *tmpbuf;
-	
-	if (argc != 2) {
-		fprintf(stderr, "usage: %s <datafilename>\n", argv[0]);
-		exit(1);
-	}
-
-	zobj = new SWCompress();
-
-#ifndef O_BINARY
-#define O_BINARY 0
-#endif
-
-	tmpbuf = new char [ strlen(argv[1]) + 9 ];
-	ifd = open(argv[1], O_RDONLY|O_BINARY);
-	sprintf(tmpbuf, "%s.vss", argv[1]);
-	ixfd = open(tmpbuf, O_RDONLY|O_BINARY);
-	sprintf(tmpbuf, "%s.zzz", argv[1]);
-	ofd = open(tmpbuf, O_WRONLY|O_BINARY|O_CREAT);
-	sprintf(tmpbuf, "%s.zzz.vss", argv[1]);
-	oxfd = open(tmpbuf, O_WRONLY|O_BINARY|O_CREAT);
-
-	delete [] tmpbuf;
-
-	printf("\n");
-
-	while (1) {
-		if (read(ixfd, &offset, 4) != 4)
-			break;
-		if (read(ixfd, &size, 2) != 2)
-			break;
-
-		if ((offset == loffset) && (size == lsize)) {
-			printf("using previous offset,size\n", size);
-			write(oxfd, &lzoffset, 4);
-			write(oxfd, &lzsize, 2);
-		}
-		else {
-			printf("%d -> ", size);
-			lsize   = size;
-			loffset = offset;
-
-			if (size) {
-				tmpbuf = (char *) calloc(size + 1, 1);
-				lseek(ifd, offset, SEEK_SET);
-				read(ifd, tmpbuf, size);
-				zobj->Buf(tmpbuf);
-				zobj->zBuf(&size);
-				free(tmpbuf);
-			}
-			offset = lseek(ofd, 0, SEEK_END);
-			write(oxfd, &offset, 4);
-			if (size) 
-				write(ofd, zobj->zBuf(&size), size);
-			lzoffset = offset;
-			write(oxfd, &size, 2);
-			lzsize = size;
-			printf("%d \n", size);
-		}
-	}
-	delete zobj;
-}
diff --git a/src/modules/comments/zcom/zcom.cpp b/src/modules/comments/zcom/zcom.cpp
deleted file mode 100644
index 744a509..0000000
--- a/src/modules/comments/zcom/zcom.cpp
+++ /dev/null
@@ -1,216 +0,0 @@
-/******************************************************************************
- *  rawcom.cpp - code for class 'zCom'- a module that reads raw commentary
- *			files:	ot and nt using indexs ??.bks ??.cps ??.vss
- */
-
-
-#include <ctype.h>
-#include <stdio.h>
-#include <fcntl.h>
-
-#ifndef __GNUC__
-#include <io.h>
-#else
-#include <unistd.h>
-#endif
-
-#include <utilfuns.h>
-#include <zverse.h>
-#include <zcom.h>
-
-SWORD_NAMESPACE_START
-
-/******************************************************************************
- * zCom Constructor - Initializes data for instance of zCom
- *
- * ENT:	ipath - path to data files
- *		iname - Internal name for module
- *		idesc - Name to display to user for module
- *		iblockType - verse, chapter, book, etc. of index chunks
- *		icomp - Compressor object
- *		idisp - Display object to use for displaying
- */
-
-zCom::zCom(const char *ipath, const char *iname, const char *idesc, int iblockType, SWCompress *icomp, SWDisplay *idisp, SWTextEncoding enc, SWTextDirection dir, SWTextMarkup mark, const char* ilang) : zVerse(ipath, -1, iblockType, icomp), SWCom(iname, idesc, idisp, enc, dir, mark, ilang)/*, SWCompress()*/
-{
-	blockType = iblockType;
-	lastWriteKey = 0;
-}
-
-/******************************************************************************
- * zCom Destructor - Cleans up instance of zCom
- */
-
-zCom::~zCom() {
-	flushCache();
-
-	if (lastWriteKey)
-		delete lastWriteKey;
-}
-
-/******************************************************************************
- * zCom::getRawEntry	- Returns the correct verse when char * cast
- *					is requested
- *
- * RET: string buffer with verse
- */
-SWBuf &zCom::getRawEntryBuf() {
-	long  start = 0;
-	unsigned short size = 0;
-	VerseKey *key = &getVerseKey();
-
-	findOffset(key->Testament(), key->Index(), &start, &size);
-	entrySize = size;        // support getEntrySize call
-
-	entryBuf = "";
-	zReadText(key->Testament(), start, size, entryBuf);
-
-	rawFilter(entryBuf, key);
-
-//	if (!isUnicode())
-		prepText(entryBuf);
-
-	return entryBuf;
-}
-
-
-bool zCom::sameBlock(VerseKey *k1, VerseKey *k2) {
-	if (k1->Testament() != k2->Testament())
-		return false;
-
-	switch (blockType) {
-	case VERSEBLOCKS:
-		if (k1->Verse() != k2->Verse())
-			return false;
-	case CHAPTERBLOCKS:
-		if (k1->Chapter() != k2->Chapter())
-			return false;
-	case BOOKBLOCKS:
-		if (k1->Book() != k2->Book())
-			return false;
-	}
-	return true;
-}
-
-void zCom::setEntry(const char *inbuf, long len) {
-	VerseKey *key = &getVerseKey();
-
-	// see if we've jumped across blocks since last write
-	if (lastWriteKey) {
-		if (!sameBlock(lastWriteKey, key)) {
-			flushCache();
-		}
-		delete lastWriteKey;
-	}
-
-	doSetText(key->Testament(), key->Index(), inbuf, len);
-
-	lastWriteKey = (VerseKey *)key->clone();	// must delete
-}
-
-
-void zCom::linkEntry(const SWKey *inkey) {
-	VerseKey *destkey = &getVerseKey();
-	const VerseKey *srckey = 0;
-
-	// see if we have a VerseKey * or decendant
-	try {
-		srckey = (const VerseKey *) SWDYNAMIC_CAST(VerseKey, inkey);
-	}
-	catch ( ... ) {
-	}
-	// if we don't have a VerseKey * decendant, create our own
-	if (!srckey)
-		srckey = new VerseKey(inkey);
-
-	doLinkEntry(destkey->Testament(), destkey->Index(), srckey->Index());
-
-	if (inkey != srckey) // free our key if we created a VerseKey
-		delete srckey;
-}
-
-/******************************************************************************
- * zCom::deleteEntry	- deletes this entry
- *
- * RET: *this
- */
-
-void zCom::deleteEntry() {
-
-	VerseKey *key = &getVerseKey();
-	doSetText(key->Testament(), key->Index(), "");
-}
-
-
-/******************************************************************************
- * zCom::increment	- Increments module key a number of entries
- *
- * ENT:	increment	- Number of entries to jump forward
- *
- * RET: *this
- */
-
-void zCom::increment(int steps) {
-	long  start;
-	unsigned short size;
-	VerseKey *tmpkey = &getVerseKey();
-
-	findOffset(tmpkey->Testament(), tmpkey->Index(), &start, &size);
-
-	SWKey lastgood = *tmpkey;
-	while (steps) {
-		long laststart = start;
-		unsigned short lastsize = size;
-		SWKey lasttry = *tmpkey;
-		(steps > 0) ? (*key)++ : (*key)--;
-		tmpkey = &getVerseKey();
-
-		if ((error = key->Error())) {
-			*key = lastgood;
-			break;
-		}
-		long index = tmpkey->Index();
-		findOffset(tmpkey->Testament(), index, &start, &size);
-		if (
-			(((laststart != start) || (lastsize != size))	// we're a different entry
-//				&& (start > 0) 
-				&& (size))	// and we actually have a size
-				||(!skipConsecutiveLinks)) {	// or we don't want to skip consecutive links
-			steps += (steps < 0) ? 1 : -1;
-			lastgood = *tmpkey;
-		}
-	}
-	error = (error) ? KEYERR_OUTOFBOUNDS : 0;
-}
-
-
-VerseKey &zCom::getVerseKey() {
-	static VerseKey tmpVK;
-	VerseKey *key;
-	// see if we have a VerseKey * or decendant
-	try {
-		key = SWDYNAMIC_CAST(VerseKey, this->key);
-	}
-	catch ( ... ) {	}
-	if (!key) {
-		ListKey *lkTest = 0;
-		try {
-			lkTest = SWDYNAMIC_CAST(ListKey, this->key);
-		}
-		catch ( ... ) {	}
-		if (lkTest) {
-			try {
-				key = SWDYNAMIC_CAST(VerseKey, lkTest->GetElement());
-			}
-			catch ( ... ) {	}
-		}
-	}
-	if (!key) {
-		tmpVK = *(this->key);
-		return tmpVK;
-	}
-	else	return *key;
-}
-
-
-SWORD_NAMESPACE_END
diff --git a/src/modules/common/Makefile b/src/modules/common/Makefile
deleted file mode 100644
index 81f7721..0000000
--- a/src/modules/common/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-root := ../../..
-
-all:
-	make -C ${root}
diff --git a/src/modules/common/Makefile.am b/src/modules/common/Makefile.am
deleted file mode 100644
index b411660..0000000
--- a/src/modules/common/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-commondir = $(top_srcdir)/src/modules/common
-
-libsword_la_SOURCES += $(commondir)/rawstr.cpp
-libsword_la_SOURCES += $(commondir)/rawstr4.cpp
-libsword_la_SOURCES += $(commondir)/swcomprs.cpp
-libsword_la_SOURCES += $(commondir)/lzsscomprs.cpp
-
-if ZLIB
-SWZLIB = $(commondir)/zipcomprs.cpp
-else
-SWZLIB =
-endif
-libsword_la_SOURCES += $(SWZLIB)
-libsword_la_SOURCES += $(commondir)/rawverse.cpp
-libsword_la_SOURCES += $(commondir)/swcipher.cpp
-libsword_la_SOURCES += $(commondir)/zverse.cpp
-libsword_la_SOURCES += $(commondir)/zstr.cpp
-libsword_la_SOURCES += $(commondir)/entriesblk.cpp
-
-libsword_la_SOURCES += $(commondir)/sapphire.cpp
-
diff --git a/src/modules/common/compress.cpp b/src/modules/common/compress.cpp
deleted file mode 100644
index 5031adb..0000000
--- a/src/modules/common/compress.cpp
+++ /dev/null
@@ -1,767 +0,0 @@
-Compression Info, 10-11-95
-Jeff Wheeler
-
-Source of Algorithm
--------------------
-
-The compression algorithms used here are based upon the algorithms developed and published by Haruhiko Okumura in a paper entitled "Data Compression Algorithms of LARC and LHarc."  This paper discusses three compression algorithms, LSZZ, LZARI, and LZHUF.  LZSS is described as the "first" of these, and is described as providing moderate compression with good speed.  LZARI is described as an improved LZSS, a combination of the LZSS algorithm with adaptive arithmetic compression.  It is described as being slower than LZSS but with better compression.  LZHUF (the basis of the common LHA compression program) was included in the paper, however, a free usage license was not included. 
-
-The following are copies of the statements included at the beginning of each source code listing that was supplied in the working paper.
-
-        LZSS, dated 4/6/89, marked as "Use, distribute and
-        modify this program freely."
-
-        LZARI, dated 4/7/89, marked as "Use, distribute and
-        modify this program freely."
-
-        LZHUF, dated 11/20/88, written by Haruyasu Yoshizaki,
-        translated by Haruhiko Okumura on 4/7/89.  Not
-        expressly marked as redistributable or modifiable.
-
-Since both LZSS and LZARI are marked as "use, distribute and modify freely" we have felt at liberty basing our compression algorithm on either of these.
-
-Selection of Algorithm
-----------------------
-
-Working samples of three possible compression algorithms are supplied in Okumura's paper.  Which should be used?
-
-LZSS is the fastest at decompression, but does not generated as small a compressed file as the other methods. The other two methods provided, perhaps, a 15% improvement in compression.  Or, put another way, on a 100K file, LZSS might compress it to 50K while the others might approach 40-45K.  For STEP purposes, it was decided that decoding speed was of more importance than tighter compression. For these reasons, the first compression algorithm implemented is the LZSS algorithm.
-
-About LZSS Encoding
--------------------
-
-(adapted from Haruhiko Okumura's paper)
-
-This scheme was proposed by Ziv and Lempel [1].  A slightly modified version is described by Storer and Szymanski [2]. An implementation using a binary tree has been proposed by Bell [3].
-
-The algorithm is quite simple.
-1. Keep a ring buffer which initially contains all space characters.
-2. Read several letters from the file to the buffer.
-3. Search the buffer for the longest string that matches the letters just read, and send its length and position into the buffer.
-
-If the ring buffer is 4096 bytes, the position can be stored in 12 bits.  If the length is represented in 4 bits, the <position, length> pair is two bytes long.  If the longest match is no more than two characters, then just one character is sent without encoding.  The process starts again with the next character.  An extra bit is sent each time to tell the decoder whether the next item is a character of a <position, length> pair.
-
-[1] J. Ziv and A. Lempel, IEEE Transactions IT-23, 337-343 (1977).
-[2] J. A. Storer and T. G. Szymanski, J. ACM, 29, 928-951 (1982).
-[3] T.C. Gell, IEEE Transactions COM-34, 1176-1182 (1986).
-
-void InitTree(                      // no return value
-    void);                          // no parameters
-
-void InsertNode(                    // no return value
-    short int Pos);                 // position in the buffer
-
-void DeleteNode(                    // no return value
-    short int Node);                // node to be removed
-
-void Encode(                        // no return value
-    void);                          // no parameters
-
-void Decode(                        // no return value
-    void);                          // no parameters
-
-// The following are constant sizes used by the compression algorithm.
-//
-//  N         - This is the size of the ring buffer.  It is set
-//              to 4K.  It is important to note that a position
-//              within the ring buffer requires 12 bits.  
-//
-//  F         - This is the maximum length of a character sequence
-//              that can be taken from the ring buffer.  It is set
-//              to 18.  Note that a length must be 3 before it is
-//              worthwhile to store a position/length pair, so the
-//              length can be encoded in only 4 bits.  Or, put yet
-//              another way, it is not necessary to encode a length
-//              of 0-18, it is necessary to encode a length of
-//              3-18, which requires 4 bits.
-//              
-//  THRESHOLD - It takes 2 bytes to store an offset and
-//              a length.  If a character sequence only
-//              requires 1 or 2 characters to store 
-//              uncompressed, then it is better to store
-//              it uncompressed than as an offset into
-//              the ring buffer.
-//
-// Note that the 12 bits used to store the position and the 4 bits
-// used to store the length equal a total of 16 bits, or 2 bytes.
-
-#define N		4096
-#define F		18
-#define THRESHOLD	3
-#define NOT_USED	N
-
-// m_ring_buffer is a text buffer.  It contains "nodes" of
-// uncompressed text that can be indexed by position.  That is,
-// a substring of the ring buffer can be indexed by a position
-// and a length.  When decoding, the compressed text may contain
-// a position in the ring buffer and a count of the number of
-// bytes from the ring buffer that are to be moved into the
-// uncompressed buffer.  
-//
-// This ring buffer is not maintained as part of the compressed
-// text.  Instead, it is reconstructed dynamically.  That is,
-// it starts out empty and gets built as the text is decompressed.
-//
-// The ring buffer contain N bytes, with an additional F - 1 bytes
-// to facilitate string comparison.
-
-unsigned char m_ring_buffer[N + F - 1];
-
-// m_match_position and m_match_length are set by InsertNode().
-//
-// These variables indicate the position in the ring buffer 
-// and the number of characters at that position that match
-// a given string.
-
-short int m_match_position;
-short int m_match_length;
-
-// m_lson, m_rson, and m_dad are the Japanese way of referring to
-// a tree structure.  The dad is the parent and it has a right and
-// left son (child).
-//
-// For i = 0 to N-1, m_rson[i] and m_lson[i] will be the right 
-// and left children of node i.  
-//
-// For i = 0 to N-1, m_dad[i] is the parent of node i.
-//
-// For i = 0 to 255, rson[N + i + 1] is the root of the tree for 
-// strings that begin with the character i.  Note that this requires 
-// one byte characters.
-//
-// These nodes store values of 0...(N-1).  Memory requirements
-// can be reduces by using 2-byte integers instead of full 4-byte
-// integers (for 32-bit applications).  Therefore, these are 
-// defined as "short ints."
-
-short int m_lson[N + 1];
-short int m_rson[N + 257];
-short int m_dad[N + 1];
-
-/*
- -------------------------------------------------------------------------
-    cLZSS::InitTree
-    
-    This function initializes the tree nodes to "empty" states. 
- -------------------------------------------------------------------------
-*/
-
-void cLZSS::InitTree(               // no return value
-    void)                           // no parameters
-    throw()                         // exception list
-
-    {
-    int  i;
-
-    // For i = 0 to N - 1, m_rson[i] and m_lson[i] will be the right
-    // and left children of node i.  These nodes need not be
-    // initialized.  However, for debugging purposes, it is nice to
-    // have them initialized.  Since this is only used for compression
-    // (not decompression), I don't mind spending the time to do it.
-    //
-    // For the same range of i, m_dad[i] is the parent of node i.
-    // These are initialized to a known value that can represent
-    // a "not used" state.
-    
-    for (i = 0; i < N; i++)
-        {
-        m_lson[i] = NOT_USED;
-        m_rson[i] = NOT_USED;
-        m_dad[i] = NOT_USED;
-        }
-
-    // For i = 0 to 255, m_rson[N + i + 1] is the root of the tree
-    // for strings that begin with the character i.  This is why
-    // the right child array is larger than the left child array.
-    // These are also initialzied to a "not used" state.
-    //
-    // Note that there are 256 of these, one for each of the possible
-    // 256 characters.
-
-    for (i = N + 1; i <= (N + 256); i++)
-        {
-        m_rson[i] = NOT_USED;
-        }
-
-    // Done.
-    }
-
-/*
- -------------------------------------------------------------------------
-    cLZSS::InsertNode
-    
-    This function inserts a string from the ring buffer into one of
-    the trees.  It loads the match position and length member variables
-    for the longest match.
-    
-    The string to be inserted is identified by the parameter Pos,
-    A full F bytes are inserted.  So, m_ring_buffer[Pos ... Pos+F-1]
-    are inserted.
-
-    If the matched length is exactly F, then an old node is removed
-    in favor of the new one (because the old one will be deleted
-    sooner).
-
-    Note that Pos plays a dual role.  It is used as both a position
-    in the ring buffer and also as a tree node.  m_ring_buffer[Pos]
-    defines a character that is used to identify a tree node.
- -------------------------------------------------------------------------
-*/
-
-void cLZSS::InsertNode(                 // no return value
-    short int Pos)                      // position in the buffer
-    throw()                             // exception list
-
-    {
-    short int i;
-    short int p;
-    int cmp;
-    unsigned char * key;
-
-    ASSERT(Pos >= 0);
-    ASSERT(Pos < N);
-
-    cmp = 1;
-    key = &(m_ring_buffer[Pos]);
-
-    // The last 256 entries in m_rson contain the root nodes for
-    // strings that begin with a letter.  Get an index for the
-    // first letter in this string.
-
-    p = (short int) (N + 1 + key[0]);
-
-    // Set the left and right tree nodes for this position to "not
-    // used."
-
-    m_lson[Pos] = NOT_USED;
-    m_rson[Pos] = NOT_USED;
-
-    // Haven't matched anything yet.
-
-    m_match_length = 0;
-
-    for ( ; ; )
-        {
-        if (cmp >= 0)
-            {
-            if (m_rson[p] != NOT_USED)
-                {
-                p = m_rson[p];
-                }
-            else
-                {
-                m_rson[p] = Pos;
-                m_dad[Pos] = p;
-                return;
-                }
-            }
-        else
-            {
-            if (m_lson[p] != NOT_USED)
-                {
-                p = m_lson[p];
-                }
-            else
-                {
-                m_lson[p] = Pos;
-                m_dad[Pos] = p;
-                return;
-                }
-            }
-
-        // Should we go to the right or the left to look for the
-        // next match?
-
-        for (i = 1; i < F; i++)
-            {
-            cmp = key[i] - m_ring_buffer[p + i];
-            if (cmp != 0)
-                break;
-            }
-
-        if (i > m_match_length)
-            {
-            m_match_position = p;
-            m_match_length = i;
-
-            if (i >= F)
-                break;
-            }
-        }
-
-    m_dad[Pos] = m_dad[p];
-    m_lson[Pos] = m_lson[p];
-    m_rson[Pos] = m_rson[p];
-
-    m_dad[ m_lson[p] ] = Pos;
-    m_dad[ m_rson[p] ] = Pos;
-
-    if (m_rson[ m_dad[p] ] == p)
-        {
-        m_rson[ m_dad[p] ] = Pos;
-        }
-    else
-        {
-        m_lson[ m_dad[p] ] = Pos;
-        }
-
-    // Remove "p"
-
-    m_dad[p] = NOT_USED;
-    }
-
-/*
- -------------------------------------------------------------------------
-    cLZSS::DeleteNode   
-
-    This function removes the node "Node" from the tree.
- -------------------------------------------------------------------------
-*/
-
-void cLZSS::DeleteNode(                 // no return value
-    short int Node)                     // node to be removed
-    throw()                             // exception list
-
-    {
-    short int  q;
-
-    ASSERT(Node >= 0);
-    ASSERT(Node < (N+1));
-
-    if (m_dad[Node] == NOT_USED)
-        {
-        // not in tree, nothing to do
-        return;
-        }
-
-    if (m_rson[Node] == NOT_USED)
-        {
-        q = m_lson[Node];
-        }
-    else if (m_lson[Node] == NOT_USED)
-        {
-        q = m_rson[Node];
-        }
-    else
-        {
-        q = m_lson[Node];
-        if (m_rson[q] != NOT_USED)
-            {
-            do
-                {
-                q = m_rson[q];
-                }
-            while (m_rson[q] != NOT_USED);
-
-            m_rson[ m_dad[q] ] = m_lson[q];
-            m_dad[ m_lson[q] ] = m_dad[q];
-            m_lson[q] = m_lson[Node];
-            m_dad[ m_lson[Node] ] = q;
-            }
-
-        m_rson[q] = m_rson[Node];
-        m_dad[ m_rson[Node] ] = q;
-        }
-
-    m_dad[q] = m_dad[Node];
-
-    if (m_rson[ m_dad[Node] ] == Node)
-        {
-        m_rson[ m_dad[Node] ] = q;
-        }
-    else
-        {
-        m_lson[ m_dad[Node] ] = q;
-        }
-
-    m_dad[Node] = NOT_USED;
-    }
-
-/*
- -------------------------------------------------------------------------
-    cLZSS::Encode
-
-    This function "encodes" the input stream into the output stream.
-    The GetChars() and SendChars() functions are used to separate
-    this method from the actual i/o.
- -------------------------------------------------------------------------
-*/
-
-void cLZSS::Encode(                     // no return value
-    void)                               // no parameters
-
-    {
-    short int i;                        // an iterator
-    short int r;                        // node number in the binary tree
-    short int s;                        // position in the ring buffer
-    unsigned short int len;             // len of initial string
-    short int last_match_length;        // length of last match
-    short int code_buf_pos;             // position in the output buffer
-    unsigned char code_buf[17];         // the output buffer
-    unsigned char mask;                 // bit mask for byte 0 of out buf
-    unsigned char c;                    // character read from string
-
-    // Start with a clean tree.
-
-    InitTree();
-
-    // code_buf[0] works as eight flags.  A "1" represents that the
-    // unit is an unencoded letter (1 byte), and a "0" represents
-    // that the next unit is a <position,length> pair (2 bytes).
-    //
-    // code_buf[1..16] stores eight units of code.  Since the best
-    // we can do is store eight <position,length> pairs, at most 16 
-    // bytes are needed to store this.
-    //
-    // This is why the maximum size of the code buffer is 17 bytes.
-
-    code_buf[0] = 0;
-    code_buf_pos = 1;
-
-    // Mask iterates over the 8 bits in the code buffer.  The first
-    // character ends up being stored in the low bit.
-    //
-    //  bit   8   7   6   5   4   3   2   1
-    //        |                           |
-    //        |             first sequence in code buffer
-    //        |
-    //      last sequence in code buffer        
-
-    mask = 1;
-
-    s = 0;
-    r = (short int) N - (short int) F;
-
-    // Initialize the ring buffer with spaces...
-
-    // Note that the last F bytes of the ring buffer are not filled.
-    // This is because those F bytes will be filled in immediately
-    // with bytes from the input stream.
-
-    memset(m_ring_buffer, ' ', N - F);
-    
-    // Read F bytes into the last F bytes of the ring buffer.
-    //
-    // This function loads the buffer with X characters and returns
-    // the actual amount loaded.
-
-    len = GetChars(&(m_ring_buffer[r]), F);
-
-    // Make sure there is something to be compressed.
-
-    if (len == 0)
-        return;
-
-    // Insert the F strings, each of which begins with one or more
-    // 'space' characters.  Note the order in which these strings
-    // are inserted.  This way, degenerate trees will be less likely
-    // to occur.
-
-    for (i = 1; i <= F; i++)
-        {
-        InsertNode((short int) (r - i));
-        }
-
-    // Finally, insert the whole string just read.  The
-    // member variables match_length and match_position are set.
-
-    InsertNode(r);
-
-    // Now that we're preloaded, continue till done.
-
-    do
-        {
-
-        // m_match_length may be spuriously long near the end of
-        // text.
-
-        if (m_match_length > len)
-            {
-            m_match_length = len;
-            }
-
-        // Is it cheaper to store this as a single character?  If so,
-        // make it so.
-
-        if (m_match_length < THRESHOLD)
-            {
-            // Send one character.  Remember that code_buf[0] is the
-            // set of flags for the next eight items.
-
-            m_match_length = 1;     
-            code_buf[0] |= mask;  
-            code_buf[code_buf_pos++] = m_ring_buffer[r];
-            }
-
-        // Otherwise, we do indeed have a string that can be stored
-        // compressed to save space.
-
-        else
-            {
-            // The next 16 bits need to contain the position (12 bits)
-            // and the length (4 bits).
-
-            code_buf[code_buf_pos++] = (unsigned char) m_match_position;
-            code_buf[code_buf_pos++] = (unsigned char) (
-                ((m_match_position >> 4) & 0xf0) | 
-                (m_match_length - THRESHOLD) );
-            }
-
-        // Shift the mask one bit to the left so that it will be ready
-        // to store the new bit.
-
-        mask = (unsigned char) (mask << 1);
-
-        // If the mask is now 0, then we know that we have a full set
-        // of flags and items in the code buffer.  These need to be
-        // output.
-
-        if (mask == 0)
-            {
-            // code_buf is the buffer of characters to be output.
-            // code_buf_pos is the number of characters it contains.
-
-            SendChars(code_buf, code_buf_pos);
-
-            // Reset for next buffer...
-
-            code_buf[0] = 0;
-            code_buf_pos = 1;
-            mask = 1;
-            }
-
-        last_match_length = m_match_length;
-
-        // Delete old strings and read new bytes...
-
-        for (i = 0; i < last_match_length; i++)
-            {
-
-            // Get next character...
-
-            if (GetChars(&c, 1) != 1)
-                break;
-
-            // Delete "old strings"
-
-            DeleteNode(s);
-
-            // Put this character into the ring buffer.
-            //          
-            // The original comment here says "If the position is near
-            // the end of the buffer, extend the buffer to make
-            // string comparison easier."
-            //
-            // That's a little misleading, because the "end" of the 
-            // buffer is really what we consider to be the "beginning"
-            // of the buffer, that is, positions 0 through F.
-            //
-            // The idea is that the front end of the buffer is duplicated
-            // into the back end so that when you're looking at characters
-            // at the back end of the buffer, you can index ahead (beyond
-            // the normal end of the buffer) and see the characters
-            // that are at the front end of the buffer wihtout having
-            // to adjust the index.
-            //
-            // That is...
-            //
-            //      1234xxxxxxxxxxxxxxxxxxxxxxxxxxxxx1234
-            //      |                               |  |
-            //      position 0          end of buffer  |
-            //                                         |
-            //                  duplicate of front of buffer
-
-            m_ring_buffer[s] = c;
-
-            if (s < F - 1)
-                {
-                m_ring_buffer[s + N] = c;
-                }
-
-            // Increment the position, and wrap around when we're at
-            // the end.  Note that this relies on N being a power of 2.
-
-            s = (short int) ( (s + 1) & (N - 1) );
-            r = (short int) ( (r + 1) & (N - 1) );
-
-            // Register the string that is found in 
-            // m_ring_buffer[r..r+F-1].
-
-            InsertNode(r);
-            }
-
-        // If we didn't quit because we hit the last_match_length,
-        // then we must have quit because we ran out of characters
-        // to process.
-
-        while (i++ < last_match_length)
-            {                              
-            DeleteNode(s);
-
-            s = (short int) ( (s + 1) & (N - 1) );
-            r = (short int) ( (r + 1) & (N - 1) );
-
-            // Note that len hitting 0 is the key that causes the
-            // do...while() to terminate.  This is the only place
-            // within the loop that len is modified.
-            //
-            // Its original value is F (or a number less than F for
-            // short strings).
-
-            if (--len)
-                {
-                InsertNode(r);       /* buffer may not be empty. */
-                }
-            }
-
-        // End of do...while() loop.  Continue processing until there
-        // are no more characters to be compressed.  The variable
-        // "len" is used to signal this condition.
-        }
-    while (len > 0);
-
-    // There could still be something in the output buffer.  Send it
-    // now.
-
-    if (code_buf_pos > 1)
-        {
-        // code_buf is the encoded string to send.
-        // code_buf_ptr is the number of characters.
-
-        SendChars(code_buf, code_buf_pos);
-        }
-
-    // Done!
-    }
-
-/*
- -------------------------------------------------------------------------
-    cLZSS::Decode   
-
-    This function "decodes" the input stream into the output stream.
-    The GetChars() and SendChars() functions are used to separate
-    this method from the actual i/o.
- -------------------------------------------------------------------------
-*/
-
-void cLZSS::Decode(                     // no return value
-    void)                               // no parameters
-
-    {
-    int k;
-    int r;                              // node number
-    unsigned char c[F];                 // an array of chars
-    unsigned char flags;                // 8 bits of flags
-    int flag_count;                     // which flag we're on
-    short int pos;                      // position in the ring buffer
-    short int len;                      // number of chars in ring buffer
-
-    // Initialize the ring buffer with a common string.
-    //
-    // Note that the last F bytes of the ring buffer are not filled.
-
-    memset(m_ring_buffer, ' ', N - F);
-    
-    r = N - F;
-
-    flags = (char) 0;
-    flag_count = 0;
-
-    for ( ; ; )
-        {
-
-        // If there are more bits of interest in this flag, then
-        // shift that next interesting bit into the 1's position.
-        //
-        // If this flag has been exhausted, the next byte must 
-        // be a flag.
-
-        if (flag_count > 0)
-            {
-            flags = (unsigned char) (flags >> 1);
-            flag_count--;
-            }
-        else
-            {
-            // Next byte must be a flag.
-
-            if (GetChars(&flags, 1) != 1)
-                break;
-
-            // Set the flag counter.  While at first it might appear
-            // that this should be an 8 since there are 8 bits in the
-            // flag, it should really be a 7 because the shift must
-            // be performed 7 times in order to see all 8 bits.
-
-            flag_count = 7;
-            }
-
-        // If the low order bit of the flag is now set, then we know
-        // that the next byte is a single, unencoded character.
-
-        if (flags & 1)
-            {
-            if (GetChars(c, 1) != 1)
-                break;
-
-            if (SendChars(c, 1) != 1)
-                break;
-
-            // Add to buffer, and increment to next spot. Wrap at end.
-
-            m_ring_buffer[r] = c[0];
-            r = (short int) ( (r + 1) & (N - 1) );
-            }
-
-        // Otherwise, we know that the next two bytes are a
-        // <position,length> pair.  The position is in 12 bits and
-        // the length is in 4 bits.
-
-        else
-            {
-            // Original code:
-            //  if ((i = getc(infile)) == EOF)
-            //      break;
-            //  if ((j = getc(infile)) == EOF)
-            //      break;
-            //  i |= ((j & 0xf0) << 4);    
-            //  j = (j & 0x0f) + THRESHOLD;
-            //
-            // I've modified this to only make one input call, and
-            // have changed the variable names to something more
-            // obvious.
-
-            if (GetChars(c, 2) != 2)
-                break;
-
-            // Convert these two characters into the position and
-            // length.  Note that the length is always at least
-            // THRESHOLD, which is why we're able to get a length
-            // of 18 out of only 4 bits.
-
-            pos = (short int) ( c[0] | ((c[1] & 0xf0) << 4) );
-
-            len = (short int) ( (c[1] & 0x0f) + THRESHOLD );
-
-            // There are now "len" characters at position "pos" in
-            // the ring buffer that can be pulled out.  Note that
-            // len is never more than F.
-
-            for (k = 0; k < len; k++)
-                {
-                c[k] = m_ring_buffer[(pos + k) & (N - 1)];
-
-                // Add to buffer, and increment to next spot. Wrap at end.
-
-                m_ring_buffer[r] = c[k];
-                r = (short int) ( (r + 1) & (N - 1) );
-                }
-
-            // Add the "len" characters to the output stream.
-
-            if (SendChars(c, len) != len)
-                break;
-            }
-        }
-    }
-
diff --git a/src/modules/common/entriesblk.cpp b/src/modules/common/entriesblk.cpp
deleted file mode 100644
index f4fbdeb..0000000
--- a/src/modules/common/entriesblk.cpp
+++ /dev/null
@@ -1,169 +0,0 @@
-#include <entriesblk.h>
-#include <stdlib.h>
-#include <string.h>
-
-SWORD_NAMESPACE_START
-
-const int EntriesBlock::METAHEADERSIZE = 4;
-	// count(4);
-const int EntriesBlock::METAENTRYSIZE = 8;
-	// offset(4); size(4);
-
-EntriesBlock::EntriesBlock(const char *iBlock, unsigned long size) {
-	block = (char *)calloc(1, size);
-	memcpy(block, iBlock, size);
-}
-
-
-EntriesBlock::EntriesBlock() {
-	block = (char *)calloc(1, sizeof(__u32));
-}
-
-
-EntriesBlock::~EntriesBlock() {
-	free(block);
-}
-
-
-void EntriesBlock::setCount(int count) {
-	__u32 rawCount = archtosword32(count);
-	memcpy(block, &rawCount, sizeof(__u32));
-}
-
-
-int EntriesBlock::getCount() {
-	__u32 count = 0;
-	memcpy(&count, block, sizeof(__u32));
-	count = swordtoarch32(count);
-	return count;
-}
-
-
-void EntriesBlock::getMetaEntry(int index, unsigned long *offset, unsigned long *size) {
-	__u32 rawOffset = 0;
-	__u32 rawSize = 0;
-	*offset = 0;
-	*size = 0;
-	if (index >= getCount())	// assert index < count
-		return;
-
-	// first 4 bytes is count, each 6 bytes after is each meta entry
-	memcpy(&rawOffset, block + METAHEADERSIZE + (index * METAENTRYSIZE), sizeof(rawOffset));
-	memcpy(&rawSize, block + METAHEADERSIZE + (index * METAENTRYSIZE) + sizeof(rawOffset), sizeof(rawSize));
-
-	*offset = (unsigned long)swordtoarch32(rawOffset);
-	*size   = (unsigned long)swordtoarch32(rawSize);
-}
-
-
-void EntriesBlock::setMetaEntry(int index, unsigned long offset, unsigned long size) {
-	__u32 rawOffset = archtosword32(offset);
-	__u32 rawSize = archtosword32(size);
-
-	if (index >= getCount())	// assert index < count
-		return;
-
-	// first 4 bytes is count, each 6 bytes after is each meta entry
-	memcpy(block + METAHEADERSIZE + (index * METAENTRYSIZE), &rawOffset, sizeof(rawOffset));
-	memcpy(block + METAHEADERSIZE + (index * METAENTRYSIZE) + sizeof(rawOffset), &rawSize, sizeof(rawSize));
-}
-
-
-const char *EntriesBlock::getRawData(unsigned long *retSize) {
-	unsigned long max = 4;
-	int loop;
-	unsigned long offset;
-	unsigned long size;
-	for (loop = 0; loop < getCount(); loop++) {
-		getMetaEntry(loop, &offset, &size);
-		max = ((offset + size) > max) ? (offset + size) : max;
-	}
-	*retSize = max;
-	return block;
-}
-
-
-int EntriesBlock::addEntry(const char *entry) {
-	unsigned long dataSize;
-	getRawData(&dataSize);
-	unsigned long  len = strlen(entry);
-	unsigned long offset;
-	unsigned long size;
-	int count = getCount();
-	unsigned long dataStart = METAHEADERSIZE + (count * METAENTRYSIZE);
-	// new meta entry + new data size + 1 because null 
-	block = (char *)realloc(block, dataSize + METAENTRYSIZE + len + 1);
-	// shift right to make room for new meta entry
-	memmove(block + dataStart + METAENTRYSIZE, block + dataStart, dataSize - dataStart);
-
-	for (int loop = 0; loop < count; loop++) {
-		getMetaEntry(loop, &offset, &size);
-		if (offset) {	// if not a deleted entry
-			offset += METAENTRYSIZE;
-			setMetaEntry(loop, offset, size);
-		}
-	}
-
-	offset = dataSize;	// original dataSize before realloc
-	size = len + 1;
-	// add our text to the end
-	memcpy(block + offset + METAENTRYSIZE, entry, size);
-	// increment count
-	setCount(count + 1);
-	// add our meta entry
-	setMetaEntry(count, offset + METAENTRYSIZE, size);
-	// return index of our new entry
-	return count;
-}
-
-
-const char *EntriesBlock::getEntry(int entryIndex) {
-	unsigned long offset;
-	unsigned long size;
-	static char *empty = "";
-
-	getMetaEntry(entryIndex, &offset, &size);
-	return (offset) ? block+offset : empty;
-}
-
-
-unsigned long EntriesBlock::getEntrySize(int entryIndex) {
-	unsigned long offset;
-	unsigned long size;
-
-	getMetaEntry(entryIndex, &offset, &size);
-	return (offset) ? size : 0;
-}
-
-
-void EntriesBlock::removeEntry(int entryIndex) {
-	unsigned long offset;
-	unsigned long size, size2;
-	unsigned long dataSize;
-	getRawData(&dataSize);
-	getMetaEntry(entryIndex, &offset, &size);
-	unsigned long len = size - 1;
-	int count = getCount();
-	unsigned long dataStart = METAHEADERSIZE + (count * METAENTRYSIZE);
-
-	if (!offset)	// already deleted
-		return;
-
-	// shift left to retrieve space used for old entry
-	memmove(block + offset, block + offset + size, dataSize - (offset + size));
-
-	// fix offset for all entries after our entry that were shifted left
-	for (int loop = entryIndex + 1; loop < count; loop++) {
-		getMetaEntry(loop, &offset, &size2);
-		if (offset) {	// if not a deleted entry
-			offset -= size;
-			setMetaEntry(loop, offset, size2);
-		}
-	}
-
-	// zero out our meta entry
-	setMetaEntry(entryIndex, 0L, 0);
-}
-
-
-SWORD_NAMESPACE_END
diff --git a/src/modules/common/lzsscomprs.cpp b/src/modules/common/lzsscomprs.cpp
deleted file mode 100644
index bd8f768..0000000
--- a/src/modules/common/lzsscomprs.cpp
+++ /dev/null
@@ -1,668 +0,0 @@
-/******************************************************************************
- *  lzsscomprs.cpp   - code for class 'LZSSCompress'- a driver class that
- *			provides LZSS compression
- */
-
-#include <stdlib.h>
-#include <string.h>
-#include <lzsscomprs.h>
-
-SWORD_NAMESPACE_START
-
-/******************************************************************************
- * LZSSCompress Statics
- */
-
-// m_ring_buffer is a text buffer.  It contains "nodes" of
-// uncompressed text that can be indexed by position.  That is,
-// a substring of the ring buffer can be indexed by a position
-// and a length.  When decoding, the compressed text may contain
-// a position in the ring buffer and a count of the number of
-// bytes from the ring buffer that are to be moved into the
-// uncompressed buffer.  
-//
-// This ring buffer is not maintained as part of the compressed
-// text.  Instead, it is reconstructed dynamically.  That is,
-// it starts out empty and gets built as the text is decompressed.
-//
-// The ring buffer contain N bytes, with an additional F - 1 bytes
-// to facilitate string comparison.
-
-unsigned char LZSSCompress::m_ring_buffer[N + F - 1];
-
-// m_match_position and m_match_length are set by InsertNode().
-//
-// These variables indicate the position in the ring buffer 
-// and the number of characters at that position that match
-// a given string.
-
-short int LZSSCompress::m_match_position;
-short int LZSSCompress::m_match_length;
-
-// m_lson, m_rson, and m_dad are the Japanese way of referring to
-// a tree structure.  The dad is the parent and it has a right and
-// left son (child).
-//
-// For i = 0 to N-1, m_rson[i] and m_lson[i] will be the right 
-// and left children of node i.  
-//
-// For i = 0 to N-1, m_dad[i] is the parent of node i.
-//
-// For i = 0 to 255, rson[N + i + 1] is the root of the tree for 
-// strings that begin with the character i.  Note that this requires 
-// one byte characters.
-//
-// These nodes store values of 0...(N-1).  Memory requirements
-// can be reduces by using 2-byte integers instead of full 4-byte
-// integers (for 32-bit applications).  Therefore, these are 
-// defined as "short ints."
-
-short int LZSSCompress::m_lson[N + 1];
-short int LZSSCompress::m_rson[N + 257];
-short int LZSSCompress::m_dad[N + 1];
-
-
-/******************************************************************************
- * LZSSCompress Constructor - Initializes data for instance of LZSSCompress
- *
- */
-
-LZSSCompress::LZSSCompress() : SWCompress() {
-}
-
-
-/******************************************************************************
- * LZSSCompress Destructor - Cleans up instance of LZSSCompress
- */
-
-LZSSCompress::~LZSSCompress() {
-}
-
-
-/******************************************************************************
- * LZSSCompress::InitTree	- This function initializes the tree nodes to
- *							"empty" states. 
- */
-
-void LZSSCompress::InitTree(void) {
-	int  i;
-
-	// For i = 0 to N - 1, m_rson[i] and m_lson[i] will be the right
-	// and left children of node i.  These nodes need not be
-	// initialized.  However, for debugging purposes, it is nice to
-	// have them initialized.  Since this is only used for compression
-	// (not decompression), I don't mind spending the time to do it.
-	//
-	// For the same range of i, m_dad[i] is the parent of node i.
-	// These are initialized to a known value that can represent
-	// a "not used" state.
-	
-	for (i = 0; i < N; i++) {
-		m_lson[i] = NOT_USED;
-		m_rson[i] = NOT_USED;
-		m_dad[i] = NOT_USED;
-	}
-
-	// For i = 0 to 255, m_rson[N + i + 1] is the root of the tree
-	// for strings that begin with the character i.  This is why
-	// the right child array is larger than the left child array.
-	// These are also initialzied to a "not used" state.
-	//
-	// Note that there are 256 of these, one for each of the possible
-	// 256 characters.
-
-	for (i = N + 1; i <= (N + 256); i++) {
-		m_rson[i] = NOT_USED;
-	}
-}
-
-
-/******************************************************************************
- * LZSSCompress::InsertNode	- This function inserts a string from the ring
- *							buffer into one of the trees.  It loads the
- *							match position and length member variables
- *							for the longest match.
- *	
- *							The string to be inserted is identified by
- *							the parameter Pos, A full F bytes are
- *							inserted.  So,
- *							m_ring_buffer[Pos ... Pos+F-1]
- *							are inserted.
- *
- *							If the matched length is exactly F, then an
- *							old node is removed in favor of the new one
- *							(because the old one will be deleted
- *							sooner).
- *
- *							Note that Pos plays a dual role.  It is
- *							used as both a position in the ring buffer
- *							and also as a tree node.
- *							m_ring_buffer[Pos] defines a character that
- *							is used to identify a tree node.
- *
- * ENT:	pos	- position in the buffer
- */
-
-void LZSSCompress::InsertNode(short int Pos)
-{
-	short int i;
-	short int p;
-	int cmp;
-	unsigned char * key;
-
-/*
-	ASSERT(Pos >= 0);
-	ASSERT(Pos < N);
-*/
-
-	cmp = 1;
-	key = &(m_ring_buffer[Pos]);
-
-	// The last 256 entries in m_rson contain the root nodes for
-	// strings that begin with a letter.  Get an index for the
-	// first letter in this string.
-
-	p = (short int) (N + 1 + key[0]);
-
-	// Set the left and right tree nodes for this position to "not
-	// used."
-
-	m_lson[Pos] = NOT_USED;
-	m_rson[Pos] = NOT_USED;
-
-	// Haven't matched anything yet.
-
-	m_match_length = 0;
-
-	for ( ; ; ) {
-		if (cmp >= 0) {
-			if (m_rson[p] != NOT_USED) {
-				p = m_rson[p];
-			}
-			else {
-				m_rson[p] = Pos;
-				m_dad[Pos] = p;
-				return;
-			}
-		}
-		else {
-			if (m_lson[p] != NOT_USED) {
-				p = m_lson[p];
-			}
-			else {
-				m_lson[p] = Pos;
-				m_dad[Pos] = p;
-				return;
-			}
-		}
-
-		// Should we go to the right or the left to look for the
-		// next match?
-
-		for (i = 1; i < F; i++) {
-			cmp = key[i] - m_ring_buffer[p + i];
-			if (cmp != 0)
-				break;
-		}
-
-		if (i > m_match_length) {
-			m_match_position = p;
-			m_match_length = i;
-
-			if (i >= F)
-				break;
-		}
-	}
-
-	m_dad[Pos] = m_dad[p];
-	m_lson[Pos] = m_lson[p];
-	m_rson[Pos] = m_rson[p];
-
-	m_dad[ m_lson[p] ] = Pos;
-	m_dad[ m_rson[p] ] = Pos;
-
-	if (m_rson[ m_dad[p] ] == p) {
-		m_rson[ m_dad[p] ] = Pos;
-	}
-	else {
-		m_lson[ m_dad[p] ] = Pos;
-	}
-
-	// Remove "p"
-
-	m_dad[p] = NOT_USED;
-}
-
-
-/******************************************************************************
- * LZSSCompress::DeleteNode	- This function removes the node "Node" from the
- *							tree.
- *
- * ENT:	node	- node to be removed
- */
-
-void LZSSCompress::DeleteNode(short int Node)
-{
-	short int  q;
-
-/*
-	ASSERT(Node >= 0);
-	ASSERT(Node < (N+1));
-*/
-
-	if (m_dad[Node] == NOT_USED) { // not in tree, nothing to do
-		return;
-	}
-
-	if (m_rson[Node] == NOT_USED) {
-		q = m_lson[Node];
-	}
-	else if (m_lson[Node] == NOT_USED) {
-		q = m_rson[Node];
-	}
-	else {
-		q = m_lson[Node];
-		if (m_rson[q] != NOT_USED) {
-			do {
-				q = m_rson[q];
-			} while (m_rson[q] != NOT_USED);
-
-			m_rson[ m_dad[q] ] = m_lson[q];
-			m_dad[ m_lson[q] ] = m_dad[q];
-			m_lson[q] = m_lson[Node];
-			m_dad[ m_lson[Node] ] = q;
-		}
-
-		m_rson[q] = m_rson[Node];
-		m_dad[ m_rson[Node] ] = q;
-	}
-
-	m_dad[q] = m_dad[Node];
-
-	if (m_rson[ m_dad[Node] ] == Node) {
-		m_rson[ m_dad[Node] ] = q;
-	}
-	else {
-		m_lson[ m_dad[Node] ] = q;
-	}
-
-	m_dad[Node] = NOT_USED;
-}
-
-
-/******************************************************************************
- * LZSSCompress::Encode	- This function "encodes" the input stream into the
- *						output stream.
- *						The GetChars() and SendChars() functions are
- *						used to separate this method from the actual
- *						i/o.
- * 		NOTE:			must set zlen for parent class to know length of
- * 						compressed buffer.
- */
-
-void LZSSCompress::Encode(void)
-{
-	short int i;						// an iterator
-	short int r;						// node number in the binary tree
-	short int s;						// position in the ring buffer
-	unsigned short int len;			 // len of initial string
-	short int last_match_length;		// length of last match
-	short int code_buf_pos;			 // position in the output buffer
-	unsigned char code_buf[17];		 // the output buffer
-	unsigned char mask;				 // bit mask for byte 0 of out buf
-	unsigned char c;					// character read from string
-
-	// Start with a clean tree.
-
-	InitTree();
-	direct = 0;	// set direction needed by parent [Get|Send]Chars()
-
-	// code_buf[0] works as eight flags.  A "1" represents that the
-	// unit is an unencoded letter (1 byte), and a "0" represents
-	// that the next unit is a <position,length> pair (2 bytes).
-	//
-	// code_buf[1..16] stores eight units of code.  Since the best
-	// we can do is store eight <position,length> pairs, at most 16 
-	// bytes are needed to store this.
-	//
-	// This is why the maximum size of the code buffer is 17 bytes.
-
-	code_buf[0] = 0;
-	code_buf_pos = 1;
-
-	// Mask iterates over the 8 bits in the code buffer.  The first
-	// character ends up being stored in the low bit.
-	//
-	//  bit   8   7   6   5   4   3   2   1
-	//		|						   |
-	//		|			 first sequence in code buffer
-	//		|
-	//	  last sequence in code buffer		
-
-	mask = 1;
-
-	s = 0;
-	r = (short int) N - (short int) F;
-
-	// Initialize the ring buffer with spaces...
-
-	// Note that the last F bytes of the ring buffer are not filled.
-	// This is because those F bytes will be filled in immediately
-	// with bytes from the input stream.
-
-	memset(m_ring_buffer, ' ', N - F);
-	
-	// Read F bytes into the last F bytes of the ring buffer.
-	//
-	// This function loads the buffer with X characters and returns
-	// the actual amount loaded.
-
-	len = GetChars((char *) &(m_ring_buffer[r]), F);
-
-	// Make sure there is something to be compressed.
-
-	if (len == 0)
-		return;
-
-	// Insert the F strings, each of which begins with one or more
-	// 'space' characters.  Note the order in which these strings
-	// are inserted.  This way, degenerate trees will be less likely
-	// to occur.
-
-	for (i = 1; i <= F; i++) {
-		InsertNode((short int) (r - i));
-	}
-
-	// Finally, insert the whole string just read.  The
-	// member variables match_length and match_position are set.
-
-	InsertNode(r);
-
-	// Now that we're preloaded, continue till done.
-
-	do {
-
-		// m_match_length may be spuriously long near the end of
-		// text.
-
-		if (m_match_length > len) {
-			m_match_length = len;
-		}
-
-		// Is it cheaper to store this as a single character?  If so,
-		// make it so.
-
-		if (m_match_length < THRESHOLD) {
-			// Send one character.  Remember that code_buf[0] is the
-			// set of flags for the next eight items.
-
-			m_match_length = 1;	 
-			code_buf[0] |= mask;  
-			code_buf[code_buf_pos++] = m_ring_buffer[r];
-		}
-
-		// Otherwise, we do indeed have a string that can be stored
-		// compressed to save space.
-
-		else {
-			// The next 16 bits need to contain the position (12 bits)
-			// and the length (4 bits).
-
-			code_buf[code_buf_pos++] = (unsigned char) m_match_position;
-			code_buf[code_buf_pos++] = (unsigned char) (
-				((m_match_position >> 4) & 0xf0) | 
-				(m_match_length - THRESHOLD) );
-		}
-
-		// Shift the mask one bit to the left so that it will be ready
-		// to store the new bit.
-
-		mask = (unsigned char) (mask << 1);
-
-		// If the mask is now 0, then we know that we have a full set
-		// of flags and items in the code buffer.  These need to be
-		// output.
-
-		if (!mask) {
-			// code_buf is the buffer of characters to be output.
-			// code_buf_pos is the number of characters it contains.
-
-			SendChars((char *) code_buf, code_buf_pos);
-
-			// Reset for next buffer...
-
-			code_buf[0] = 0;
-			code_buf_pos = 1;
-			mask = 1;
-		}
-
-		last_match_length = m_match_length;
-
-		// Delete old strings and read new bytes...
-
-		for (i = 0; i < last_match_length; i++) {
-			// Get next character...
-
-			if (GetChars((char *) &c, 1) != 1)
-				break;
-
-			// Delete "old strings"
-
-			DeleteNode(s);
-
-			// Put this character into the ring buffer.
-			//		  
-			// The original comment here says "If the position is near
-			// the end of the buffer, extend the buffer to make
-			// string comparison easier."
-			//
-			// That's a little misleading, because the "end" of the 
-			// buffer is really what we consider to be the "beginning"
-			// of the buffer, that is, positions 0 through F.
-			//
-			// The idea is that the front end of the buffer is duplicated
-			// into the back end so that when you're looking at characters
-			// at the back end of the buffer, you can index ahead (beyond
-			// the normal end of the buffer) and see the characters
-			// that are at the front end of the buffer wihtout having
-			// to adjust the index.
-			//
-			// That is...
-			//
-			//	  1234xxxxxxxxxxxxxxxxxxxxxxxxxxxxx1234
-			//	  |							   |  |
-			//	  position 0		  end of buffer  |
-			//										 |
-			//				  duplicate of front of buffer
-
-			m_ring_buffer[s] = c;
-
-			if (s < F - 1) {
-				m_ring_buffer[s + N] = c;
-			}
-
-			// Increment the position, and wrap around when we're at
-			// the end.  Note that this relies on N being a power of 2.
-
-			s = (short int) ( (s + 1) & (N - 1) );
-			r = (short int) ( (r + 1) & (N - 1) );
-
-			// Register the string that is found in 
-			// m_ring_buffer[r..r+F-1].
-
-			InsertNode(r);
-		}
-
-		// If we didn't quit because we hit the last_match_length,
-		// then we must have quit because we ran out of characters
-		// to process.
-
-		while (i++ < last_match_length) {							  
-			DeleteNode(s);
-
-			s = (short int) ( (s + 1) & (N - 1) );
-			r = (short int) ( (r + 1) & (N - 1) );
-
-			// Note that len hitting 0 is the key that causes the
-			// do...while() to terminate.  This is the only place
-			// within the loop that len is modified.
-			//
-			// Its original value is F (or a number less than F for
-			// short strings).
-
-			if (--len) {
-				InsertNode(r);	   /* buffer may not be empty. */
-			}
-		}
-
-		// End of do...while() loop.  Continue processing until there
-		// are no more characters to be compressed.  The variable
-		// "len" is used to signal this condition.
-	} while (len > 0);
-
-	// There could still be something in the output buffer.  Send it
-	// now.
-
-	if (code_buf_pos > 1) {
-		// code_buf is the encoded string to send.
-		// code_buf_ptr is the number of characters.
-
-		SendChars((char *) code_buf, code_buf_pos);
-	}
-
-
-	// must set zlen for parent class to know length of compressed buffer
-	zlen = zpos;
-}
-
-
-/******************************************************************************
- * LZSSCompress::Decode	- This function "decodes" the input stream into the
- *						output stream.
- *						The GetChars() and SendChars() functions are
- *						used to separate this method from the actual
- *						i/o.
- */
-
-void LZSSCompress::Decode(void)
-{
-	int k;
-	int r;							  // node number
-	unsigned char c[F];				 // an array of chars
-	unsigned char flags;				// 8 bits of flags
-	int flag_count;					 // which flag we're on
-	short int pos;					  // position in the ring buffer
-	short int len;					  // number of chars in ring buffer
-	unsigned long totalLen = 0;
-
-	direct = 1;	// set direction needed by parent [Get|Send]Chars()
-
-	// Initialize the ring buffer with a common string.
-	//
-	// Note that the last F bytes of the ring buffer are not filled.
-
-	memset(m_ring_buffer, ' ', N - F);
-	
-	r = N - F;
-
-	flags = (char) 0;
-	flag_count = 0;
-
-	for ( ; ; ) {
-
-		// If there are more bits of interest in this flag, then
-		// shift that next interesting bit into the 1's position.
-		//
-		// If this flag has been exhausted, the next byte must 
-		// be a flag.
-
-		if (flag_count > 0) {
-			flags = (unsigned char) (flags >> 1);
-			flag_count--;
-		}
-		else {
-			// Next byte must be a flag.
-
-			if (GetChars((char *) &flags, 1) != 1)
-				break;
-
-			// Set the flag counter.  While at first it might appear
-			// that this should be an 8 since there are 8 bits in the
-			// flag, it should really be a 7 because the shift must
-			// be performed 7 times in order to see all 8 bits.
-
-			flag_count = 7;
-		}
-
-		// If the low order bit of the flag is now set, then we know
-		// that the next byte is a single, unencoded character.
-
-		if (flags & 1) {
-			if (GetChars((char *) c, 1) != 1)
-				break;
-
-			if (SendChars((char *) c, 1) != 1) {
-				totalLen++;
-				break;
-			}
-
-			// Add to buffer, and increment to next spot. Wrap at end.
-
-			m_ring_buffer[r] = c[0];
-			r = (short int) ( (r + 1) & (N - 1) );
-		}
-
-		// Otherwise, we know that the next two bytes are a
-		// <position,length> pair.  The position is in 12 bits and
-		// the length is in 4 bits.
-
-		else {
-			// Original code:
-			//  if ((i = getc(infile)) == EOF)
-			//	  break;
-			//  if ((j = getc(infile)) == EOF)
-			//	  break;
-			//  i |= ((j & 0xf0) << 4);	
-			//  j = (j & 0x0f) + THRESHOLD;
-			//
-			// I've modified this to only make one input call, and
-			// have changed the variable names to something more
-			// obvious.
-
-			if (GetChars((char *) c, 2) != 2)
-				break;
-
-			// Convert these two characters into the position and
-			// length.  Note that the length is always at least
-			// THRESHOLD, which is why we're able to get a length
-			// of 18 out of only 4 bits.
-
-			pos = (short int) ( c[0] | ((c[1] & 0xf0) << 4) );
-
-			len = (short int) ( (c[1] & 0x0f) + THRESHOLD );
-
-			// There are now "len" characters at position "pos" in
-			// the ring buffer that can be pulled out.  Note that
-			// len is never more than F.
-
-			for (k = 0; k < len; k++) {
-				c[k] = m_ring_buffer[(pos + k) & (N - 1)];
-
-				// Add to buffer, and increment to next spot. Wrap at end.
-
-				m_ring_buffer[r] = c[k];
-				r = (short int) ( (r + 1) & (N - 1) );
-			}
-
-			// Add the "len" :characters to the output stream.
-
-			if (SendChars((char *) c, len) != (unsigned int)len) {
-				totalLen += len;
-				break;
-			}
-		}
-	}
-	slen = totalLen;
-}
-
-SWORD_NAMESPACE_END
diff --git a/src/modules/common/rawstr.cpp b/src/modules/common/rawstr.cpp
deleted file mode 100644
index 5c4ef0e..0000000
--- a/src/modules/common/rawstr.cpp
+++ /dev/null
@@ -1,555 +0,0 @@
-/******************************************************************************
- *  rawstr.cpp   - code for class 'RawStr'- a module that reads raw text
- *				files:  ot and nt using indexs ??.bks ??.cps ??.vss
- *				and provides lookup and parsing functions based on
- *				class StrKey
- */
-
-
-#include <stdio.h>
-#include <fcntl.h>
-#include <errno.h>
-
-#ifndef __GNUC__
-#include <io.h>
-#else
-#include <unistd.h>
-#endif
-
-#include <stdlib.h>
-#include <utilfuns.h>
-#include <rawstr.h>
-#include <sysdata.h>
-
-SWORD_NAMESPACE_START
-
-/******************************************************************************
- * RawStr Statics
- */
-
-int RawStr::instance = 0;
-char RawStr::nl = '\n';
-
-
-/******************************************************************************
- * RawStr Constructor - Initializes data for instance of RawStr
- *
- * ENT:	ipath - path of the directory where data and index files are located.
- *		be sure to include the trailing separator (e.g. '/' or '\')
- *		(e.g. 'modules/texts/rawtext/webster/')
- */
-
-RawStr::RawStr(const char *ipath, int fileMode)
-{
-	char buf[127];
-
-	lastoff = -1;
-	path = 0;
-	stdstr(&path, ipath);
-
-#ifndef O_BINARY		// O_BINARY is needed in Borland C++ 4.53
-#define O_BINARY 0		// If it hasn't been defined than we probably
-#endif				// don't need it.
-
-	if (fileMode == -1) { // try read/write if possible
-		fileMode = O_RDWR;
-	}
-		
-	sprintf(buf, "%s.idx", path);
-	idxfd = FileMgr::systemFileMgr.open(buf, fileMode|O_BINARY, true);
-
-	sprintf(buf, "%s.dat", path);
-	datfd = FileMgr::systemFileMgr.open(buf, fileMode|O_BINARY, true);
-
-	if (datfd < 0) {
-		sprintf(buf, "Error: %d", errno);
-		perror(buf);
-	}
-
-	instance++;
-}
-
-
-/******************************************************************************
- * RawStr Destructor - Cleans up instance of RawStr
- */
-
-RawStr::~RawStr()
-{
-	if (path)
-		delete [] path;
-
-	--instance;
-
-	FileMgr::systemFileMgr.close(idxfd);
-	FileMgr::systemFileMgr.close(datfd);
-}
-
-
-/******************************************************************************
- * RawStr::getidxbufdat	- Gets the index string at the given idx offset
- *						NOTE: buf is allocated and must be freed by
- *							calling function
- *
- * ENT:	ioffset	- offset in dat file to lookup
- *		buf		- address of pointer to allocate for storage of string
- */
-
-void RawStr::getIDXBufDat(long ioffset, char **buf)
-{
-	int size;
-	char ch;
-	if (datfd > 0) {
-		lseek(datfd->getFd(), ioffset, SEEK_SET);
-		for (size = 0; read(datfd->getFd(), &ch, 1) == 1; size++) {
-			if ((ch == '\\') || (ch == 10) || (ch == 13))
-				break;
-		}
-		*buf = (*buf) ? (char *)realloc(*buf, size*2 + 1) : (char *)malloc(size*2 + 1);
-		if (size) {
-			lseek(datfd->getFd(), ioffset, SEEK_SET);
-			read(datfd->getFd(), *buf, size);
-		}
-		(*buf)[size] = 0;
-		toupperstr_utf8(*buf, size*2);
-	}
-	else {
-		*buf = (*buf) ? (char *)realloc(*buf, 1) : (char *)malloc(1);
-		**buf = 0;
-	}
-}
-
-
-/******************************************************************************
- * RawStr::getidxbuf	- Gets the index string at the given idx offset
- *						NOTE: buf is allocated and must be freed by
- *							calling function
- *
- * ENT:	ioffset	- offset in idx file to lookup
- *		buf		- address of pointer to allocate for storage of string
- */
-
-void RawStr::getIDXBuf(long ioffset, char **buf)
-{
-	char *trybuf, *targetbuf;
-	long offset;
-	
-	if (idxfd > 0) {
-		lseek(idxfd->getFd(), ioffset, SEEK_SET);
-		read(idxfd->getFd(), &offset, 4);
-
-		offset = swordtoarch32(offset);
-
-		getIDXBufDat(offset, buf);
-	}
-}
-
-
-/******************************************************************************
- * RawStr::findoffset	- Finds the offset of the key string from the indexes
- *
- * ENT:	key		- key string to lookup
- *		start	- address to store the starting offset
- *		size		- address to store the size of the entry
- *		away		- number of entries before of after to jump
- *					(default = 0)
- *
- * RET: error status -1 general error; -2 new file
- */
-
-signed char RawStr::findOffset(const char *ikey, long *start, unsigned short *size, long away, long *idxoff)
-{
-	char *trybuf, *targetbuf, *key = 0, quitflag = 0;
-	signed char retval = -1;
-	long headoff, tailoff, tryoff = 0, maxoff = 0;
-
-	if (idxfd->getFd() >=0) {
-		tailoff = maxoff = lseek(idxfd->getFd(), 0, SEEK_END) - 6;
-		retval = (tailoff >= 0) ? 0 : -2;	// if NOT new file
-		if (*ikey) {
-			headoff = 0;
-
-			stdstr(&key, ikey, 3);
-			toupperstr_utf8(key, strlen(key)*3);
-
-			trybuf = 0;
-
-			while (headoff < tailoff) {
-				tryoff = (lastoff == -1) ? headoff + ((((tailoff / 6) - (headoff / 6))) / 2) * 6 : lastoff; 
-				lastoff = -1;
-				getIDXBuf(tryoff, &trybuf);
-
-				if (!*trybuf && tryoff) {		// In case of extra entry at end of idx (not first entry)
-					tryoff += (tryoff > (maxoff / 2))?-6:6;
-					retval = -1;
-					break;
-				}
-					
-				if (!strcmp(key, trybuf))
-					break;
-
-				int diff = strcmp(key, trybuf);
-				if (diff < 0)
-					tailoff = (tryoff == headoff) ? headoff : tryoff;
-				else headoff = tryoff;
-				if (tailoff == headoff + 6) {
-					if (quitflag++)
-						headoff = tailoff;
-				}
-			}
-			if (headoff >= tailoff)
-				tryoff = headoff;
-			if (trybuf)
-				free(trybuf);
-			delete [] key;
-		}
-		else	tryoff = 0;
-
-		lseek(idxfd->getFd(), tryoff, SEEK_SET);
-
-		*start = *size = 0;
-		read(idxfd->getFd(), start, 4);
-		read(idxfd->getFd(), size, 2);
-		if (idxoff)
-			*idxoff = tryoff;
-
-		*start = swordtoarch32(*start);
-		*size  = swordtoarch16(*size);
-
-		while (away) {
-			long laststart = *start;
-			unsigned short lastsize = *size;
-			long lasttry = tryoff;
-			tryoff += (away > 0) ? 6 : -6;
-		
-			bool bad = false;
-			if (((tryoff + (away*6)) < -6) || (tryoff + (away*6) > (maxoff+6)))
-				bad = true;
-			else if (lseek(idxfd->getFd(), tryoff, SEEK_SET) < 0)
-				bad = true;
-			if (bad) {
-				retval = -1;
-				*start = laststart;
-				*size = lastsize;
-				tryoff = lasttry;
-				if (idxoff)
-					*idxoff = tryoff;
-				break;
-			}
-			read(idxfd->getFd(), start, 4);
-			read(idxfd->getFd(), size, 2);
-			if (idxoff)
-				*idxoff = tryoff;
-
-			*start = swordtoarch32(*start);
-			*size  = swordtoarch16(*size);
-
-			if (((laststart != *start) || (lastsize != *size)) && (*start >= 0) && (*size)) 
-				away += (away < 0) ? 1 : -1;
-		}
-	
-		lastoff = tryoff;
-	}
-	else {
-		*start = 0;
-		*size  = 0;
-		if (idxoff)
-			*idxoff = 0;
-		retval = -1;
-	}
-	return retval;
-}
-
-
-/******************************************************************************
- * RawStr::preptext	- Prepares the text before returning it to external
- *					objects
- *
- * ENT:	buf	- buffer where text is stored and where to store the prep'd
- *				text.
- */
-
-void RawStr::prepText(SWBuf &buf) {
-	unsigned int to, from; 
-	char space = 0, cr = 0, realdata = 0, nlcnt = 0;
-	char *rawBuf = buf.getRawData();
-	for (to = from = 0; rawBuf[from]; from++) {
-		switch (rawBuf[from]) {
-		case 10:
-			if (!realdata)
-				continue;
-			space = (cr) ? 0 : 1;
-			cr = 0;
-			nlcnt++;
-			if (nlcnt > 1) {
-//				*to++ = nl;
-				rawBuf[to++] = 10;
-//				*to++ = nl[1];
-//				nlcnt = 0;
-			}
-			continue;
-		case 13:
-			if (!realdata)
-				continue;
-//			*to++ = nl[0];
-			rawBuf[to++] = 10;
-			space = 0;
-			cr = 1;
-			continue;
-		}
-		realdata = 1;
-		nlcnt = 0;
-		if (space) {
-			space = 0;
-			if (rawBuf[from] != ' ') {
-				rawBuf[to++] = ' ';
-				from--;
-				continue;
-			}
-		}
-		rawBuf[to++] = rawBuf[from];
-	}
-	buf.setSize(to);
-
-	while (to > 1) {			// remove trailing excess
-		to--;
-		if ((rawBuf[to] == 10) || (rawBuf[to] == ' '))
-			buf.setSize(to);
-		else break;
-	}
-}
-
-
-/******************************************************************************
- * RawStr::readtext	- gets text at a given offset
- *
- * ENT:
- *	start	- starting offset where the text is located in the file
- *	size		- size of text entry
- *	buf		- buffer to store text
- *
- */
-
-void RawStr::readText(long istart, unsigned short *isize, char **idxbuf, SWBuf &buf)
-{
-	unsigned int ch;
-	char *idxbuflocal = 0;
-	getIDXBufDat(istart, &idxbuflocal);
-	long start = istart;
-
-	do {
-		if (*idxbuf)
-			delete [] *idxbuf;
-		buf = "";
-		buf.setFillByte(0);
-		buf.setSize(++(*isize));
-
-		*idxbuf = new char [ (*isize) ];
-
-		lseek(datfd->getFd(), start, SEEK_SET);
-		read(datfd->getFd(), buf.getRawData(), (int)((*isize) - 1));
-
-		for (ch = 0; buf[ch]; ch++) {		// skip over index string
-			if (buf[ch] == 10) {
-				ch++;
-				break;
-			}
-		}
-		buf = SWBuf(buf.c_str()+ch);
-		// resolve link
-		if (!strncmp(buf.c_str(), "@LINK", 5)) {
-			for (ch = 0; buf[ch]; ch++) {		// null before nl
-				if (buf[ch] == 10) {
-					buf[ch] = 0;
-					break;
-				}
-			}
-			findOffset(buf.c_str() + 6, &start, isize);
-		}
-		else break;
-	}
-	while (true);	// while we're resolving links
-
-	if (idxbuflocal) {
-		int localsize = strlen(idxbuflocal);
-		localsize = (localsize < (*isize - 1)) ? localsize : (*isize - 1);
-		strncpy(*idxbuf, idxbuflocal, localsize);
-		(*idxbuf)[localsize] = 0;
-		free(idxbuflocal);
-	}
-}
-
-
-/******************************************************************************
- * RawLD::settext	- Sets text for current offset
- *
- * ENT: key	- key for this entry
- *	buf	- buffer to store
- *      len     - length of buffer (0 - null terminated)
- */
-
-void RawStr::doSetText(const char *ikey, const char *buf, long len)
-{
-
-	long start, outstart;
-	long idxoff;
-	long endoff;
-	long shiftSize;
-	unsigned short size;
-	unsigned short outsize;
-	static const char nl[] = {13, 10};
-	char *tmpbuf = 0;
-	char *key = 0;
-	char *dbKey = 0;
-	char *idxBytes = 0;
-	char *outbuf = 0;
-	char *ch = 0;
-
-	char errorStatus = findOffset(ikey, &start, &size, 0, &idxoff);
-	stdstr(&key, ikey, 2);
-	toupperstr_utf8(key, strlen(key)*2);
-
-	len = (len < 0) ? strlen(buf) : len;
-
-	getIDXBufDat(start, &dbKey);
-
-	if (strcmp(key, dbKey) < 0) {
-	}
-	else if (strcmp(key, dbKey) > 0) {
-		if (errorStatus != -2)	// not a new file
-			idxoff += 6;
-		else idxoff = 0;
-	}
-	else if ((!strcmp(key, dbKey)) && (len>0 /*we're not deleting*/)) { // got absolute entry
-		do {
-			tmpbuf = new char [ size + 2 ];
-			memset(tmpbuf, 0, size + 2);
-			lseek(datfd->getFd(), start, SEEK_SET);
-			read(datfd->getFd(), tmpbuf, (int)(size - 1));
-
-			for (ch = tmpbuf; *ch; ch++) {		// skip over index string
-				if (*ch == 10) {
-					ch++;
-					break;
-				}
-			}
-			memmove(tmpbuf, ch, size - (unsigned short)(ch-tmpbuf));
-
-			// resolve link
-			if (!strncmp(tmpbuf, "@LINK", 5) && (len)) {
-				for (ch = tmpbuf; *ch; ch++) {		// null before nl
-					if (*ch == 10) {
-						*ch = 0;
-						break;
-					}
-				}
-				findOffset(tmpbuf + 6, &start, &size, 0, &idxoff);
-			}
-			else break;
-		}
-		while (true);	// while we're resolving links
-	}
-
-	endoff = lseek(idxfd->getFd(), 0, SEEK_END);
-
-	shiftSize = endoff - idxoff;
-
-	if (shiftSize > 0) {
-		idxBytes = new char [ shiftSize ];
-		lseek(idxfd->getFd(), idxoff, SEEK_SET);
-		read(idxfd->getFd(), idxBytes, shiftSize);
-	}
-
-	outbuf = new char [ len + strlen(key) + 5 ];
-	sprintf(outbuf, "%s%c%c", key, 13, 10);
-	size = strlen(outbuf);
-	memcpy(outbuf + size, buf, len);
-	size = outsize = size + (len);
-
-	start = outstart = lseek(datfd->getFd(), 0, SEEK_END);
-
-	outstart = archtosword32(start);
-	outsize  = archtosword16(size);
-
-	lseek(idxfd->getFd(), idxoff, SEEK_SET);
-	if (len > 0) {
-		lseek(datfd->getFd(), start, SEEK_SET);
-		write(datfd->getFd(), outbuf, (int)size);
-
-		// add a new line to make data file easier to read in an editor
-		write(datfd->getFd(), &nl, 2);
-		
-		write(idxfd->getFd(), &outstart, 4);
-		write(idxfd->getFd(), &outsize, 2);
-		if (idxBytes) {
-			write(idxfd->getFd(), idxBytes, shiftSize);
-			delete [] idxBytes;
-		}
-	}
-	else {	// delete entry
-		if (idxBytes) {
-			write(idxfd->getFd(), idxBytes+6, shiftSize-6);
-			lseek(idxfd->getFd(), -1, SEEK_CUR);	// last valid byte
-			FileMgr::systemFileMgr.trunc(idxfd);	// truncate index
-			delete [] idxBytes;
-		}
-	}
-
-	delete [] key;
-	delete [] outbuf;
-	free(dbKey);
-}
-
-
-/******************************************************************************
- * RawLD::linkentry	- links one entry to another
- *
- * ENT: testmt	- testament to find (0 - Bible/module introduction)
- *	destidxoff	- dest offset into .vss
- *	srcidxoff		- source offset into .vss
- */
-
-void RawStr::doLinkEntry(const char *destkey, const char *srckey) {
-	char *text = new char [ strlen(destkey) + 7 ];
-	sprintf(text, "@LINK %s", destkey);
-	doSetText(srckey, text);
-	delete [] text;
-}
-
-
-/******************************************************************************
- * RawLD::CreateModule	- Creates new module files
- *
- * ENT: path	- directory to store module files
- * RET: error status
- */
-
-signed char RawStr::createModule(const char *ipath)
-{
-	char *path = 0;
-	char *buf = new char [ strlen (ipath) + 20 ];
-	FileDesc *fd, *fd2;
-
-	stdstr(&path, ipath);
-
-	if ((path[strlen(path)-1] == '/') || (path[strlen(path)-1] == '\\'))
-		path[strlen(path)-1] = 0;
-
-	sprintf(buf, "%s.dat", path);
-	unlink(buf);
-	fd = FileMgr::systemFileMgr.open(buf, O_CREAT|O_WRONLY|O_BINARY, S_IREAD|S_IWRITE);
-	fd->getFd();
-	FileMgr::systemFileMgr.close(fd);
-
-	sprintf(buf, "%s.idx", path);
-	unlink(buf);
-	fd2 = FileMgr::systemFileMgr.open(buf, O_CREAT|O_WRONLY|O_BINARY, S_IREAD|S_IWRITE);
-	fd2->getFd();
-	FileMgr::systemFileMgr.close(fd2);
-
-	delete [] path;
-	
-	return 0;
-}
-
-SWORD_NAMESPACE_END
diff --git a/src/modules/common/rawstr4.cpp b/src/modules/common/rawstr4.cpp
deleted file mode 100644
index e278675..0000000
--- a/src/modules/common/rawstr4.cpp
+++ /dev/null
@@ -1,561 +0,0 @@
-/******************************************************************************
- *  rawstr.cpp   - code for class 'RawStr'- a module that reads raw text
- *				files:  ot and nt using indexs ??.bks ??.cps ??.vss
- *				and provides lookup and parsing functions based on
- *				class StrKey
- */
-
-#include <stdio.h>
-#include <fcntl.h>
-#include <errno.h>
-
-#ifndef __GNUC__
-#include <io.h>
-#else
-#include <unistd.h>
-#endif
-
-#include <stdlib.h>
-#include <utilfuns.h>
-#include <rawstr4.h>
-#include <sysdata.h>
-
-SWORD_NAMESPACE_START
-
-/******************************************************************************
- * RawStr Statics
- */
-
-int RawStr4::instance = 0;
-
-
-/******************************************************************************
- * RawStr Constructor - Initializes data for instance of RawStr
- *
- * ENT:	ipath - path of the directory where data and index files are located.
- *		be sure to include the trailing separator (e.g. '/' or '\')
- *		(e.g. 'modules/texts/rawtext/webster/')
- */
-
-RawStr4::RawStr4(const char *ipath, int fileMode)
-{
-	char buf[127];
-
-	nl = '\n';
-	lastoff = -1;
-	path = 0;
-	stdstr(&path, ipath);
-
-#ifndef O_BINARY		// O_BINARY is needed in Borland C++ 4.53
-#define O_BINARY 0		// If it hasn't been defined than we probably
-#endif				// don't need it.
-
-	if (fileMode == -1) { // try read/write if possible
-		fileMode = O_RDWR;
-	}
-		
-	sprintf(buf, "%s.idx", path);
-	idxfd = FileMgr::systemFileMgr.open(buf, fileMode|O_BINARY, true);
-
-	sprintf(buf, "%s.dat", path);
-	datfd = FileMgr::systemFileMgr.open(buf, fileMode|O_BINARY, true);
-
-	if (datfd < 0) {
-		sprintf(buf, "Error: %d", errno);
-		perror(buf);
-	}
-
-	instance++;
-}
-
-
-/******************************************************************************
- * RawStr Destructor - Cleans up instance of RawStr
- */
-
-RawStr4::~RawStr4()
-{
-	if (path)
-		delete [] path;
-
-	--instance;
-
-	FileMgr::systemFileMgr.close(idxfd);
-	FileMgr::systemFileMgr.close(datfd);
-}
-
-
-/******************************************************************************
- * RawStr4::getidxbufdat	- Gets the index string at the given idx offset
- *						NOTE: buf is allocated and must be freed by
- *							calling function
- *
- * ENT:	ioffset	- offset in dat file to lookup
- *		buf		- address of pointer to allocate for storage of string
- */
-
-void RawStr4::getIDXBufDat(long ioffset, char **buf) {
-	int size;
-	char ch;
-	if (datfd > 0) {
-		lseek(datfd->getFd(), ioffset, SEEK_SET);
-		for (size = 0; read(datfd->getFd(), &ch, 1) == 1; size++) {
-			if ((ch == '\\') || (ch == 10) || (ch == 13))
-				break;
-		}
-		*buf = (*buf) ? (char *)realloc(*buf, size*2 + 1) : (char *)malloc(size*2 + 1);
-		if (size) {
-			lseek(datfd->getFd(), ioffset, SEEK_SET);
-			read(datfd->getFd(), *buf, size);
-		}
-		(*buf)[size] = 0;
-		toupperstr_utf8(*buf, size*2);
-	}
-	else {
-		*buf = (*buf) ? (char *)realloc(*buf, 1) : (char *)malloc(1);
-		**buf = 0;
-	}
-}
-
-
-/******************************************************************************
- * RawStr4::getidxbuf	- Gets the index string at the given idx offset
- *						NOTE: buf is allocated and must be freed by
- *							calling function
- *
- * ENT:	ioffset	- offset in idx file to lookup
- *		buf		- address of pointer to allocate for storage of string
- */
-
-void RawStr4::getIDXBuf(long ioffset, char **buf)
-{
-	char *trybuf, *targetbuf;
-	long offset;
-	
-	if (idxfd > 0) {
-		lseek(idxfd->getFd(), ioffset, SEEK_SET);
-		read(idxfd->getFd(), &offset, 4);
-
-		offset = swordtoarch32(offset);
-
-		getIDXBufDat(offset, buf);
-		
-/* What the heck is this supposed to do??????
-		for (trybuf = targetbuf = *buf; *trybuf; trybuf++, targetbuf++) {
-			*targetbuf = *trybuf;
-		}
-		*targetbuf = 0;
-		trybuf = 0;
-		toupperstr_utf8(targetbuf);
-*/
-	}
-}
-
-
-/******************************************************************************
- * RawStr4::findoffset	- Finds the offset of the key string from the indexes
- *
- * ENT:	key		- key string to lookup
- *		start	- address to store the starting offset
- *		size		- address to store the size of the entry
- *		away		- number of entries before of after to jump
- *					(default = 0)
- *
- * RET: error status -1 general error; -2 new file
- */
-
-signed char RawStr4::findOffset(const char *ikey, long *start, unsigned long *size, long away, long *idxoff)
-{
-	char *trybuf, *targetbuf, *key = 0, quitflag = 0;
-	signed char retval = -1;
-	long headoff, tailoff, tryoff = 0, maxoff = 0;
-
-	if (idxfd->getFd() >=0) {
-		tailoff = maxoff = lseek(idxfd->getFd(), 0, SEEK_END) - 8;
-		retval = (tailoff >= 0) ? 0 : -2;	// if NOT new file
-		if (*ikey) {
-			headoff = 0;
-
-			stdstr(&key, ikey, 3);
-			toupperstr_utf8(key, strlen(key)*3);
-
-			trybuf = 0;
-
-			while (headoff < tailoff) {
-				tryoff = (lastoff == -1) ? headoff + ((((tailoff / 8) - (headoff / 8))) / 2) * 8 : lastoff; 
-				lastoff = -1;
-				getIDXBuf(tryoff, &trybuf);
-
-				if (!*trybuf) {		// In case of extra entry at end of idx
-					tryoff += (tryoff > (maxoff / 2))?-8:8;
-					retval = -1;
-					break;
-				}
-					
-				if (!strcmp(key, trybuf))
-					break;
-
-				int diff = strcmp(key, trybuf);
-				if (diff < 0)
-					tailoff = (tryoff == headoff) ? headoff : tryoff;
-				else headoff = tryoff;
-				if (tailoff == headoff + 8) {
-					if (quitflag++)
-						headoff = tailoff;
-				}
-			}
-			if (headoff >= tailoff)
-				tryoff = headoff;
-			if (trybuf)
-				free(trybuf);
-			delete [] key;
-		}
-		else	tryoff = 0;
-
-		lseek(idxfd->getFd(), tryoff, SEEK_SET);
-
-		*start = *size = 0;
-		read(idxfd->getFd(), start, 4);
-		read(idxfd->getFd(), size, 4);
-		if (idxoff)
-			*idxoff = tryoff;
-
-		*start = swordtoarch32(*start);
-		*size  = swordtoarch32(*size);
-
-		while (away) {
-			long laststart = *start;
-			unsigned long lastsize = *size;
-			long lasttry = tryoff;
-			tryoff += (away > 0) ? 8 : -8;
-
-			bool bad = false;
-			if (((tryoff + (away*8)) < -8) || (tryoff + (away*8) > (maxoff+8)))
-				bad = true;
-			else if (lseek(idxfd->getFd(), tryoff, SEEK_SET) < 0)
-				bad = true;
-			if (bad) {
-				retval = -1;
-				*start = laststart;
-				*size = lastsize;
-				tryoff = lasttry;
-				if (idxoff)
-					*idxoff = tryoff;
-				break;
-			}
-			read(idxfd->getFd(), start, 4);
-			read(idxfd->getFd(), size, 4);
-			if (idxoff)
-				*idxoff = tryoff;
-
-			*start = swordtoarch32(*start);
-			*size  = swordtoarch32(*size);
-
-			if (((laststart != *start) || (lastsize != *size)) && (*start >= 0) && (*size)) 
-				away += (away < 0) ? 1 : -1;
-		}
-	
-		lastoff = tryoff;
-	}
-	else {
-		*start = 0;
-		*size  = 0;
-		if (idxoff)
-			*idxoff = 0;
-		retval = -1;
-	}
-	return retval;
-}
-
-
-/******************************************************************************
- * RawStr4::preptext	- Prepares the text before returning it to external
- *					objects
- *
- * ENT:	buf	- buffer where text is stored and where to store the prep'd
- *				text.
- */
-
-void RawStr4::prepText(SWBuf &buf) {
-	unsigned int to, from; 
-	char space = 0, cr = 0, realdata = 0, nlcnt = 0;
-	char *rawBuf = buf.getRawData();
-	for (to = from = 0; rawBuf[from]; from++) {
-		switch (rawBuf[from]) {
-		case 10:
-			if (!realdata)
-				continue;
-			space = (cr) ? 0 : 1;
-			cr = 0;
-			nlcnt++;
-			if (nlcnt > 1) {
-//				*to++ = nl;
-				rawBuf[to++] = 10;
-//				*to++ = nl[1];
-//				nlcnt = 0;
-			}
-			continue;
-		case 13:
-			if (!realdata)
-				continue;
-//			*to++ = nl[0];
-			rawBuf[to++] = 10;
-			space = 0;
-			cr = 1;
-			continue;
-		}
-		realdata = 1;
-		nlcnt = 0;
-		if (space) {
-			space = 0;
-			if (rawBuf[from] != ' ') {
-				rawBuf[to++] = ' ';
-				from--;
-				continue;
-			}
-		}
-		rawBuf[to++] = rawBuf[from];
-	}
-	buf.setSize(to);
-
-	while (to > 1) {			// remove trailing excess
-		to--;
-		if ((rawBuf[to] == 10) || (rawBuf[to] == ' '))
-			buf.setSize(to);
-		else break;
-	}
-}
-
-
-/******************************************************************************
- * RawStr4::readtext	- gets text at a given offset
- *
- * ENT:
- *	start	- starting offset where the text is located in the file
- *	size		- size of text entry
- *	buf		- buffer to store text
- *
- */
-
-void RawStr4::readText(long istart, unsigned long *isize, char **idxbuf, SWBuf &buf)
-{
-	unsigned int ch;
-	char *idxbuflocal = 0;
-	getIDXBufDat(istart, &idxbuflocal);
-	long start = istart;
-
-	do {
-		if (*idxbuf)
-			delete [] *idxbuf;
-		*idxbuf = new char [ (*isize) ];
-
-		buf = "";
-		buf.setFillByte(0);
-		buf.setSize(*isize);
-		lseek(datfd->getFd(), start, SEEK_SET);
-		read(datfd->getFd(), buf.getRawData(), (int)((*isize) - 1));
-
-		for (ch = 0; buf[ch]; ch++) {		// skip over index string
-			if (buf[ch] == 10) {
-				ch++;
-				break;
-			}
-		}
-		buf = SWBuf(buf.c_str()+ch);
-		// resolve link
-		if (!strncmp(buf.c_str(), "@LINK", 5)) {
-			for (ch = 0; buf[ch]; ch++) {		// null before nl
-				if (buf[ch] == 10) {
-					buf[ch] = 0;
-					break;
-				}
-			}
-			findOffset(buf.c_str() + 6, &start, isize);
-
-		}
-		else break;
-	}
-	while (true);	// while we're resolving links
-
-	if (idxbuflocal) {
-		int localsize = strlen(idxbuflocal);
-		localsize = (localsize < (*isize - 1)) ? localsize : (*isize - 1);
-		strncpy(*idxbuf, idxbuflocal, localsize);
-		(*idxbuf)[localsize] = 0;
-		free(idxbuflocal);
-	}
-}
-
-
-/******************************************************************************
- * RawLD::settext	- Sets text for current offset
- *
- * ENT: key	- key for this entry
- *	buf	- buffer to store
- *      len     - length of buffer (0 - null terminated)
- */
-
-void RawStr4::doSetText(const char *ikey, const char *buf, long len) {
-
-	long start, outstart;
-	long idxoff;
-	long endoff;
-	long shiftSize;
-	unsigned long size;
-	unsigned long outsize;
-	static const char nl[] = {13, 10};
-	char *tmpbuf = 0;
-	char *key = 0;
-	char *dbKey = 0;
-	char *idxBytes = 0;
-	char *outbuf = 0;
-	char *ch = 0;
-
-	char errorStatus = findOffset(ikey, &start, &size, 0, &idxoff);
-	stdstr(&key, ikey, 3);
-	toupperstr_utf8(key, strlen(key)*3);
-
-	len = (len < 0) ? strlen(buf) : len;
-	getIDXBufDat(start, &dbKey);
-
-	if (strcmp(key, dbKey) < 0) {
-	}
-	else if (strcmp(key, dbKey) > 0) {
-		if (errorStatus != -2)	// not a new file
-			idxoff += 8;
-		else idxoff = 0;
-	}
-	else if ((!strcmp(key, dbKey)) && (len>0/*we're not deleting*/)) { // got absolute entry
-		do {
-			tmpbuf = new char [ size + 2 ];
-			memset(tmpbuf, 0, size + 2);
-			lseek(datfd->getFd(), start, SEEK_SET);
-			read(datfd->getFd(), tmpbuf, (int)(size - 1));
-
-			for (ch = tmpbuf; *ch; ch++) {		// skip over index string
-				if (*ch == 10) {
-					ch++;
-					break;
-				}
-			}
-			memmove(tmpbuf, ch, size - (unsigned long)(ch-tmpbuf));
-
-			// resolve link
-			if (!strncmp(tmpbuf, "@LINK", 5) && (len > 0)) {
-				for (ch = tmpbuf; *ch; ch++) {		// null before nl
-					if (*ch == 10) {
-						*ch = 0;
-						break;
-					}
-				}
-				findOffset(tmpbuf + 8, &start, &size, 0, &idxoff);
-				++size;
-			}
-			else break;
-		}
-		while (true);	// while we're resolving links
-	}
-
-	endoff = lseek(idxfd->getFd(), 0, SEEK_END);
-
-	shiftSize = endoff - idxoff;
-
-	if (shiftSize > 0) {
-		idxBytes = new char [ shiftSize ];
-		lseek(idxfd->getFd(), idxoff, SEEK_SET);
-		read(idxfd->getFd(), idxBytes, shiftSize);
-	}
-
-	outbuf = new char [ len + strlen(key) + 5 ];
-	sprintf(outbuf, "%s%c%c", key, 13, 10);
-	size = strlen(outbuf);
-	memcpy(outbuf + size, buf, len);
-	size = outsize = size + len;
-
-	start = outstart = lseek(datfd->getFd(), 0, SEEK_END);
-
-	outstart = archtosword32(start);
-	outsize  = archtosword32(size);
-
-	lseek(idxfd->getFd(), idxoff, SEEK_SET);
-	if (len>0) {
-		lseek(datfd->getFd(), start, SEEK_SET);
-		write(datfd->getFd(), outbuf, (long)size);
-
-		// add a new line to make data file easier to read in an editor
-		write(datfd->getFd(), &nl, 2);
-		
-		write(idxfd->getFd(), &outstart, 4);
-		write(idxfd->getFd(), &outsize, 4);
-		if (idxBytes) {
-			write(idxfd->getFd(), idxBytes, shiftSize);
-			delete [] idxBytes;
-		}
-	}
-	else {	// delete entry
-		if (idxBytes) {
-			write(idxfd->getFd(), idxBytes+8, shiftSize-8);
-			lseek(idxfd->getFd(), -1, SEEK_CUR);	// last valid byte
-			FileMgr::systemFileMgr.trunc(idxfd);	// truncate index
-			delete [] idxBytes;
-		}
-	}
-
-	delete [] key;
-	delete [] outbuf;
-	free(dbKey);
-}
-
-
-/******************************************************************************
- * RawLD::linkentry	- links one entry to another
- *
- * ENT: testmt	- testament to find (0 - Bible/module introduction)
- *	destidxoff	- dest offset into .vss
- *	srcidxoff		- source offset into .vss
- */
-
-void RawStr4::doLinkEntry(const char *destkey, const char *srckey) {
-	char *text = new char [ strlen(destkey) + 7 ];
-	sprintf(text, "@LINK %s", destkey);
-	doSetText(srckey, text);
-	delete [] text;
-}
-
-
-/******************************************************************************
- * RawLD::CreateModule	- Creates new module files
- *
- * ENT: path	- directory to store module files
- * RET: error status
- */
-
-signed char RawStr4::createModule(const char *ipath)
-{
-	char *path = 0;
-	char *buf = new char [ strlen (ipath) + 20 ];
-	FileDesc *fd, *fd2;
-
-	stdstr(&path, ipath);
-
-	if ((path[strlen(path)-1] == '/') || (path[strlen(path)-1] == '\\'))
-		path[strlen(path)-1] = 0;
-
-	sprintf(buf, "%s.dat", path);
-	unlink(buf);
-	fd = FileMgr::systemFileMgr.open(buf, O_CREAT|O_WRONLY|O_BINARY, S_IREAD|S_IWRITE);
-	fd->getFd();
-	FileMgr::systemFileMgr.close(fd);
-
-	sprintf(buf, "%s.idx", path);
-	unlink(buf);
-	fd2 = FileMgr::systemFileMgr.open(buf, O_CREAT|O_WRONLY|O_BINARY, S_IREAD|S_IWRITE);
-	fd2->getFd();
-	FileMgr::systemFileMgr.close(fd2);
-
-	delete [] path;
-	
-	return 0;
-}
-
-SWORD_NAMESPACE_END
diff --git a/src/modules/common/rawverse.cpp b/src/modules/common/rawverse.cpp
deleted file mode 100644
index b5bff9f..0000000
--- a/src/modules/common/rawverse.cpp
+++ /dev/null
@@ -1,353 +0,0 @@
-/******************************************************************************
- *  rawverse.cpp   - code for class 'RawVerse'- a module that reads raw text
- *			files:  ot and nt using indexs ??.bks ??.cps ??.vss
- *			and provides lookup and parsing functions based on
- *			class VerseKey
- */
-
-
-#include <ctype.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <errno.h>
-
-#ifndef __GNUC__
-#include <io.h>
-#include <sys/stat.h>
-#else
-#include <unistd.h>
-#endif
-
-#include <utilfuns.h>
-#include <rawverse.h>
-#include <versekey.h>
-#include <sysdata.h>
-
-#ifndef O_BINARY		// O_BINARY is needed in Borland C++ 4.53
-#define O_BINARY 0		// If it hasn't been defined than we probably
-#endif				// don't need it.
-
-SWORD_NAMESPACE_START
-
-/******************************************************************************
- * RawVerse Statics
- */
-
-int RawVerse::instance = 0;
-const char *RawVerse::nl = "\r\n";
-
-
-/******************************************************************************
- * RawVerse Constructor - Initializes data for instance of RawVerse
- *
- * ENT:	ipath - path of the directory where data and index files are located.
- *		be sure to include the trailing separator (e.g. '/' or '\')
- *		(e.g. 'modules/texts/rawtext/webster/')
- */
-
-RawVerse::RawVerse(const char *ipath, int fileMode)
-{
-	char *buf;
-
-	path = 0;
-	stdstr(&path, ipath);
-     buf = new char [ strlen(path) + 80 ];
-	if ((path[strlen(path)-1] == '/') || (path[strlen(path)-1] == '\\'))
-		path[strlen(path)-1] = 0;
-
-	if (fileMode == -1) { // try read/write if possible
-		fileMode = O_RDWR;
-	}
-		
-	sprintf(buf, "%s/ot.vss", path);
-	idxfp[0] = FileMgr::systemFileMgr.open(buf, fileMode|O_BINARY, true);
-
-	sprintf(buf, "%s/nt.vss", path);
-	idxfp[1] = FileMgr::systemFileMgr.open(buf, fileMode|O_BINARY, true);
-
-	sprintf(buf, "%s/ot", path);
-	textfp[0] = FileMgr::systemFileMgr.open(buf, fileMode|O_BINARY, true);
-
-	sprintf(buf, "%s/nt", path);
-	textfp[1] = FileMgr::systemFileMgr.open(buf, fileMode|O_BINARY, true);
-
-	delete [] buf;
-	instance++;
-}
-
-
-/******************************************************************************
- * RawVerse Destructor - Cleans up instance of RawVerse
- */
-
-RawVerse::~RawVerse()
-{
-	int loop1;
-
-	if (path)
-		delete [] path;
-
-	--instance;
-
-	for (loop1 = 0; loop1 < 2; loop1++) {
-		FileMgr::systemFileMgr.close(idxfp[loop1]);
-		FileMgr::systemFileMgr.close(textfp[loop1]);
-	}
-}
-
-
-/******************************************************************************
- * RawVerse::findoffset	- Finds the offset of the key verse from the indexes
- *
- * ENT: testmt	- testament to find (0 - Bible/module introduction)
- *	idxoff	- offset into .vss
- *	start	- address to store the starting offset
- *	size	- address to store the size of the entry
- */
-
-void RawVerse::findOffset(char testmt, long idxoff, long *start, unsigned short *size) {
-	idxoff *= 6;
-	if (!testmt)
-		testmt = ((idxfp[1]) ? 1:2);
-		
-	if (idxfp[testmt-1]->getFd() >= 0) {
-		lseek(idxfp[testmt-1]->getFd(), idxoff, SEEK_SET);
-		read(idxfp[testmt-1]->getFd(), start, 4);
-		long len = read(idxfp[testmt-1]->getFd(), size, 2); 		// read size
-
-		*start = swordtoarch32(*start);
-		*size  = swordtoarch16(*size);
-
-		if (len < 2) {
-			*size = (unsigned short)((*start) ? (lseek(textfp[testmt-1]->getFd(), 0, SEEK_END) - (long)*start) : 0);	// if for some reason we get an error reading size, make size to end of file
-		}
-	}
-	else {
-		*start = 0;
-		*size = 0;
-	}
-}
-
-
-/******************************************************************************
- * RawVerse::preptext	- Prepares the text before returning it to external
- *				objects
- *
- * ENT:	buf	- buffer where text is stored and where to store the prep'd
- *			text.
- */
-
-void RawVerse::prepText(SWBuf &buf) {
-	unsigned int to, from; 
-	char space = 0, cr = 0, realdata = 0, nlcnt = 0;
-	char *rawBuf = buf.getRawData();
-	for (to = from = 0; rawBuf[from]; from++) {
-		switch (rawBuf[from]) {
-		case 10:
-			if (!realdata)
-				continue;
-			space = (cr) ? 0 : 1;
-			cr = 0;
-			nlcnt++;
-			if (nlcnt > 1) {
-//				*to++ = nl;
-				rawBuf[to++] = 10;
-//				*to++ = nl[1];
-//				nlcnt = 0;
-			}
-			continue;
-		case 13:
-			if (!realdata)
-				continue;
-//			*to++ = nl[0];
-			rawBuf[to++] = 10;
-			space = 0;
-			cr = 1;
-			continue;
-		}
-		realdata = 1;
-		nlcnt = 0;
-		if (space) {
-			space = 0;
-			if (rawBuf[from] != ' ') {
-				rawBuf[to++] = ' ';
-				from--;
-				continue;
-			}
-		}
-		rawBuf[to++] = rawBuf[from];
-	}
-	buf.setSize(to);
-
-	while (to > 1) {			// remove trailing excess
-		to--;
-		if ((rawBuf[to] == 10) || (rawBuf[to] == ' '))
-			buf.setSize(to);
-		else break;
-	}
-}
-
-
-/******************************************************************************
- * RawVerse::readtext	- gets text at a given offset
- *
- * ENT:	testmt	- testament file to search in (0 - Old; 1 - New)
- *	start	- starting offset where the text is located in the file
- *	size	- size of text entry + 2 (null)(null)
- *	buf	- buffer to store text
- *
- */
-
-void RawVerse::readText(char testmt, long start, unsigned short size, SWBuf &buf) {
-	buf = "";
-	buf.setFillByte(0);
-	buf.setSize(size + 1);
-	if (!testmt)
-		testmt = ((idxfp[1]) ? 1:2);
-	if (size) {
-		if (textfp[testmt-1]->getFd() >= 0) {
-			lseek(textfp[testmt-1]->getFd(), start, SEEK_SET);
-			read(textfp[testmt-1]->getFd(), buf.getRawData(), (int)size); 
-		}
-	}
-}
-
-
-/******************************************************************************
- * RawVerse::settext	- Sets text for current offset
- *
- * ENT: testmt	- testament to find (0 - Bible/module introduction)
- *	idxoff	- offset into .vss
- *	buf	- buffer to store
- *      len     - length of buffer (0 - null terminated)
- */
-
-void RawVerse::doSetText(char testmt, long idxoff, const char *buf, long len)
-{
-	long start, outstart;
-	unsigned short size;
-	unsigned short outsize;
-
-	idxoff *= 6;
-	if (!testmt)
-		testmt = ((idxfp[1]) ? 1:2);
-
-	size = outsize = (len < 0) ? strlen(buf) : len;
-
-	start = outstart = lseek(textfp[testmt-1]->getFd(), 0, SEEK_END);
-	lseek(idxfp[testmt-1]->getFd(), idxoff, SEEK_SET);
-
-	if (size) {
-		lseek(textfp[testmt-1]->getFd(), start, SEEK_SET);
-		write(textfp[testmt-1]->getFd(), buf, (int)size);
-
-		// add a new line to make data file easier to read in an editor
-		write(textfp[testmt-1]->getFd(), nl, 2);
-	}
-	else {
-		start = 0;
-	}
-
-	outstart = archtosword32(start);
-	outsize  = archtosword16(size);
-
-	write(idxfp[testmt-1]->getFd(), &outstart, 4);
-	write(idxfp[testmt-1]->getFd(), &outsize, 2);
-
-
-}
-
-
-/******************************************************************************
- * RawVerse::linkentry	- links one entry to another
- *
- * ENT: testmt	- testament to find (0 - Bible/module introduction)
- *	destidxoff	- dest offset into .vss
- *	srcidxoff		- source offset into .vss
- */
-
-void RawVerse::doLinkEntry(char testmt, long destidxoff, long srcidxoff) {
-	long start;
-	unsigned short size;
-
-	destidxoff *= 6;
-	srcidxoff  *= 6;
-
-	if (!testmt)
-		testmt = ((idxfp[1]) ? 1:2);
-
-	// get source
-	lseek(idxfp[testmt-1]->getFd(), srcidxoff, SEEK_SET);
-	read(idxfp[testmt-1]->getFd(), &start, 4);
-	read(idxfp[testmt-1]->getFd(), &size, 2);
-
-	// write dest
-	lseek(idxfp[testmt-1]->getFd(), destidxoff, SEEK_SET);
-	write(idxfp[testmt-1]->getFd(), &start, 4);
-	write(idxfp[testmt-1]->getFd(), &size, 2);
-}
-
-
-/******************************************************************************
- * RawVerse::CreateModule	- Creates new module files
- *
- * ENT: path	- directory to store module files
- * RET: error status
- */
-
-char RawVerse::createModule(const char *ipath)
-{
-	char *path = 0;
-	char *buf = new char [ strlen (ipath) + 20 ];
-	FileDesc *fd, *fd2;
-
-	stdstr(&path, ipath);
-
-	if ((path[strlen(path)-1] == '/') || (path[strlen(path)-1] == '\\'))
-		path[strlen(path)-1] = 0;
-
-	sprintf(buf, "%s/ot", path);
-	unlink(buf);
-	fd = FileMgr::systemFileMgr.open(buf, O_CREAT|O_WRONLY|O_BINARY, S_IREAD|S_IWRITE);
-	fd->getFd();
-	FileMgr::systemFileMgr.close(fd);
-
-	sprintf(buf, "%s/nt", path);
-	unlink(buf);
-	fd = FileMgr::systemFileMgr.open(buf, O_CREAT|O_WRONLY|O_BINARY, S_IREAD|S_IWRITE);
-	fd->getFd();
-	FileMgr::systemFileMgr.close(fd);
-
-	sprintf(buf, "%s/ot.vss", path);
-	unlink(buf);
-	fd = FileMgr::systemFileMgr.open(buf, O_CREAT|O_WRONLY|O_BINARY, S_IREAD|S_IWRITE);
-	fd->getFd();
-
-	sprintf(buf, "%s/nt.vss", path);
-	unlink(buf);
-	fd2 = FileMgr::systemFileMgr.open(buf, O_CREAT|O_WRONLY|O_BINARY, S_IREAD|S_IWRITE);
-	fd2->getFd();
-
-	VerseKey vk;
-	vk.Headings(1);
-	long offset = 0;
-	short size = 0;
-	for (vk = TOP; !vk.Error(); vk++) {
-		write((vk.Testament() == 1) ? fd->getFd() : fd2->getFd(), &offset, 4);
-		write((vk.Testament() == 1) ? fd->getFd() : fd2->getFd(), &size, 2);
-	}
-
-	FileMgr::systemFileMgr.close(fd);
-	FileMgr::systemFileMgr.close(fd2);
-
-	delete [] path;
-	delete [] buf;
-/*
-	RawVerse rv(path);
-	VerseKey mykey("Rev 22:21");
-*/
-	
-	return 0;
-}
-
-SWORD_NAMESPACE_END
diff --git a/src/modules/common/sapphire.cpp b/src/modules/common/sapphire.cpp
deleted file mode 100644
index 1c97934..0000000
--- a/src/modules/common/sapphire.cpp
+++ /dev/null
@@ -1,231 +0,0 @@
-/* sapphire.cpp -- the Saphire II stream cipher class.
-   Dedicated to the Public Domain the author and inventor:
-   (Michael Paul Johnson).  This code comes with no warranty.
-   Use it at your own risk.
-   Ported from the Pascal implementation of the Sapphire Stream
-   Cipher 9 December 1994.
-   Added hash pre- and post-processing 27 December 1994.
-   Modified initialization to make index variables key dependent,
-   made the output function more resistant to cryptanalysis,
-   and renamed to Sapphire II 2 January 1995
-*/
-
-
-#ifdef WIN32
-#include <memory.h>
-#endif
-
-#ifdef UNIX
-#include <memory.h>
-#include <unistd.h>
-#else
-#ifndef _MSC_VER
-#include <mem.h>
-#endif
-#endif
-
-#ifdef _WIN32_WCE
-#include <string.h>
-#endif
-
-#include "sapphire.h"
-
-SWORD_NAMESPACE_START
-
-unsigned char sapphire::keyrand(int limit,
-                                unsigned char *user_key,
-                                unsigned char keysize,
-                                unsigned char *rsum,
-                                unsigned *keypos)
-    {
-    unsigned u,             // Value from 0 to limit to return.
-        retry_limiter,      // No infinite loops allowed.
-        mask;               // Select just enough bits.
-
-    if (!limit) return 0;   // Avoid divide by zero error.
-    retry_limiter = 0;
-    mask = 1;               // Fill mask with enough bits to cover
-    while (mask < (unsigned)limit)    // the desired range.
-        mask = (mask << 1) + 1;
-    do
-        {
-        *rsum = cards[*rsum] + user_key[(*keypos)++];
-        if (*keypos >= keysize)
-            {
-            *keypos = 0;            // Recycle the user key.
-            *rsum += keysize;   // key "aaaa" != key "aaaaaaaa"
-            }
-        u = mask & *rsum;
-        if (++retry_limiter > 11)
-            u %= limit;     // Prevent very rare long loops.
-        }
-    while (u > (unsigned)limit);
-    return u;
-    }
-
-void sapphire::initialize(unsigned char *key, unsigned char keysize)
-    {
-    // Key size may be up to 256 bytes.
-    // Pass phrases may be used directly, with longer length
-    // compensating for the low entropy expected in such keys.
-    // Alternatively, shorter keys hashed from a pass phrase or
-    // generated randomly may be used. For random keys, lengths
-    // of from 4 to 16 bytes are recommended, depending on how
-    // secure you want this to be.
-
-    int i;
-    unsigned char toswap, swaptemp, rsum;
-    unsigned keypos;
-
-    // If we have been given no key, assume the default hash setup.
-
-    if (keysize < 1)
-        {
-        hash_init();
-        return;
-        }
-
-    // Start with cards all in order, one of each.
-
-    for (i=0;i<256;i++)
-        cards[i] = i;
-
-    // Swap the card at each position with some other card.
-
-    toswap = 0;
-    keypos = 0;         // Start with first byte of user key.
-    rsum = 0;
-    for (i=255;i>=0;i--)
-        {
-        toswap = keyrand(i, key, keysize, &rsum, &keypos);
-        swaptemp = cards[i];
-        cards[i] = cards[toswap];
-        cards[toswap] = swaptemp;
-        }
-
-    // Initialize the indices and data dependencies.
-    // Indices are set to different values instead of all 0
-    // to reduce what is known about the state of the cards
-    // when the first byte is emitted.
-
-    rotor = cards[1];
-    ratchet = cards[3];
-    avalanche = cards[5];
-    last_plain = cards[7];
-    last_cipher = cards[rsum];
-
-    toswap = swaptemp = rsum = 0;
-    keypos = 0;
-    }
-
-void sapphire::hash_init(void)
-    {
-    // This function is used to initialize non-keyed hash
-    // computation.
-
-    int i, j;
-
-    // Initialize the indices and data dependencies.
-
-    rotor = 1;
-    ratchet = 3;
-    avalanche = 5;
-    last_plain = 7;
-    last_cipher = 11;
-
-    // Start with cards all in inverse order.
-
-    for (i=0, j=255;i<256;i++,j--)
-        cards[i] = (unsigned char) j;
-    }
-
-sapphire::sapphire(unsigned char *key, unsigned char keysize)
-    {
-    if (key && keysize)
-        initialize(key, keysize);
-    }
-
-void sapphire::burn(void)
-    {
-    // Destroy the key and state information in RAM.
-    memset(cards, 0, 256);
-    rotor = ratchet = avalanche = last_plain = last_cipher = 0;
-    }
-
-sapphire::~sapphire()
-    {
-    burn();
-    }
-
-unsigned char sapphire::encrypt(unsigned char b)
-    {
-#ifdef USBINARY
-    // Picture a single enigma rotor with 256 positions, rewired
-    // on the fly by card-shuffling.
-
-    // This cipher is a variant of one invented and written
-    // by Michael Paul Johnson in November, 1993.
-
-    unsigned char swaptemp;
-
-    // Shuffle the deck a little more.
-
-    ratchet += cards[rotor++];
-    swaptemp = cards[last_cipher];
-    cards[last_cipher] = cards[ratchet];
-    cards[ratchet] = cards[last_plain];
-    cards[last_plain] = cards[rotor];
-    cards[rotor] = swaptemp;
-    avalanche += cards[swaptemp];
-
-    // Output one byte from the state in such a way as to make it
-    // very hard to figure out which one you are looking at.
-
-    last_cipher = b^cards[(cards[ratchet] + cards[rotor]) & 0xFF] ^
-                  cards[cards[(cards[last_plain] +
-                               cards[last_cipher] +
-                               cards[avalanche])&0xFF]];
-    last_plain = b;
-    return last_cipher;
-#else
-    return b;
-#endif
-    }
-
-unsigned char sapphire::decrypt(unsigned char b)
-    {
-    unsigned char swaptemp;
-
-    // Shuffle the deck a little more.
-
-    ratchet += cards[rotor++];
-    swaptemp = cards[last_cipher];
-    cards[last_cipher] = cards[ratchet];
-    cards[ratchet] = cards[last_plain];
-    cards[last_plain] = cards[rotor];
-    cards[rotor] = swaptemp;
-    avalanche += cards[swaptemp];
-
-    // Output one byte from the state in such a way as to make it
-    // very hard to figure out which one you are looking at.
-
-    last_plain = b^cards[(cards[ratchet] + cards[rotor]) & 0xFF] ^
-                   cards[cards[(cards[last_plain] +
-                                cards[last_cipher] +
-                                cards[avalanche])&0xFF]];
-    last_cipher = b;
-    return last_plain;
-    }
-
-void sapphire::hash_final(unsigned char *hash,      // Destination
-                          unsigned char hashlength) // Size of hash.
-    {
-    int i;
-
-    for (i=255;i>=0;i--)
-        encrypt((unsigned char) i);
-    for (i=0;i<hashlength;i++)
-        hash[i] = encrypt(0);
-    }
-
-SWORD_NAMESPACE_END
diff --git a/src/modules/common/swcipher.cpp b/src/modules/common/swcipher.cpp
deleted file mode 100644
index bd4d551..0000000
--- a/src/modules/common/swcipher.cpp
+++ /dev/null
@@ -1,128 +0,0 @@
-/******************************************************************************
- *  swcipher.cpp   - code for class 'SWCipher'- a driver class that provides
- *				cipher utilities.
- */
-
-#include <stdlib.h>
-#include <string.h>
-#include <swcipher.h>
-
-SWORD_NAMESPACE_START
-
-/******************************************************************************
- * SWCipher Constructor - Initializes data for instance of SWCipher
- *
- */
-
-SWCipher::SWCipher(unsigned char *key) {
-	master.initialize(key, strlen((char *)key));
-	buf = 0;
-}
-
-
-/******************************************************************************
- * SWCipher Destructor - Cleans up instance of SWCipher
- */
-
-SWCipher::~SWCipher()
-{
-	if (buf)
-		free(buf);
-}
-
-
-char *SWCipher::Buf(const char *ibuf, unsigned long ilen)
-{
-	if (ibuf) {
-	
-		if (buf)
-			free(buf);
-
-		if (!ilen) {
-		        len = strlen(buf);
-			ilen = len + 1;
-		}
-		else len = ilen;
-
-		buf = (char *) malloc(ilen);
-		memcpy(buf, ibuf, ilen);
-		cipher = false;
-	}
-
-	Decode();
-
-	return buf;
-}
-
-
-char *SWCipher::cipherBuf(unsigned long *ilen, const char *ibuf)
-{
-	if (ibuf) {
-	
-		if (buf)
-			free(buf);
-			
-		buf = (char *) malloc(*ilen+1);
-		memcpy(buf, ibuf, *ilen);
-		len = *ilen;
-		cipher = true;
-	}
-
-	Encode();
-
-	*ilen = len;
-	return buf;
-}
-
-
-/******************************************************************************
- * SWCipher::Encode	- This function "encodes" the input stream into the
- *						output stream.
- *						The GetChars() and SendChars() functions are
- *						used to separate this method from the actual
- *						i/o.
- */
-
-void SWCipher::Encode(void)
-{
-	if (!cipher) {
-		work = master;
-		for (unsigned long i = 0; i < len; i++)
-			buf[i] = work.encrypt(buf[i]);
-		cipher = true;
-	}
-}
-
-
-/******************************************************************************
- * SWCipher::Decode	- This function "decodes" the input stream into the
- *						output stream.
- *						The GetChars() and SendChars() functions are
- *						used to separate this method from the actual
- *						i/o.
- */
-
-void SWCipher::Decode(void)
-{
-	if (cipher) {
-		work = master;
-		unsigned long i;
-		for (i = 0; i < len; i++)
-			buf[i] = work.decrypt(buf[i]);
-		buf[i] = 0;
-		cipher = false;
-	}
-}
-
-
-/******************************************************************************
- * SWCipher::setCipherKey	- setter for a new CipherKey
- *
- */
-
-void SWCipher::setCipherKey(const char *ikey) {
-	unsigned char *key = (unsigned char *)ikey;
-	master.initialize(key, strlen((char *)key));
-}
-
-SWORD_NAMESPACE_END
diff --git a/src/modules/common/swcomprs.cpp b/src/modules/common/swcomprs.cpp
deleted file mode 100644
index 02d7d7b..0000000
--- a/src/modules/common/swcomprs.cpp
+++ /dev/null
@@ -1,193 +0,0 @@
-/******************************************************************************
- *  swcomprs.cpp   - code for class 'SWCompress'- a driver class that provides
- *				compression utilities.
- */
-
-#include <stdlib.h>
-#include <string.h>
-#include <swcomprs.h>
-
-SWORD_NAMESPACE_START
-
-/******************************************************************************
- * SWCompress Constructor - Initializes data for instance of SWCompress
- *
- */
-
-SWCompress::SWCompress()
-{
-	buf = zbuf = 0;
-	Init();
-}
-
-
-/******************************************************************************
- * SWCompress Destructor - Cleans up instance of SWCompress
- */
-
-SWCompress::~SWCompress()
-{
-	if (zbuf)
-		free(zbuf);
-
-	if (buf)
-		free(buf);
-}
-
-
-void SWCompress::Init()
-{
-		if (buf)
-			free(buf);
-
-		if (zbuf)
-			free(zbuf);
-
-		buf    = 0;
-		zbuf   = 0;
-		direct  = 0;
-		zlen    = 0;
-		slen    = 0;
-		zpos    = 0;
-		pos     = 0;
-}
-
-
-char *SWCompress::Buf(const char *ibuf, unsigned long *len) {
-	// setting an uncompressed buffer
-	if (ibuf) {
-		Init();
-		slen = (len) ? *len : strlen(ibuf);
-		buf = (char *) calloc(slen + 1, 1);
-		memcpy(buf, ibuf, slen);
-	}
-
-	// getting an uncompressed buffer
-	if (!buf) {
-		buf = (char *)calloc(1,1); // be sure we at least allocate an empty buf for return;
-		direct = 1;
-		Decode();
-//		slen = strlen(buf);
-		if (len)
-			*len = slen;
-	}
-	return buf;
-}
-
-
-char *SWCompress::zBuf(unsigned long *len, char *ibuf)
-{
-	// setting a compressed buffer
-	if (ibuf) {
-		Init();
-		zbuf = (char *) malloc(*len);
-		memcpy(zbuf, ibuf, *len);
-		zlen = *len;
-	}
-
-	// getting a compressed buffer
-	if (!zbuf) {
-		direct = 0;
-		Encode();
-	}
-
-	*len = zlen;
-	return zbuf;
-}
-
-
-unsigned long SWCompress::GetChars(char *ibuf, unsigned long len)
-{
-	if (direct) {
-		len = (((zlen - zpos) > (unsigned)len) ? len : zlen - zpos);
-		if (len > 0) {
-			memmove(ibuf, &zbuf[zpos], len);
-			zpos += len;
-		}
-	}
-	else {
-//		slen = strlen(buf);
-		len = (((slen - pos) > (unsigned)len) ? len : slen - pos);
-		if (len > 0) {
-			memmove(ibuf, &buf[pos], len);
-			pos += len;
-		}
-	}
-	return len;
-}
-	
-
-unsigned long SWCompress::SendChars(char *ibuf, unsigned long len)
-{
-	if (direct) {
-		if (buf) {
-//			slen = strlen(buf);
-			if ((pos + len) > (unsigned)slen) {
-				buf = (char *) realloc(buf, pos + len + 1024);
-				memset(&buf[pos], 0, len + 1024);
-			}
-		}
-		else	buf = (char *)calloc(1, len + 1024);
-		memmove(&buf[pos], ibuf, len);
-		pos += len;
-	}
-	else {
-		if (zbuf) {
-			if ((zpos + len) > zlen) {
-				zbuf = (char *) realloc(zbuf, zpos + len + 1024);
-				zlen = zpos + len + 1024;
-			}
-		}
-		else {
-			zbuf = (char *)calloc(1, len + 1024);
-			zlen = len + 1024;
-		}
-		memmove(&zbuf[zpos], ibuf, len);
-		zpos += len;
-	}
-	return len;
-}
-
-
-/******************************************************************************
- * SWCompress::Encode	- This function "encodes" the input stream into the
- *						output stream.
- *						The GetChars() and SendChars() functions are
- *						used to separate this method from the actual
- *						i/o.
- */
-
-void SWCompress::Encode(void)
-{
-	cycleStream();
-}
-
-
-/******************************************************************************
- * SWCompress::Decode	- This function "decodes" the input stream into the
- *						output stream.
- *						The GetChars() and SendChars() functions are
- *						used to separate this method from the actual
- *						i/o.
- */
-
-void SWCompress::Decode(void)
-{
-	cycleStream();
-}
-
-
-void SWCompress::cycleStream() {
-	char buf[1024];
-	unsigned long len, totlen = 0;
-
-	do {
-		len = GetChars(buf, 1024);
-		if (len)
-			totlen += SendChars(buf, len);
-	} while (len == 1024);
-
-	zlen = slen = totlen;
-}
-
-SWORD_NAMESPACE_END
diff --git a/src/modules/common/swcomprs.doc b/src/modules/common/swcomprs.doc
deleted file mode 100644
index b6817f2..0000000
--- a/src/modules/common/swcomprs.doc
+++ /dev/null
@@ -1,802 +0,0 @@
-The following is the original information send from Parson's Technologies via
-Craig Rairden.
-_______________________________________________________________________________
-Compression Info, 10-11-95
-Jeff Wheeler
-
-Source of Algorithm
--------------------
-
-The compression algorithms used here are based upon the algorithms developed
-and published by Haruhiko Okumura in a paper entitled "Data Compression
-Algorithms of LARC and LHarc."  This paper discusses three compression
-algorithms, LSZZ, LZARI, and LZHUF.  LZSS is described as the "first" of
-these, and is described as providing moderate compression with good speed. 
-LZARI is described as an improved LZSS, a combination of the LZSS algorithm
-with adaptive arithmetic compression.  It is described as being slower than
-LZSS but with better compression.  LZHUF (the basis of the common LHA
-compression program) was included in the paper, however, a free usage license
-was not included. 
-
-The following are copies of the statements included at the beginning of each
-source code listing that was supplied in the working paper.
-
-        LZSS, dated 4/6/89, marked as "Use, distribute and
-        modify this program freely."
-
-        LZARI, dated 4/7/89, marked as "Use, distribute and
-        modify this program freely."
-
-        LZHUF, dated 11/20/88, written by Haruyasu Yoshizaki,
-        translated by Haruhiko Okumura on 4/7/89.  Not
-        expressly marked as redistributable or modifiable.
-
-Since both LZSS and LZARI are marked as "use, distribute and modify freely" we
-have felt at liberty basing our compression algorithm on either of these.
-
-Selection of Algorithm
-----------------------
-
-Working samples of three possible compression algorithms are supplied in
-Okumura's paper.  Which should be used?
-
-LZSS is the fastest at decompression, but does not generated as small a
-compressed file as the other methods. The other two methods provided, perhaps,
-a 15% improvement in compression.  Or, put another way, on a 100K file, LZSS
-might compress it to 50K while the others might approach 40-45K.  For STEP
-purposes, it was decided that decoding speed was of more importance than
-tighter compression. For these reasons, the first compression algorithm
-implemented is the LZSS algorithm.
-
-About LZSS Encoding
--------------------
-
-(adapted from Haruhiko Okumura's paper)
-
-This scheme was proposed by Ziv and Lempel [1].  A slightly modified version
-is described by Storer and Szymanski [2]. An implementation using a binary
-tree has been proposed by Bell [3].
-
-The algorithm is quite simple.
-1. Keep a ring buffer which initially contains all space characters.
-2. Read several letters from the file to the buffer.
-3. Search the buffer for the longest string that matches the letters just
-   read, and send its length and position into the buffer.
-
-If the ring buffer is 4096 bytes, the position can be stored in 12 bits.  If the
-length is represented in 4 bits, the <position, length> pair is two bytes
-long.  If the longest match is no more than two characters, then just one
-character is sent without encoding.  The process starts again with the next
-character.  An extra bit is sent each time to tell the decoder whether the
-next item is a character of a <position, length> pair.
-
-[1] J. Ziv and A. Lempel, IEEE Transactions IT-23, 337-343 (1977).
-[2] J. A. Storer and T. G. Szymanski, J. ACM, 29, 928-951 (1982).
-[3] T.C. Gell, IEEE Transactions COM-34, 1176-1182 (1986).
-
-class SWCompress {
-public:
-void InitTree(                      // no return value
-    void);                          // no parameters
-
-void InsertNode(                    // no return value
-    short int Pos);                 // position in the buffer
-
-void DeleteNode(                    // no return value
-    short int Node);                // node to be removed
-
-void Encode(                        // no return value
-    void);                          // no parameters
-
-void Decode(                        // no return value
-    void);                          // no parameters
-};
-
-// The following are constant sizes used by the compression algorithm.
-//
-//  N         - This is the size of the ring buffer.  It is set
-//              to 4K.  It is important to note that a position
-//              within the ring buffer requires 12 bits.  
-//
-//  F         - This is the maximum length of a character sequence
-//              that can be taken from the ring buffer.  It is set
-//              to 18.  Note that a length must be 3 before it is
-//              worthwhile to store a position/length pair, so the
-//              length can be encoded in only 4 bits.  Or, put yet
-//              another way, it is not necessary to encode a length
-//              of 0-18, it is necessary to encode a length of
-//              3-18, which requires 4 bits.
-//              
-//  THRESHOLD - It takes 2 bytes to store an offset and
-//              a length.  If a character sequence only
-//              requires 1 or 2 characters to store 
-//              uncompressed, then it is better to store
-//              it uncompressed than as an offset into
-//              the ring buffer.
-//
-// Note that the 12 bits used to store the position and the 4 bits
-// used to store the length equal a total of 16 bits, or 2 bytes.
-
-#define N		4096
-#define F		18
-#define THRESHOLD	3
-#define NOT_USED	N
-
-// m_ring_buffer is a text buffer.  It contains "nodes" of
-// uncompressed text that can be indexed by position.  That is,
-// a substring of the ring buffer can be indexed by a position
-// and a length.  When decoding, the compressed text may contain
-// a position in the ring buffer and a count of the number of
-// bytes from the ring buffer that are to be moved into the
-// uncompressed buffer.  
-//
-// This ring buffer is not maintained as part of the compressed
-// text.  Instead, it is reconstructed dynamically.  That is,
-// it starts out empty and gets built as the text is decompressed.
-//
-// The ring buffer contain N bytes, with an additional F - 1 bytes
-// to facilitate string comparison.
-
-unsigned char m_ring_buffer[N + F - 1];
-
-// m_match_position and m_match_length are set by InsertNode().
-//
-// These variables indicate the position in the ring buffer 
-// and the number of characters at that position that match
-// a given string.
-
-short int m_match_position;
-short int m_match_length;
-
-// m_lson, m_rson, and m_dad are the Japanese way of referring to
-// a tree structure.  The dad is the parent and it has a right and
-// left son (child).
-//
-// For i = 0 to N-1, m_rson[i] and m_lson[i] will be the right 
-// and left children of node i.  
-//
-// For i = 0 to N-1, m_dad[i] is the parent of node i.
-//
-// For i = 0 to 255, rson[N + i + 1] is the root of the tree for 
-// strings that begin with the character i.  Note that this requires 
-// one byte characters.
-//
-// These nodes store values of 0...(N-1).  Memory requirements
-// can be reduces by using 2-byte integers instead of full 4-byte
-// integers (for 32-bit applications).  Therefore, these are 
-// defined as "short ints."
-
-short int m_lson[N + 1];
-short int m_rson[N + 257];
-short int m_dad[N + 1];
-
-
-
-
-/*
- -------------------------------------------------------------------------
-    cLZSS::InitTree
-    
-    This function initializes the tree nodes to "empty" states. 
- -------------------------------------------------------------------------
-*/
-
-void cLZSS::InitTree(               // no return value
-    void)                           // no parameters
-    throw()                         // exception list
-
-    {
-    int  i;
-
-    // For i = 0 to N - 1, m_rson[i] and m_lson[i] will be the right
-    // and left children of node i.  These nodes need not be
-    // initialized.  However, for debugging purposes, it is nice to
-    // have them initialized.  Since this is only used for compression
-    // (not decompression), I don't mind spending the time to do it.
-    //
-    // For the same range of i, m_dad[i] is the parent of node i.
-    // These are initialized to a known value that can represent
-    // a "not used" state.
-    
-    for (i = 0; i < N; i++)
-        {
-        m_lson[i] = NOT_USED;
-        m_rson[i] = NOT_USED;
-        m_dad[i] = NOT_USED;
-        }
-
-    // For i = 0 to 255, m_rson[N + i + 1] is the root of the tree
-    // for strings that begin with the character i.  This is why
-    // the right child array is larger than the left child array.
-    // These are also initialzied to a "not used" state.
-    //
-    // Note that there are 256 of these, one for each of the possible
-    // 256 characters.
-
-    for (i = N + 1; i <= (N + 256); i++)
-        {
-        m_rson[i] = NOT_USED;
-        }
-
-    // Done.
-    }
-
-/*
- -------------------------------------------------------------------------
-    cLZSS::InsertNode
-    
-    This function inserts a string from the ring buffer into one of
-    the trees.  It loads the match position and length member variables
-    for the longest match.
-    
-    The string to be inserted is identified by the parameter Pos,
-    A full F bytes are inserted.  So, m_ring_buffer[Pos ... Pos+F-1]
-    are inserted.
-
-    If the matched length is exactly F, then an old node is removed
-    in favor of the new one (because the old one will be deleted
-    sooner).
-
-    Note that Pos plays a dual role.  It is used as both a position
-    in the ring buffer and also as a tree node.  m_ring_buffer[Pos]
-    defines a character that is used to identify a tree node.
- -------------------------------------------------------------------------
-*/
-
-void cLZSS::InsertNode(                 // no return value
-    short int Pos)                      // position in the buffer
-    throw()                             // exception list
-
-    {
-    short int i;
-    short int p;
-    int cmp;
-    unsigned char * key;
-
-    ASSERT(Pos >= 0);
-    ASSERT(Pos < N);
-
-    cmp = 1;
-    key = &(m_ring_buffer[Pos]);
-
-    // The last 256 entries in m_rson contain the root nodes for
-    // strings that begin with a letter.  Get an index for the
-    // first letter in this string.
-
-    p = (short int) (N + 1 + key[0]);
-
-    // Set the left and right tree nodes for this position to "not
-    // used."
-
-    m_lson[Pos] = NOT_USED;
-    m_rson[Pos] = NOT_USED;
-
-    // Haven't matched anything yet.
-
-    m_match_length = 0;
-
-    for ( ; ; )
-        {
-        if (cmp >= 0)
-            {
-            if (m_rson[p] != NOT_USED)
-                {
-                p = m_rson[p];
-                }
-            else
-                {
-                m_rson[p] = Pos;
-                m_dad[Pos] = p;
-                return;
-                }
-            }
-        else
-            {
-            if (m_lson[p] != NOT_USED)
-                {
-                p = m_lson[p];
-                }
-            else
-                {
-                m_lson[p] = Pos;
-                m_dad[Pos] = p;
-                return;
-                }
-            }
-
-        // Should we go to the right or the left to look for the
-        // next match?
-
-        for (i = 1; i < F; i++)
-            {
-            cmp = key[i] - m_ring_buffer[p + i];
-            if (cmp != 0)
-                break;
-            }
-
-        if (i > m_match_length)
-            {
-            m_match_position = p;
-            m_match_length = i;
-
-            if (i >= F)
-                break;
-            }
-        }
-
-    m_dad[Pos] = m_dad[p];
-    m_lson[Pos] = m_lson[p];
-    m_rson[Pos] = m_rson[p];
-
-    m_dad[ m_lson[p] ] = Pos;
-    m_dad[ m_rson[p] ] = Pos;
-
-    if (m_rson[ m_dad[p] ] == p)
-        {
-        m_rson[ m_dad[p] ] = Pos;
-        }
-    else
-        {
-        m_lson[ m_dad[p] ] = Pos;
-        }
-
-    // Remove "p"
-
-    m_dad[p] = NOT_USED;
-    }
-
-/*
- -------------------------------------------------------------------------
-    cLZSS::DeleteNode   
-
-    This function removes the node "Node" from the tree.
- -------------------------------------------------------------------------
-*/
-
-void cLZSS::DeleteNode(                 // no return value
-    short int Node)                     // node to be removed
-    throw()                             // exception list
-
-    {
-    short int  q;
-
-    ASSERT(Node >= 0);
-    ASSERT(Node < (N+1));
-
-    if (m_dad[Node] == NOT_USED)
-        {
-        // not in tree, nothing to do
-        return;
-        }
-
-    if (m_rson[Node] == NOT_USED)
-        {
-        q = m_lson[Node];
-        }
-    else if (m_lson[Node] == NOT_USED)
-        {
-        q = m_rson[Node];
-        }
-    else
-        {
-        q = m_lson[Node];
-        if (m_rson[q] != NOT_USED)
-            {
-            do
-                {
-                q = m_rson[q];
-                }
-            while (m_rson[q] != NOT_USED);
-
-            m_rson[ m_dad[q] ] = m_lson[q];
-            m_dad[ m_lson[q] ] = m_dad[q];
-            m_lson[q] = m_lson[Node];
-            m_dad[ m_lson[Node] ] = q;
-            }
-
-        m_rson[q] = m_rson[Node];
-        m_dad[ m_rson[Node] ] = q;
-        }
-
-    m_dad[q] = m_dad[Node];
-
-    if (m_rson[ m_dad[Node] ] == Node)
-        {
-        m_rson[ m_dad[Node] ] = q;
-        }
-    else
-        {
-        m_lson[ m_dad[Node] ] = q;
-        }
-
-    m_dad[Node] = NOT_USED;
-    }
-
-/*
- -------------------------------------------------------------------------
-    cLZSS::Encode
-
-    This function "encodes" the input stream into the output stream.
-    The GetChars() and SendChars() functions are used to separate
-    this method from the actual i/o.
- -------------------------------------------------------------------------
-*/
-
-void cLZSS::Encode(                     // no return value
-    void)                               // no parameters
-
-    {
-    short int i;                        // an iterator
-    short int r;                        // node number in the binary tree
-    short int s;                        // position in the ring buffer
-    unsigned short int len;             // len of initial string
-    short int last_match_length;        // length of last match
-    short int code_buf_pos;             // position in the output buffer
-    unsigned char code_buf[17];         // the output buffer
-    unsigned char mask;                 // bit mask for byte 0 of out buf
-    unsigned char c;                    // character read from string
-
-    // Start with a clean tree.
-
-    InitTree();
-
-    // code_buf[0] works as eight flags.  A "1" represents that the
-    // unit is an unencoded letter (1 byte), and a "0" represents
-    // that the next unit is a <position,length> pair (2 bytes).
-    //
-    // code_buf[1..16] stores eight units of code.  Since the best
-    // we can do is store eight <position,length> pairs, at most 16 
-    // bytes are needed to store this.
-    //
-    // This is why the maximum size of the code buffer is 17 bytes.
-
-    code_buf[0] = 0;
-    code_buf_pos = 1;
-
-    // Mask iterates over the 8 bits in the code buffer.  The first
-    // character ends up being stored in the low bit.
-    //
-    //  bit   8   7   6   5   4   3   2   1
-    //        |                           |
-    //        |             first sequence in code buffer
-    //        |
-    //      last sequence in code buffer        
-
-    mask = 1;
-
-    s = 0;
-    r = (short int) N - (short int) F;
-
-    // Initialize the ring buffer with spaces...
-
-    // Note that the last F bytes of the ring buffer are not filled.
-    // This is because those F bytes will be filled in immediately
-    // with bytes from the input stream.
-
-    memset(m_ring_buffer, ' ', N - F);
-    
-    // Read F bytes into the last F bytes of the ring buffer.
-    //
-    // This function loads the buffer with X characters and returns
-    // the actual amount loaded.
-
-    len = GetChars(&(m_ring_buffer[r]), F);
-
-    // Make sure there is something to be compressed.
-
-    if (len == 0)
-        return;
-
-    // Insert the F strings, each of which begins with one or more
-    // 'space' characters.  Note the order in which these strings
-    // are inserted.  This way, degenerate trees will be less likely
-    // to occur.
-
-    for (i = 1; i <= F; i++)
-        {
-        InsertNode((short int) (r - i));
-        }
-
-    // Finally, insert the whole string just read.  The
-    // member variables match_length and match_position are set.
-
-    InsertNode(r);
-
-    // Now that we're preloaded, continue till done.
-
-    do
-        {
-
-        // m_match_length may be spuriously long near the end of
-        // text.
-
-        if (m_match_length > len)
-            {
-            m_match_length = len;
-            }
-
-        // Is it cheaper to store this as a single character?  If so,
-        // make it so.
-
-        if (m_match_length < THRESHOLD)
-            {
-            // Send one character.  Remember that code_buf[0] is the
-            // set of flags for the next eight items.
-
-            m_match_length = 1;     
-            code_buf[0] |= mask;  
-            code_buf[code_buf_pos++] = m_ring_buffer[r];
-            }
-
-        // Otherwise, we do indeed have a string that can be stored
-        // compressed to save space.
-
-        else
-            {
-            // The next 16 bits need to contain the position (12 bits)
-            // and the length (4 bits).
-
-            code_buf[code_buf_pos++] = (unsigned char) m_match_position;
-            code_buf[code_buf_pos++] = (unsigned char) (
-                ((m_match_position >> 4) & 0xf0) | 
-                (m_match_length - THRESHOLD) );
-            }
-
-        // Shift the mask one bit to the left so that it will be ready
-        // to store the new bit.
-
-        mask = (unsigned char) (mask << 1);
-
-        // If the mask is now 0, then we know that we have a full set
-        // of flags and items in the code buffer.  These need to be
-        // output.
-
-        if (mask == 0)
-            {
-            // code_buf is the buffer of characters to be output.
-            // code_buf_pos is the number of characters it contains.
-
-            SendChars(code_buf, code_buf_pos);
-
-            // Reset for next buffer...
-
-            code_buf[0] = 0;
-            code_buf_pos = 1;
-            mask = 1;
-            }
-
-        last_match_length = m_match_length;
-
-        // Delete old strings and read new bytes...
-
-        for (i = 0; i < last_match_length; i++)
-            {
-
-            // Get next character...
-
-            if (GetChars(&c, 1) != 1)
-                break;
-
-            // Delete "old strings"
-
-            DeleteNode(s);
-
-            // Put this character into the ring buffer.
-            //          
-            // The original comment here says "If the position is near
-            // the end of the buffer, extend the buffer to make
-            // string comparison easier."
-            //
-            // That's a little misleading, because the "end" of the 
-            // buffer is really what we consider to be the "beginning"
-            // of the buffer, that is, positions 0 through F.
-            //
-            // The idea is that the front end of the buffer is duplicated
-            // into the back end so that when you're looking at characters
-            // at the back end of the buffer, you can index ahead (beyond
-            // the normal end of the buffer) and see the characters
-            // that are at the front end of the buffer wihtout having
-            // to adjust the index.
-            //
-            // That is...
-            //
-            //      1234xxxxxxxxxxxxxxxxxxxxxxxxxxxxx1234
-            //      |                               |  |
-            //      position 0          end of buffer  |
-            //                                         |
-            //                  duplicate of front of buffer
-
-            m_ring_buffer[s] = c;
-
-            if (s < F - 1)
-                {
-                m_ring_buffer[s + N] = c;
-                }
-
-            // Increment the position, and wrap around when we're at
-            // the end.  Note that this relies on N being a power of 2.
-
-            s = (short int) ( (s + 1) & (N - 1) );
-            r = (short int) ( (r + 1) & (N - 1) );
-
-            // Register the string that is found in 
-            // m_ring_buffer[r..r+F-1].
-
-            InsertNode(r);
-            }
-
-        // If we didn't quit because we hit the last_match_length,
-        // then we must have quit because we ran out of characters
-        // to process.
-
-        while (i++ < last_match_length)
-            {                              
-            DeleteNode(s);
-
-            s = (short int) ( (s + 1) & (N - 1) );
-            r = (short int) ( (r + 1) & (N - 1) );
-
-            // Note that len hitting 0 is the key that causes the
-            // do...while() to terminate.  This is the only place
-            // within the loop that len is modified.
-            //
-            // Its original value is F (or a number less than F for
-            // short strings).
-
-            if (--len)
-                {
-                InsertNode(r);       /* buffer may not be empty. */
-                }
-            }
-
-        // End of do...while() loop.  Continue processing until there
-        // are no more characters to be compressed.  The variable
-        // "len" is used to signal this condition.
-        }
-    while (len > 0);
-
-    // There could still be something in the output buffer.  Send it
-    // now.
-
-    if (code_buf_pos > 1)
-        {
-        // code_buf is the encoded string to send.
-        // code_buf_ptr is the number of characters.
-
-        SendChars(code_buf, code_buf_pos);
-        }
-
-    // Done!
-    }
-
-/*
- -------------------------------------------------------------------------
-    cLZSS::Decode   
-
-    This function "decodes" the input stream into the output stream.
-    The GetChars() and SendChars() functions are used to separate
-    this method from the actual i/o.
- -------------------------------------------------------------------------
-*/
-
-void cLZSS::Decode(                     // no return value
-    void)                               // no parameters
-
-    {
-    int k;
-    int r;                              // node number
-    unsigned char c[F];                 // an array of chars
-    unsigned char flags;                // 8 bits of flags
-    int flag_count;                     // which flag we're on
-    short int pos;                      // position in the ring buffer
-    short int len;                      // number of chars in ring buffer
-
-    // Initialize the ring buffer with a common string.
-    //
-    // Note that the last F bytes of the ring buffer are not filled.
-
-    memset(m_ring_buffer, ' ', N - F);
-    
-    r = N - F;
-
-    flags = (char) 0;
-    flag_count = 0;
-
-    for ( ; ; )
-        {
-
-        // If there are more bits of interest in this flag, then
-        // shift that next interesting bit into the 1's position.
-        //
-        // If this flag has been exhausted, the next byte must 
-        // be a flag.
-
-        if (flag_count > 0)
-            {
-            flags = (unsigned char) (flags >> 1);
-            flag_count--;
-            }
-        else
-            {
-            // Next byte must be a flag.
-
-            if (GetChars(&flags, 1) != 1)
-                break;
-
-            // Set the flag counter.  While at first it might appear
-            // that this should be an 8 since there are 8 bits in the
-            // flag, it should really be a 7 because the shift must
-            // be performed 7 times in order to see all 8 bits.
-
-            flag_count = 7;
-            }
-
-        // If the low order bit of the flag is now set, then we know
-        // that the next byte is a single, unencoded character.
-
-        if (flags & 1)
-            {
-            if (GetChars(c, 1) != 1)
-                break;
-
-            if (SendChars(c, 1) != 1)
-                break;
-
-            // Add to buffer, and increment to next spot. Wrap at end.
-
-            m_ring_buffer[r] = c[0];
-            r = (short int) ( (r + 1) & (N - 1) );
-            }
-
-        // Otherwise, we know that the next two bytes are a
-        // <position,length> pair.  The position is in 12 bits and
-        // the length is in 4 bits.
-
-        else
-            {
-            // Original code:
-            //  if ((i = getc(infile)) == EOF)
-            //      break;
-            //  if ((j = getc(infile)) == EOF)
-            //      break;
-            //  i |= ((j & 0xf0) << 4);    
-            //  j = (j & 0x0f) + THRESHOLD;
-            //
-            // I've modified this to only make one input call, and
-            // have changed the variable names to something more
-            // obvious.
-
-            if (GetChars(c, 2) != 2)
-                break;
-
-            // Convert these two characters into the position and
-            // length.  Note that the length is always at least
-            // THRESHOLD, which is why we're able to get a length
-            // of 18 out of only 4 bits.
-
-            pos = (short int) ( c[0] | ((c[1] & 0xf0) << 4) );
-
-            len = (short int) ( (c[1] & 0x0f) + THRESHOLD );
-
-            // There are now "len" characters at position "pos" in
-            // the ring buffer that can be pulled out.  Note that
-            // len is never more than F.
-
-            for (k = 0; k < len; k++)
-                {
-                c[k] = m_ring_buffer[(pos + k) & (N - 1)];
-
-                // Add to buffer, and increment to next spot. Wrap at end.
-
-                m_ring_buffer[r] = c[k];
-                r = (short int) ( (r + 1) & (N - 1) );
-                }
-
-            // Add the "len" characters to the output stream.
-
-            if (SendChars(c, len) != len)
-                break;
-            }
-        }
-    }
-
diff --git a/src/modules/common/zipcomprs.cpp b/src/modules/common/zipcomprs.cpp
deleted file mode 100644
index 6a5ed22..0000000
--- a/src/modules/common/zipcomprs.cpp
+++ /dev/null
@@ -1,161 +0,0 @@
-/******************************************************************************
- *  swcomprs.cpp   - code for class 'ZipCompress'- a driver class that provides
- *				compression utilities. - using zlib
- */
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <zipcomprs.h>
-#include <zlib.h>
-
-SWORD_NAMESPACE_START
-
-/******************************************************************************
- * ZipCompress Constructor - Initializes data for instance of ZipCompress
- *
- */
-
-ZipCompress::ZipCompress() : SWCompress()
-{
-//	fprintf(stderr, "init compress\n");
-}
-
-
-/******************************************************************************
- * ZipCompress Destructor - Cleans up instance of ZipCompress
- */
-
-ZipCompress::~ZipCompress() {
-}
-
-
-/******************************************************************************
- * ZipCompress::Encode	- This function "encodes" the input stream into the
- *						output stream.
- *						The GetChars() and SendChars() functions are
- *						used to separate this method from the actual
- *						i/o.
- * 		NOTE:			must set zlen for parent class to know length of
- * 						compressed buffer.
- */
-
-void ZipCompress::Encode(void)
-{
-/*
-ZEXTERN int ZEXPORT compress OF((Bytef *dest,   uLongf *destLen,
-                                 const Bytef *source, uLong sourceLen));
-     Compresses the source buffer into the destination buffer.  sourceLen is
-   the byte length of the source buffer. Upon entry, destLen is the total
-   size of the destination buffer, which must be at least 0.1% larger than
-   sourceLen plus 12 bytes. Upon exit, destLen is the actual size of the
-   compressed buffer.
-     This function can be used to compress a whole file at once if the
-   input file is mmap'ed.
-     compress returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_BUF_ERROR if there was not enough room in the output
-   buffer.
-*/
-	direct = 0;	// set direction needed by parent [Get|Send]Chars()
-
-	// get buffer
-	char chunk[1024];
-	char *buf = (char *)calloc(1, 1024);
-	char *chunkbuf = buf;
-	unsigned long chunklen;
-	unsigned long len = 0;
-	while((chunklen = GetChars(chunk, 1023))) {
-		memcpy(chunkbuf, chunk, chunklen);
-		len += chunklen;
-		if (chunklen < 1023)
-			break;
-		else	buf = (char *)realloc(buf, len + 1024);
-		chunkbuf = buf+len;
-	}
-
-
-	zlen = (long) (len*1.001)+15;
-	char *zbuf = new char[zlen+1];
-	if (len)
-	{
-		//printf("Doing compress\n");
-		if (compress((Bytef*)zbuf, &zlen, (const Bytef*)buf, len)!=Z_OK)
-		{
-			printf("ERROR in compression\n");
-		}
-		else {
-			SendChars(zbuf, zlen);
-		}
-	}
-	else
-	{
-		fprintf(stderr, "No buffer to compress\n");
-	}
-	delete [] zbuf;
-	free (buf);
-}
-
-
-/******************************************************************************
- * ZipCompress::Decode	- This function "decodes" the input stream into the
- *						output stream.
- *						The GetChars() and SendChars() functions are
- *						used to separate this method from the actual
- *						i/o.
- */
-
-void ZipCompress::Decode(void)
-{
-/*
-ZEXTERN int ZEXPORT uncompress OF((Bytef *dest,   uLongf *destLen,
-                                   const Bytef *source, uLong sourceLen));
-     Decompresses the source buffer into the destination buffer.  sourceLen is
-   the byte length of the source buffer. Upon entry, destLen is the total
-   size of the destination buffer, which must be large enough to hold the
-   entire uncompressed data. (The size of the uncompressed data must have
-   been saved previously by the compressor and transmitted to the decompressor
-   by some mechanism outside the scope of this compression library.)
-   Upon exit, destLen is the actual size of the compressed buffer.
-     This function can be used to decompress a whole file at once if the
-   input file is mmap'ed.
-
-     uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_BUF_ERROR if there was not enough room in the output
-   buffer, or Z_DATA_ERROR if the input data was corrupted.
-*/
-
-	// get buffer
-	char chunk[1024];
-	char *zbuf = (char *)calloc(1, 1024);
-	char *chunkbuf = zbuf;
-	int chunklen;
-	unsigned long zlen = 0;
-	while((chunklen = GetChars(chunk, 1023))) {
-		memcpy(chunkbuf, chunk, chunklen);
-		zlen += chunklen;
-		if (chunklen < 1023)
-			break;
-		else	zbuf = (char *)realloc(zbuf, zlen + 1024);
-		chunkbuf = zbuf + zlen;
-	}
-
-	//printf("Decoding complength{%ld} uncomp{%ld}\n", zlen, blen);
-	if (zlen) {
-		unsigned long blen = zlen*20;	// trust compression is less than 1000%
-		char *buf = new char[blen]; 
-		//printf("Doing decompress {%s}\n", zbuf);
-		if (uncompress((Bytef*)buf, &blen, (Bytef*)zbuf, zlen) != Z_OK) {
-			fprintf(stderr, "no room in outbuffer to during decompression. see zipcomp.cpp\n");
-		}
-		SendChars(buf, blen);
-		delete [] buf;
-		slen = blen;
-	}
-	else {
-		fprintf(stderr, "No buffer to decompress!\n");
-	}
-	//printf("Finished decoding\n");
-	free (zbuf);
-}
-
-SWORD_NAMESPACE_END
diff --git a/src/modules/common/zstr.cpp b/src/modules/common/zstr.cpp
deleted file mode 100644
index 92a4960..0000000
--- a/src/modules/common/zstr.cpp
+++ /dev/null
@@ -1,718 +0,0 @@
-/******************************************************************************
- *  zstr.cpp   - code for class 'zStr'- a module that reads compressed text
- *		files and provides lookup and parsing functions based on
- *		class StrKey
- */
-
-#include <stdio.h>
-#include <fcntl.h>
-#include <errno.h>
-
-#ifndef __GNUC__
-#include <io.h>
-#else
-#include <unistd.h>
-#endif
-
-#include <stdlib.h>
-#include <utilfuns.h>
-#include <zstr.h>
-#include <swcomprs.h>
-
-#include <sysdata.h>
-#include <entriesblk.h>
-
-SWORD_NAMESPACE_START
-
-/******************************************************************************
- * zStr Statics
- */
-
-int zStr::instance = 0;
-const int zStr::IDXENTRYSIZE = 8;
-const int zStr::ZDXENTRYSIZE = 8;
-
-
-/******************************************************************************
- * zStr Constructor - Initializes data for instance of zStr
- *
- * ENT:	ipath - path of the directory where data and index files are located.
- */
-
-zStr::zStr(const char *ipath, int fileMode, long blockCount, SWCompress *icomp) {
-	char buf[127];
-
-	nl = '\n';
-	lastoff = -1;
-	path = 0;
-	stdstr(&path, ipath);
-
-	compressor = (icomp) ? icomp : new SWCompress();
-	this->blockCount = blockCount;
-#ifndef O_BINARY		// O_BINARY is needed in Borland C++ 4.53
-#define O_BINARY 0		// If it hasn't been defined than we probably
-#endif				// don't need it.
-
-	if (fileMode == -1) { // try read/write if possible
-		fileMode = O_RDWR;
-	}
-		
-	sprintf(buf, "%s.idx", path);
-	idxfd = FileMgr::systemFileMgr.open(buf, fileMode|O_BINARY, true);
-
-	sprintf(buf, "%s.dat", path);
-	datfd = FileMgr::systemFileMgr.open(buf, fileMode|O_BINARY, true);
-
-	sprintf(buf, "%s.zdx", path);
-	zdxfd = FileMgr::systemFileMgr.open(buf, fileMode|O_BINARY, true);
-
-	sprintf(buf, "%s.zdt", path);
-	zdtfd = FileMgr::systemFileMgr.open(buf, fileMode|O_BINARY, true);
-
-	if (datfd <= 0) {
-		sprintf(buf, "Error: %d", errno);
-		perror(buf);
-	}
-
-	cacheBlock = 0;
-	cacheBlockIndex = -1;
-	cacheDirty = false;
-
-	instance++;
-}
-
-
-/******************************************************************************
- * zStr Destructor - Cleans up instance of zStr
- */
-
-zStr::~zStr() {
-
-	flushCache();
-
-	if (path)
-		delete [] path;
-
-	--instance;
-
-	FileMgr::systemFileMgr.close(idxfd);
-	FileMgr::systemFileMgr.close(datfd);
-	FileMgr::systemFileMgr.close(zdxfd);
-	FileMgr::systemFileMgr.close(zdtfd);
-
-
-	if (compressor)
-		delete compressor;
-
-}
-
-
-/******************************************************************************
- * zStr::getidxbufdat	- Gets the index string at the given dat offset
- *				NOTE: buf is calloc'd, or if not null, realloc'd and must
- *					be free'd by calling function
- *
- * ENT:	ioffset	- offset in dat file to lookup
- *		buf		- address of pointer to allocate for storage of string
- */
-
-void zStr::getKeyFromDatOffset(long ioffset, char **buf) {
-	int size;
-	char ch;
-	if (datfd > 0) {
-		lseek(datfd->getFd(), ioffset, SEEK_SET);
-		for (size = 0; read(datfd->getFd(), &ch, 1) == 1; size++) {
-			if ((ch == '\\') || (ch == 10) || (ch == 13))
-				break;
-		}
-		*buf = (*buf) ? (char *)realloc(*buf, size*2 + 1) : (char *)malloc(size*2 + 1);
-		if (size) {
-			lseek(datfd->getFd(), ioffset, SEEK_SET);
-			read(datfd->getFd(), *buf, size);
-		}
-		(*buf)[size] = 0;
-		toupperstr_utf8(*buf, size*2);
-	}
-	else {
-		*buf = (*buf) ? (char *)realloc(*buf, 1) : (char *)malloc(1);
-		**buf = 0;
-	}
-}
-
-
-/******************************************************************************
- * zStr::getidxbuf	- Gets the index string at the given idx offset
- *						NOTE: buf is calloc'd, or if not null, realloc'd
- *							and must be freed by calling function
- *
- * ENT:	ioffset	- offset in idx file to lookup
- *		buf		- address of pointer to allocate for storage of string
- */
-
-void zStr::getKeyFromIdxOffset(long ioffset, char **buf) {
-	__u32 offset;
-	
-	if (idxfd > 0) {
-		lseek(idxfd->getFd(), ioffset, SEEK_SET);
-		read(idxfd->getFd(), &offset, sizeof(__u32));
-		offset = swordtoarch32(offset);
-		getKeyFromDatOffset(offset, buf);
-	}
-}
-
-
-/******************************************************************************
- * zStr::findoffset	- Finds the offset of the key string from the indexes
- *
- * ENT:	key		- key string to lookup
- *		offset	- address to store the starting offset
- *		size		- address to store the size of the entry
- *		away		- number of entries before of after to jump
- *					(default = 0)
- *
- * RET: error status
- */
-
-signed char zStr::findKeyIndex(const char *ikey, long *idxoff, long away) {
-	char *trybuf = 0, *key = 0, quitflag = 0;
-	signed char retval = 0;
-	__s32 headoff, tailoff, tryoff = 0, maxoff = 0;
-	__u32 start, size;
-
-	if (idxfd->getFd() >= 0) {
-		tailoff = maxoff = lseek(idxfd->getFd(), 0, SEEK_END) - IDXENTRYSIZE;
-		if (*ikey) {
-			headoff = 0;
-			stdstr(&key, ikey, 3);
-			toupperstr_utf8(key, strlen(key)*3);
-
-			while (headoff < tailoff) {
-				tryoff = (lastoff == -1) ? headoff + (((((tailoff / IDXENTRYSIZE) - (headoff / IDXENTRYSIZE))) / 2) * IDXENTRYSIZE) : lastoff;
-				lastoff = -1;
-
-				getKeyFromIdxOffset(tryoff, &trybuf);
-
-				if (!*trybuf && tryoff) {		// In case of extra entry at end of idx (not first entry)
-					tryoff += (tryoff > (maxoff / 2))?-IDXENTRYSIZE:IDXENTRYSIZE;
-					retval = -1;
-					break;
-				}
-
-				int diff = strcmp(key, trybuf);
-				if (!diff)
-					break;
-
-				if (diff < 0)
-					tailoff = (tryoff == headoff) ? headoff : tryoff;
-				else headoff = tryoff;
-				if (tailoff == headoff + IDXENTRYSIZE) {
-					if (quitflag++)
-						headoff = tailoff;
-				}
-			}
-			if (headoff >= tailoff)
-				tryoff = headoff;
-			if (trybuf)
-				free(trybuf);
-			delete [] key;
-		}
-		else	{ tryoff = 0; }
-
-		lseek(idxfd->getFd(), tryoff, SEEK_SET);
-
-		start = size = 0;
-		retval = (read(idxfd->getFd(), &start, sizeof(__u32))==sizeof(__u32)) ? retval : -1;
-		retval = (read(idxfd->getFd(), &size, sizeof(__u32))==sizeof(__u32)) ? retval : -1;
-		start = swordtoarch32(start);
-		size  = swordtoarch32(size);
-
-		if (idxoff)
-			*idxoff = tryoff;
-
-		while (away) {
-			__u32 laststart = start;
-			__u32 lastsize = size;
-			__s32 lasttry = tryoff;
-			tryoff += (away > 0) ? IDXENTRYSIZE : -IDXENTRYSIZE;
-
-			bool bad = false;
-			if (((long)(tryoff + (away*IDXENTRYSIZE)) < -IDXENTRYSIZE) || (tryoff + (away*IDXENTRYSIZE) > (maxoff+IDXENTRYSIZE)))
-				bad = true;
-			else	if (lseek(idxfd->getFd(), tryoff, SEEK_SET) < 0)
-				bad = true;
-			if (bad) {
-				retval = -1;
-				start = laststart;
-				size = lastsize;
-				tryoff = lasttry;
-				if (idxoff)
-					*idxoff = tryoff;
-				break;
-			}
-			read(idxfd->getFd(), &start, sizeof(__u32));
-			read(idxfd->getFd(), &size, sizeof(__u32));
-			start = swordtoarch32(start);
-			size  = swordtoarch32(size);
-
-			if (idxoff)
-				*idxoff = tryoff;
-
-
-			if (((laststart != start) || (lastsize != size)) && (start >= 0) && (size)) 
-				away += (away < 0) ? 1 : -1;
-		}
-	
-		lastoff = tryoff;
-	}
-	else {
-		if (idxoff)
-			*idxoff = 0;
-		retval = -1;
-	}
-	return retval;
-}
-
-
-/******************************************************************************
- * zStr::preptext	- Prepares the text before returning it to external
- *					objects
- *
- * ENT:	buf	- buffer where text is stored and where to store the prep'd
- *				text.
- */
-
-void zStr::prepText(SWBuf &buf) {
-	unsigned int to, from; 
-	char space = 0, cr = 0, realdata = 0, nlcnt = 0;
-	char *rawBuf = buf.getRawData();
-	for (to = from = 0; rawBuf[from]; from++) {
-		switch (rawBuf[from]) {
-		case 10:
-			if (!realdata)
-				continue;
-			space = (cr) ? 0 : 1;
-			cr = 0;
-			nlcnt++;
-			if (nlcnt > 1) {
-//				*to++ = nl;
-				rawBuf[to++] = 10;
-//				*to++ = nl[1];
-//				nlcnt = 0;
-			}
-			continue;
-		case 13:
-			if (!realdata)
-				continue;
-//			*to++ = nl[0];
-			rawBuf[to++] = 10;
-			space = 0;
-			cr = 1;
-			continue;
-		}
-		realdata = 1;
-		nlcnt = 0;
-		if (space) {
-			space = 0;
-			if (rawBuf[from] != ' ') {
-				rawBuf[to++] = ' ';
-				from--;
-				continue;
-			}
-		}
-		rawBuf[to++] = rawBuf[from];
-	}
-	buf.setSize(to);
-
-	while (to > 1) {			// remove trailing excess
-		to--;
-		if ((rawBuf[to] == 10) || (rawBuf[to] == ' '))
-			buf.setSize(to);
-		else break;
-	}
-}
-
-
-/******************************************************************************
- * zStr::getText	- gets text at a given offset
- *
- * ENT:
- *	offset	- idxoffset where the key is located.
- *	buf		- buffer to store text
- *	idxbuf	- buffer to store index key
- *			NOTE: buffer will be alloc'd / realloc'd and 
- *			should be free'd by the client
- *
- */
-
-void zStr::getText(long offset, char **idxbuf, char **buf) {
-	char *ch;
-	char *idxbuflocal = 0;
-	getKeyFromIdxOffset(offset, &idxbuflocal);
-	__u32 start;
-	__u32 size;
-
-	do {
-		lseek(idxfd->getFd(), offset, SEEK_SET);
-		read(idxfd->getFd(), &start, sizeof(__u32));
-		read(idxfd->getFd(), &size, sizeof(__u32));
-		start = swordtoarch32(start);
-		size = swordtoarch32(size);
-
-		*buf = (*buf) ? (char *)realloc(*buf, size*2 + 1) : (char *)malloc(size*2 + 1);
-		*idxbuf = (*idxbuf) ? (char *)realloc(*idxbuf, size*2 + 1) : (char *)malloc(size*2 + 1);
-		memset(*buf, 0, size + 1);
-		memset(*idxbuf, 0, size + 1);
-		lseek(datfd->getFd(), start, SEEK_SET);
-		read(datfd->getFd(), *buf, (int)(size));
-
-		for (ch = *buf; *ch; ch++) {		// skip over index string
-			if (*ch == 10) {
-				ch++;
-				break;
-			}
-		}
-		memmove(*buf, ch, size - (unsigned long)(ch-*buf));
-
-		// resolve link
-		if (!strncmp(*buf, "@LINK", 5)) {
-			for (ch = *buf; *ch; ch++) {		// null before nl
-				if (*ch == 10) {
-					*ch = 0;
-					break;
-				}
-			}
-			findKeyIndex(*buf + 6, &offset);
-		}
-		else break;
-	}
-	while (true);	// while we're resolving links
-
-	if (idxbuflocal) {
-		__u32 localsize = strlen(idxbuflocal);
-		localsize = (localsize < (size - 1)) ? localsize : (size - 1);
-		strncpy(*idxbuf, idxbuflocal, localsize);
-		(*idxbuf)[localsize] = 0;
-		free(idxbuflocal);
-	}
-	__u32 block = 0;
-	__u32 entry = 0;
-	memmove(&block, *buf, sizeof(__u32));
-	memmove(&entry, *buf + sizeof(__u32), sizeof(__u32));
-	block = swordtoarch32(block);
-	entry = swordtoarch32(entry);
-	getCompressedText(block, entry, buf);
-}
-
-
-/******************************************************************************
- * zStr::getCompressedText - Get text entry from a compressed index / zdata
- * 		file.
- */
-
-void zStr::getCompressedText(long block, long entry, char **buf) {
-
-	__u32 size = 0;
-
-	if (cacheBlockIndex != block) {
-		__u32 start = 0;
-
-		lseek(zdxfd->getFd(), block * ZDXENTRYSIZE, SEEK_SET);
-		read(zdxfd->getFd(), &start, sizeof(__u32));
-		read(zdxfd->getFd(), &size, sizeof(__u32));
-		start = swordtoarch32(start);
-		size = swordtoarch32(size);
-
-		SWBuf buf;
-		buf.setSize(size + 5);
-		lseek(zdtfd->getFd(), start, SEEK_SET);
-		read(zdtfd->getFd(), buf.getRawData(), size);
-
-		flushCache();
-
-		unsigned long len = size;
-		buf.setSize(size);
-		rawZFilter(buf, 0); // 0 = decipher
-
-		compressor->zBuf(&len, buf.getRawData());
-		char *rawBuf = compressor->Buf(0, &len);
-		cacheBlock = new EntriesBlock(rawBuf, len);
-		cacheBlockIndex = block;
-	}
-	size = cacheBlock->getEntrySize(entry);
-	*buf = (*buf) ? (char *)realloc(*buf, size*2 + 1) : (char *)malloc(size*2 + 1);
-	strcpy(*buf, cacheBlock->getEntry(entry));
-}
-
-
-/******************************************************************************
- * zLD::settext	- Sets text for current offset
- *
- * ENT: key	- key for this entry
- *	buf	- buffer to store
- *      len     - length of buffer (0 - null terminated)
- */
-
-void zStr::setText(const char *ikey, const char *buf, long len) {
-
-	__u32 start, outstart;
-	__u32 size, outsize;
-	__s32 endoff;
-	long idxoff = 0;
-	__s32 shiftSize;
-	static const char nl[] = {13, 10};
-	char *tmpbuf = 0;
-	char *key = 0;
-	char *dbKey = 0;
-	char *idxBytes = 0;
-	char *outbuf = 0;
-	char *ch = 0;
-
-	len = (len < 0) ? strlen(buf) : len;
-	stdstr(&key, ikey, 3);
-	toupperstr_utf8(key, strlen(key)*3);
-
-	char notFound = findKeyIndex(ikey, &idxoff, 0);
-	if (!notFound) {
-		getKeyFromIdxOffset(idxoff, &dbKey);
-		int diff = strcmp(key, dbKey);
-		if (diff < 0) {
-		}
-		else if (diff > 0) {
-			idxoff += IDXENTRYSIZE;
-		}
-		else if ((!diff) && (len > 0 /*we're not deleting*/)) { // got absolute entry
-			do {
-				lseek(idxfd->getFd(), idxoff, SEEK_SET);
-				read(idxfd->getFd(), &start, sizeof(__u32));
-				read(idxfd->getFd(), &size, sizeof(__u32));
-				start = swordtoarch32(start);
-				size = swordtoarch32(size);
-
-				tmpbuf = new char [ size + 2 ];
-				memset(tmpbuf, 0, size + 2);
-				lseek(datfd->getFd(), start, SEEK_SET);
-				read(datfd->getFd(), tmpbuf, size);
-
-				for (ch = tmpbuf; *ch; ch++) {		// skip over index string
-					if (*ch == 10) {
-						ch++;
-						break;
-					}
-				}
-				memmove(tmpbuf, ch, size - (unsigned long)(ch-tmpbuf));
-
-				// resolve link
-				if (!strncmp(tmpbuf, "@LINK", 5) && (len)) {
-					for (ch = tmpbuf; *ch; ch++) {		// null before nl
-						if (*ch == 10) {
-							*ch = 0;
-							break;
-						}
-					}
-					findKeyIndex(tmpbuf + IDXENTRYSIZE, &idxoff);
-					delete [] tmpbuf;
-				}
-				else break;
-			}
-			while (true);	// while we're resolving links
-		}
-	}
-
-	endoff = lseek(idxfd->getFd(), 0, SEEK_END);
-
-	shiftSize = endoff - idxoff;
-
-	if (shiftSize > 0) {
-	        idxBytes = new char [ shiftSize ];
-		lseek(idxfd->getFd(), idxoff, SEEK_SET);
-		read(idxfd->getFd(), idxBytes, shiftSize);
-	}
-
-	outbuf = new char [ len + strlen(key) + 5 ];
-	sprintf(outbuf, "%s%c%c", key, 13, 10);
-	size = strlen(outbuf);
-	if (len > 0) {	// NOT a link
-		if (!cacheBlock) {
-			flushCache();
-			cacheBlock = new EntriesBlock();
-			cacheBlockIndex = (lseek(zdxfd->getFd(), 0, SEEK_END) / ZDXENTRYSIZE);
-		}
-		else if (cacheBlock->getCount() >= blockCount) {
-			flushCache();
-			cacheBlock = new EntriesBlock();
-			cacheBlockIndex = (lseek(zdxfd->getFd(), 0, SEEK_END) / ZDXENTRYSIZE);
-		}
-		__u32 entry = cacheBlock->addEntry(buf);
-		cacheDirty = true;
-		outstart = archtosword32(cacheBlockIndex);
-		outsize = archtosword32(entry);
-		memcpy (outbuf + size, &outstart, sizeof(__u32));
-		memcpy (outbuf + size + sizeof(__u32), &outsize, sizeof(__u32));
-		size += (sizeof(__u32) * 2);
-	}
-	else {	// link
-		memcpy(outbuf + size, buf, len);
-		size += len;
-	}
-
-	start = lseek(datfd->getFd(), 0, SEEK_END);
-
-	outstart = archtosword32(start);
-	outsize  = archtosword32(size);
-
-	lseek(idxfd->getFd(), idxoff, SEEK_SET);
-	if (len > 0) {
-		lseek(datfd->getFd(), start, SEEK_SET);
-		write(datfd->getFd(), outbuf, size);
-
-		// add a new line to make data file easier to read in an editor
-		write(datfd->getFd(), &nl, 2);
-		
-		write(idxfd->getFd(), &outstart, sizeof(__u32));
-		write(idxfd->getFd(), &outsize, sizeof(__u32));
-		if (idxBytes) {
-			write(idxfd->getFd(), idxBytes, shiftSize);
-		}
-	}
-	else {	// delete entry
-		if (idxBytes) {
-			write(idxfd->getFd(), idxBytes+IDXENTRYSIZE, shiftSize-IDXENTRYSIZE);
-			lseek(idxfd->getFd(), -1, SEEK_CUR);	// last valid byte
-			FileMgr::systemFileMgr.trunc(idxfd);	// truncate index
-		}
-	}
-
-	if (idxBytes)
-		delete [] idxBytes;
-	delete [] key;
-	delete [] outbuf;
-	free(dbKey);
-}
-
-
-/******************************************************************************
- * zLD::linkentry	- links one entry to another
- *
- * ENT: testmt	- testament to find (0 - Bible/module introduction)
- *	destidxoff	- dest offset into .vss
- *	srcidxoff		- source offset into .vss
- */
-
-void zStr::linkEntry(const char *destkey, const char *srckey) {
-	char *text = new char [ strlen(destkey) + 7 ];
-	sprintf(text, "@LINK %s", destkey);
-	setText(srckey, text);
-	delete [] text;
-}
-
-
-void zStr::flushCache() {
-	if (cacheBlock) {
-		if (cacheDirty) {
-			__u32 start = 0;
-			unsigned long size = 0;
-			__u32 outstart = 0, outsize = 0;
-
-			const char *rawBuf = cacheBlock->getRawData(&size);
-			compressor->Buf(rawBuf, &size);
-			compressor->zBuf(&size);
-
-			SWBuf buf;
-			buf.setSize(size + 5);
-			memcpy(buf.getRawData(), compressor->zBuf(&size), size); // 1 = encipher
-			buf.setSize(size);
-			rawZFilter(buf, 1); // 1 = encipher
-
-			long zdxSize = lseek(zdxfd->getFd(), 0, SEEK_END);
-			long zdtSize = lseek(zdtfd->getFd(), 0, SEEK_END);
-
-			if ((cacheBlockIndex * ZDXENTRYSIZE) > (zdxSize - ZDXENTRYSIZE)) {	// New Block
-				start = zdtSize;
-			}
-			else {
-				lseek(zdxfd->getFd(), cacheBlockIndex * ZDXENTRYSIZE, SEEK_SET);
-				read(zdxfd->getFd(), &start, sizeof(__u32));
-				read(zdxfd->getFd(), &outsize, sizeof(__u32));
-				start = swordtoarch32(start);
-				outsize = swordtoarch32(outsize);
-				if (start + outsize >= zdtSize) {	// last entry, just overwrite
-					// start is already set
-				}
-				else	if (size < outsize) {	// middle entry, but smaller, that's fine and let's preserve bigger size
-					size = outsize;
-				}
-				else {	// middle and bigger-- we have serious problems, for now let's put it at the end = lots of wasted space
-					start = zdtSize;
-				}
-			}
-
-
-
-			outstart = archtosword32(start);
-			outsize  = archtosword32((__u32)size);
-
-			lseek(zdxfd->getFd(), cacheBlockIndex * ZDXENTRYSIZE, SEEK_SET);
-			lseek(zdtfd->getFd(), start, SEEK_SET);
-			write(zdtfd->getFd(), buf, size);
-
-			// add a new line to make data file easier to read in an editor
-			write(zdtfd->getFd(), &nl, 2);
-			
-			write(zdxfd->getFd(), &outstart, sizeof(__u32));
-			write(zdxfd->getFd(), &outsize, sizeof(__u32));
-		}
-		delete cacheBlock;
-		cacheBlock = 0;
-	}
-	cacheBlockIndex = -1;
-	cacheDirty = false;
-}
-
-
-/******************************************************************************
- * zLD::CreateModule	- Creates new module files
- *
- * ENT: path	- directory to store module files
- * RET: error status
- */
-
-signed char zStr::createModule(const char *ipath) {
-	char *path = 0;
-	char *buf = new char [ strlen (ipath) + 20 ];
-	FileDesc *fd, *fd2;
-
-	stdstr(&path, ipath);
-
-	if ((path[strlen(path)-1] == '/') || (path[strlen(path)-1] == '\\'))
-		path[strlen(path)-1] = 0;
-
-	sprintf(buf, "%s.dat", path);
-	unlink(buf);
-	fd = FileMgr::systemFileMgr.open(buf, O_CREAT|O_WRONLY|O_BINARY, S_IREAD|S_IWRITE);
-	fd->getFd();
-	FileMgr::systemFileMgr.close(fd);
-
-	sprintf(buf, "%s.idx", path);
-	unlink(buf);
-	fd2 = FileMgr::systemFileMgr.open(buf, O_CREAT|O_WRONLY|O_BINARY, S_IREAD|S_IWRITE);
-	fd2->getFd();
-	FileMgr::systemFileMgr.close(fd2);
-
-	sprintf(buf, "%s.zdt", path);
-	unlink(buf);
-	fd2 = FileMgr::systemFileMgr.open(buf, O_CREAT|O_WRONLY|O_BINARY, S_IREAD|S_IWRITE);
-	fd2->getFd();
-	FileMgr::systemFileMgr.close(fd2);
-
-	sprintf(buf, "%s.zdx", path);
-	unlink(buf);
-	fd2 = FileMgr::systemFileMgr.open(buf, O_CREAT|O_WRONLY|O_BINARY, S_IREAD|S_IWRITE);
-	fd2->getFd();
-	FileMgr::systemFileMgr.close(fd2);
-
-	delete [] path;
-	
-	return 0;
-}
-
-SWORD_NAMESPACE_END
diff --git a/src/modules/common/zverse.cpp b/src/modules/common/zverse.cpp
deleted file mode 100644
index 1f7f25d..0000000
--- a/src/modules/common/zverse.cpp
+++ /dev/null
@@ -1,538 +0,0 @@
-/******************************************************************************
- *  zverse.h   - code for class 'zVerse'- a module that reads raw text
- *				files:  ot and nt using indexs ??.bks ??.cps ??.vss
- *				and provides lookup and parsing functions based on
- *				class VerseKey for compressed modules
- */
-
-
-#include <ctype.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <stdlib.h>
-
-#ifndef __GNUC__
-#include <io.h>
-#else
-#include <unistd.h>
-#endif
-
-#include <utilfuns.h>
-#include <versekey.h>
-#include <zverse.h>
-#include <sysdata.h>
-#include <swbuf.h>
-
-
-#ifndef O_BINARY
-#define O_BINARY 0
-#endif
-
-SWORD_NAMESPACE_START
-
-/******************************************************************************
- * zVerse Statics
- */
-
-int zVerse::instance = 0;
-
-const char zVerse::uniqueIndexID[] = {'X', 'r', 'v', 'c', 'b'};
-
-/******************************************************************************
- * zVerse Constructor - Initializes data for instance of zVerse
- *
- * ENT:	ipath - path of the directory where data and index files are located.
- *		be sure to include the trailing separator (e.g. '/' or '\')
- *		(e.g. 'modules/texts/rawtext/webster/')
- *		fileMode - open mode for the files (O_RDONLY, etc.)
- *		blockType - verse, chapter, book, etc.
- */
-
-zVerse::zVerse(const char *ipath, int fileMode, int blockType, SWCompress *icomp)
-{
-	char buf[127];
-
-	nl = '\n';
-	path = 0;
-	cacheBufIdx = -1;
-	cacheTestament = 0;
-	cacheBuf = 0;
-	dirtyCache = false;
-	stdstr(&path, ipath);
-
-	if ((path[strlen(path)-1] == '/') || (path[strlen(path)-1] == '\\'))
-		path[strlen(path)-1] = 0;
-
-	compressor = (icomp) ? icomp : new SWCompress();
-
-	if (fileMode == -1) { // try read/write if possible
-		fileMode = O_RDWR;
-	}
-		
-	sprintf(buf, "%s/ot.%czs", path, uniqueIndexID[blockType]);
-	idxfp[0] = FileMgr::systemFileMgr.open(buf, fileMode|O_BINARY, true);
-
-	sprintf(buf, "%s/nt.%czs", path, uniqueIndexID[blockType]);
-	idxfp[1] = FileMgr::systemFileMgr.open(buf, fileMode|O_BINARY, true);
-
-	sprintf(buf, "%s/ot.%czz", path, uniqueIndexID[blockType]);
-	textfp[0] = FileMgr::systemFileMgr.open(buf, fileMode|O_BINARY, true);
-
-	sprintf(buf, "%s/nt.%czz", path, uniqueIndexID[blockType]);
-	textfp[1] = FileMgr::systemFileMgr.open(buf, fileMode|O_BINARY, true);
-
-	sprintf(buf, "%s/ot.%czv", path, uniqueIndexID[blockType]);
-	compfp[0] = FileMgr::systemFileMgr.open(buf, fileMode|O_BINARY, true);
-
-	sprintf(buf, "%s/nt.%czv", path, uniqueIndexID[blockType]);
-	compfp[1] = FileMgr::systemFileMgr.open(buf, fileMode|O_BINARY, true);
-	
-	instance++;
-}
-
-
-/******************************************************************************
- * zVerse Destructor - Cleans up instance of zVerse
- */
-
-zVerse::~zVerse()
-{
-	int loop1;
-
-	if (cacheBuf) {
-		flushCache();
-		free(cacheBuf);
-	}
-
-	if (path)
-		delete [] path;
-
-	if (compressor)
-		delete compressor;
-
-	--instance;
-
-	for (loop1 = 0; loop1 < 2; loop1++) {
-		FileMgr::systemFileMgr.close(idxfp[loop1]);
-		FileMgr::systemFileMgr.close(textfp[loop1]);
-		FileMgr::systemFileMgr.close(compfp[loop1]);
-	}
-}
-
-
-/******************************************************************************
- * zVerse::findoffset	- Finds the offset of the key verse from the indexes
- *
- *
- *
- * ENT: testmt	- testament to find (0 - Bible/module introduction)
- *	book	- book      to find (0 - testament    introduction)
- *	chapter	- chapter   to find (0 - book         introduction)
- *	verse	- verse     to find (0 - chapter      introduction)
- *	start	- address to store the starting offset
- *	size	- address to store the size of the entry
- */
-
-void zVerse::findOffset(char testmt, long idxoff, long *start, unsigned short *size)
-{
-	// set start to offset in
-	// set size to
-	// set
-	unsigned long ulBuffNum=0;	          // buffer number
-	unsigned long ulVerseStart=0;	       // verse offset within buffer
-	unsigned short usVerseSize=0;	       // verse size
-	unsigned long ulCompOffset=0;	       // compressed buffer start
-	unsigned long ulCompSize=0;	             // buffer size compressed
-	unsigned long ulUnCompSize=0;	          // buffer size uncompressed
-	char *pcCompText=NULL;					 // compressed text
-
-	*start = *size = 0;
-	//printf ("Finding offset %ld\n", idxoff);
-	idxoff *= 10;
-	if (!testmt) {
-		testmt = ((idxfp[0]) ? 1:2);
-	}
-	
-	// assert we have and valid file descriptor
-	if (compfp[testmt-1]->getFd() < 1)
-		return;
-		
-	long newOffset = lseek(compfp[testmt-1]->getFd(), idxoff, SEEK_SET);
-	if (newOffset == idxoff) {
-		if (read(compfp[testmt-1]->getFd(), &ulBuffNum, 4) != 4) {
-			printf ("Error reading ulBuffNum\n");
-			return;
-		}
-	}
-	else return;
-
-	ulBuffNum = swordtoarch32(ulBuffNum);
-
-	if (read(compfp[testmt-1]->getFd(), &ulVerseStart, 4) < 2)
-	{
-		printf ("Error reading ulVerseStart\n");
-		return;
-	}
-	if (read(compfp[testmt-1]->getFd(), &usVerseSize, 2) < 2)
-	{
-		printf ("Error reading usVerseSize\n");
-		return;
-	}
-
-	*start = swordtoarch32(ulVerseStart);
-	*size = swordtoarch16(usVerseSize);
-
-	if (*size) {
-		if (((long) ulBuffNum == cacheBufIdx) && (testmt == cacheTestament) && (cacheBuf)) {
-			// have the text buffered
-			return;
-		}
-
-		//printf ("Got buffer number{%ld} versestart{%ld} versesize{%d}\n", ulBuffNum, ulVerseStart, usVerseSize);
-
-
-		if (lseek(idxfp[testmt-1]->getFd(), ulBuffNum*12, SEEK_SET)!=(long) ulBuffNum*12)
-		{
-			printf ("Error seeking compressed file index\n");
-			return;
-		}
-		if (read(idxfp[testmt-1]->getFd(), &ulCompOffset, 4)<4)
-		{
-			printf ("Error reading ulCompOffset\n");
-			return;
-		}
-		if (read(idxfp[testmt-1]->getFd(), &ulCompSize, 4)<4)
-		{
-			printf ("Error reading ulCompSize\n");
-			return;
-		}
-		if (read(idxfp[testmt-1]->getFd(), &ulUnCompSize, 4)<4)
-		{
-			printf ("Error reading ulUnCompSize\n");
-			return;
-		}
-
-		ulCompOffset  = swordtoarch32(ulCompOffset);
-		ulCompSize  = swordtoarch32(ulCompSize);
-		ulUnCompSize  = swordtoarch32(ulUnCompSize);
-
-		if (lseek(textfp[testmt-1]->getFd(), ulCompOffset, SEEK_SET)!=(long)ulCompOffset)
-		{
-			printf ("Error: could not seek to right place in compressed text\n");
-			return;
-		}
-		SWBuf pcCompText;
-		pcCompText.setSize(ulCompSize+5);
-
-		if (read(textfp[testmt-1]->getFd(), pcCompText.getRawData(), ulCompSize)<(long)ulCompSize) {
-			printf ("Error reading compressed text\n");
-			return;
-		}
-		pcCompText.setSize(ulCompSize);
-		rawZFilter(pcCompText, 0); // 0 = decipher
-		
-		compressor->zBuf(&ulCompSize, pcCompText.getRawData());
-
-		if (cacheBuf) {
-			flushCache();
-			free(cacheBuf);
-		}
-		
-		unsigned long len = 0;
-		compressor->Buf(0, &len);
-		cacheBuf = (char *)calloc(len + 1, 1);
-		memcpy(cacheBuf, compressor->Buf(), len);
-
-		cacheTestament = testmt;
-		cacheBufIdx = ulBuffNum;
-	}
-}
-
-
-/******************************************************************************
- * zVerse::zreadtext	- gets text at a given offset
- *
- * ENT:	testmt	- testament file to search in (0 - Old; 1 - New)
- *	start	- starting offset where the text is located in the file
- *	size	- size of text entry + 1 (null)
- *	buf	- buffer to store text
- *
- */
-
-void zVerse::zReadText(char testmt, long start, unsigned short size, SWBuf &inBuf) {
-	inBuf = "";
-	inBuf.setFillByte(0);
-	inBuf.setSize(size+1);
-	if (size > 0) {
-		if (cacheBuf)
-			strncpy(inBuf.getRawData(), &(cacheBuf[start]), size);
-	}
-	inBuf.setSize(strlen(inBuf.c_str()));
-}
-
-
-/******************************************************************************
- * zVerse::settext	- Sets text for current offset
- *
- * ENT: testmt	- testament to find (0 - Bible/module introduction)
- *	idxoff	- offset into .vss
- *	buf	- buffer to store
- *      len     - length of buffer (0 - null terminated)
- */
-
-void zVerse::doSetText(char testmt, long idxoff, const char *buf, long len) {
-
-	len = (len < 0) ? strlen(buf) : len;
-	if (!testmt) 
-		testmt = ((idxfp[0]) ? 1:2);
-	if ((!dirtyCache) || (cacheBufIdx < 0)) {
-		cacheBufIdx = lseek(idxfp[testmt-1]->getFd(), 0, SEEK_END) / 12;
-		cacheTestament = testmt;
-		if (cacheBuf)
-			free(cacheBuf);
-		cacheBuf = (char *)calloc(len + 1, 1);
-	}
-	else cacheBuf = (char *)((cacheBuf)?realloc(cacheBuf, strlen(cacheBuf)+(len + 1)):calloc((len + 1), 1));
-
-	dirtyCache = true;
-
-	unsigned long start, outstart;
-	unsigned long outBufIdx = cacheBufIdx;
-	unsigned short size;
-	unsigned short outsize;
-
-	idxoff *= 10;
-	size = outsize = len;
-
-	start = strlen(cacheBuf);
-
-	if (!size)
-		start = outBufIdx = 0;
-
-	outBufIdx = archtosword32(outBufIdx);
-	outstart  = archtosword32(start);
-	outsize   = archtosword16(size);
-
-	lseek(compfp[testmt-1]->getFd(), idxoff, SEEK_SET);
-	write(compfp[testmt-1]->getFd(), &outBufIdx, 4);
-	write(compfp[testmt-1]->getFd(), &outstart, 4);
-	write(compfp[testmt-1]->getFd(), &outsize, 2);
-	strcat(cacheBuf, buf);
-}
-
-
-void zVerse::flushCache() {
-	if (dirtyCache) {
-		unsigned long idxoff;
-		unsigned long start, outstart;
-		unsigned long size, outsize;
-		unsigned long zsize, outzsize;
-
-		idxoff = cacheBufIdx * 12;
-		if (cacheBuf) {
-			size = outsize = zsize = outzsize = strlen(cacheBuf);
-			if (size) {
-	//			if (compressor) {
-	//				delete compressor;
-	//				compressor = new LZSSCompress();
-	//			}
-				compressor->Buf(cacheBuf);
-				compressor->zBuf(&zsize);
-				outzsize = zsize;
-
-				SWBuf buf;
-				buf.setSize(zsize + 5);
-				memcpy(buf.getRawData(), compressor->zBuf(&zsize), zsize);
-				buf.setSize(zsize);
-				rawZFilter(buf, 1); // 1 = encipher
-
-				start = outstart = lseek(textfp[cacheTestament-1]->getFd(), 0, SEEK_END);
-
-				outstart  = archtosword32(start);
-				outsize   = archtosword32(size);
-				outzsize  = archtosword32(zsize);
-
-				write(textfp[cacheTestament-1]->getFd(), buf, zsize);
-
-				lseek(idxfp[cacheTestament-1]->getFd(), idxoff, SEEK_SET);
-				write(idxfp[cacheTestament-1]->getFd(), &outstart, 4);
-				write(idxfp[cacheTestament-1]->getFd(), &outzsize, 4);
-				write(idxfp[cacheTestament-1]->getFd(), &outsize, 4);
-			}
-			free(cacheBuf);
-			cacheBuf = 0;
-		}
-		dirtyCache = false;
-	}
-}
-
-/******************************************************************************
- * RawVerse::linkentry	- links one entry to another
- *
- * ENT: testmt	- testament to find (0 - Bible/module introduction)
- *	destidxoff	- dest offset into .vss
- *	srcidxoff		- source offset into .vss
- */
-
-void zVerse::doLinkEntry(char testmt, long destidxoff, long srcidxoff) {
-	long bufidx;
-	long start;
-	unsigned short size;
-
-	destidxoff *= 10;
-	srcidxoff  *= 10;
-
-	if (!testmt)
-		testmt = ((idxfp[1]) ? 1:2);
-
-	// get source
-	lseek(compfp[testmt-1]->getFd(), srcidxoff, SEEK_SET);
-	read(compfp[testmt-1]->getFd(), &bufidx, 4);
-	read(compfp[testmt-1]->getFd(), &start, 4);
-	read(compfp[testmt-1]->getFd(), &size, 2);
-
-	// write dest
-	lseek(compfp[testmt-1]->getFd(), destidxoff, SEEK_SET);
-	write(compfp[testmt-1]->getFd(), &bufidx, 4);
-	write(compfp[testmt-1]->getFd(), &start, 4);
-	write(compfp[testmt-1]->getFd(), &size, 2);
-}
-
-
-/******************************************************************************
- * RawVerse::CreateModule	- Creates new module files
- *
- * ENT: path	- directory to store module files
- * RET: error status
- */
-
-char zVerse::createModule(const char *ipath, int blockBound)
-{
-	char *path = 0;
-	char *buf = new char [ strlen (ipath) + 20 ];
-	FileDesc *fd, *fd2;
-
-	stdstr(&path, ipath);
-
-	if ((path[strlen(path)-1] == '/') || (path[strlen(path)-1] == '\\'))
-		path[strlen(path)-1] = 0;
-
-	sprintf(buf, "%s/ot.%czs", path, uniqueIndexID[blockBound]);
-	unlink(buf);
-	fd = FileMgr::systemFileMgr.open(buf, O_CREAT|O_WRONLY|O_BINARY, S_IREAD|S_IWRITE);
-	fd->getFd();
-	FileMgr::systemFileMgr.close(fd);
-
-	sprintf(buf, "%s/nt.%czs", path, uniqueIndexID[blockBound]);
-	unlink(buf);
-	fd = FileMgr::systemFileMgr.open(buf, O_CREAT|O_WRONLY|O_BINARY, S_IREAD|S_IWRITE);
-	fd->getFd();
-	FileMgr::systemFileMgr.close(fd);
-
-	sprintf(buf, "%s/ot.%czz", path, uniqueIndexID[blockBound]);
-	unlink(buf);
-	fd = FileMgr::systemFileMgr.open(buf, O_CREAT|O_WRONLY|O_BINARY, S_IREAD|S_IWRITE);
-	fd->getFd();
-	FileMgr::systemFileMgr.close(fd);
-
-	sprintf(buf, "%s/nt.%czz", path, uniqueIndexID[blockBound]);
-	unlink(buf);
-	fd2 = FileMgr::systemFileMgr.open(buf, O_CREAT|O_WRONLY|O_BINARY, S_IREAD|S_IWRITE);
-	fd2->getFd();
-	FileMgr::systemFileMgr.close(fd);
-
-	sprintf(buf, "%s/ot.%czv", path, uniqueIndexID[blockBound]);
-	unlink(buf);
-	fd = FileMgr::systemFileMgr.open(buf, O_CREAT|O_WRONLY|O_BINARY, S_IREAD|S_IWRITE);
-	fd->getFd();
-
-	sprintf(buf, "%s/nt.%czv", path, uniqueIndexID[blockBound]);
-	unlink(buf);
-	fd2 = FileMgr::systemFileMgr.open(buf, O_CREAT|O_WRONLY|O_BINARY, S_IREAD|S_IWRITE);
-	fd2->getFd();
-
-	VerseKey vk;
-	vk.Headings(1);
-	long offset = 0;
-	short size = 0;
-	for (vk = TOP; !vk.Error(); vk++) {
-		write((vk.Testament() == 1) ? fd->getFd() : fd2->getFd(), &offset, 4);	//compBufIdxOffset
-		write((vk.Testament() == 1) ? fd->getFd() : fd2->getFd(), &offset, 4);
-		write((vk.Testament() == 1) ? fd->getFd() : fd2->getFd(), &size, 2);
-	}
-
-	FileMgr::systemFileMgr.close(fd);
-	FileMgr::systemFileMgr.close(fd2);
-
-	delete [] path;
-	delete [] buf;
-/*
-	RawVerse rv(path);
-	VerseKey mykey("Rev 22:21");
-*/
-	
-	return 0;
-}
-
-
-/******************************************************************************
- * zVerse::preptext	- Prepares the text before returning it to external
- *				objects
- *
- * ENT:	buf	- buffer where text is stored and where to store the prep'd
- *			text.
- */
-
-void zVerse::prepText(SWBuf &buf) {
-	unsigned int to, from; 
-	char space = 0, cr = 0, realdata = 0, nlcnt = 0;
-	char *rawBuf = buf.getRawData();
-	for (to = from = 0; rawBuf[from]; from++) {
-		switch (rawBuf[from]) {
-		case 10:
-			if (!realdata)
-				continue;
-			space = (cr) ? 0 : 1;
-			cr = 0;
-			nlcnt++;
-			if (nlcnt > 1) {
-//				*to++ = nl;
-				rawBuf[to++] = 10;
-//				*to++ = nl[1];
-//				nlcnt = 0;
-			}
-			continue;
-		case 13:
-			if (!realdata)
-				continue;
-//			*to++ = nl[0];
-			rawBuf[to++] = 10;
-			space = 0;
-			cr = 1;
-			continue;
-		}
-		realdata = 1;
-		nlcnt = 0;
-		if (space) {
-			space = 0;
-			if (rawBuf[from] != ' ') {
-				rawBuf[to++] = ' ';
-				from--;
-				continue;
-			}
-		}
-		rawBuf[to++] = rawBuf[from];
-	}
-	buf.setSize(to);
-
-	while (to > 1) {			// remove trailing excess
-		to--;
-		if ((rawBuf[to] == 10) || (rawBuf[to] == ' '))
-			buf.setSize(to);
-		else break;
-	}
-}
-
-
-SWORD_NAMESPACE_END
diff --git a/src/modules/filters/Makefile b/src/modules/filters/Makefile
deleted file mode 100644
index 1a2d00d..0000000
--- a/src/modules/filters/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-
-root := ../../..
-
-all:
-	make -C ${root}
diff --git a/src/modules/filters/Makefile.am b/src/modules/filters/Makefile.am
deleted file mode 100644
index c9a6bef..0000000
--- a/src/modules/filters/Makefile.am
+++ /dev/null
@@ -1,92 +0,0 @@
-filtersdir = $(top_srcdir)/src/modules/filters
-
-libsword_la_SOURCES += $(filtersdir)/swbasicfilter.cpp
-libsword_la_SOURCES += $(filtersdir)/swoptfilter.cpp
-
-libsword_la_SOURCES += $(filtersdir)/gbfhtml.cpp
-libsword_la_SOURCES += $(filtersdir)/gbfhtmlhref.cpp
-libsword_la_SOURCES += $(filtersdir)/gbfwebif.cpp
-libsword_la_SOURCES += $(filtersdir)/gbfplain.cpp
-libsword_la_SOURCES += $(filtersdir)/gbfrtf.cpp
-libsword_la_SOURCES += $(filtersdir)/plainhtml.cpp
-libsword_la_SOURCES += $(filtersdir)/cipherfil.cpp
-libsword_la_SOURCES += $(filtersdir)/rtfhtml.cpp
-
-libsword_la_SOURCES += $(filtersdir)/gbfstrongs.cpp
-libsword_la_SOURCES += $(filtersdir)/gbffootnotes.cpp
-libsword_la_SOURCES += $(filtersdir)/gbfheadings.cpp
-libsword_la_SOURCES += $(filtersdir)/gbfredletterwords.cpp
-libsword_la_SOURCES += $(filtersdir)/gbfmorph.cpp
-libsword_la_SOURCES += $(filtersdir)/plainfootnotes.cpp
-
-libsword_la_SOURCES += $(filtersdir)/thmlstrongs.cpp
-libsword_la_SOURCES += $(filtersdir)/thmlfootnotes.cpp
-libsword_la_SOURCES += $(filtersdir)/thmlheadings.cpp
-libsword_la_SOURCES += $(filtersdir)/thmlmorph.cpp
-libsword_la_SOURCES += $(filtersdir)/thmllemma.cpp
-libsword_la_SOURCES += $(filtersdir)/thmlscripref.cpp
-libsword_la_SOURCES += $(filtersdir)/thmlvariants.cpp
-
-libsword_la_SOURCES += $(filtersdir)/gbfthml.cpp
-libsword_la_SOURCES += $(filtersdir)/thmlgbf.cpp
-libsword_la_SOURCES += $(filtersdir)/thmlrtf.cpp
-libsword_la_SOURCES += $(filtersdir)/thmlhtml.cpp
-libsword_la_SOURCES += $(filtersdir)/thmlhtmlhref.cpp
-libsword_la_SOURCES += $(filtersdir)/thmlwebif.cpp
-
-libsword_la_SOURCES += $(filtersdir)/thmlosis.cpp
-libsword_la_SOURCES += $(filtersdir)/gbfosis.cpp
-libsword_la_SOURCES += $(filtersdir)/thmlplain.cpp
-
-libsword_la_SOURCES += $(filtersdir)/osisheadings.cpp
-libsword_la_SOURCES += $(filtersdir)/osisfootnotes.cpp 
-libsword_la_SOURCES += $(filtersdir)/osishtmlhref.cpp
-libsword_la_SOURCES += $(filtersdir)/osiswebif.cpp
-libsword_la_SOURCES += $(filtersdir)/osismorph.cpp
-libsword_la_SOURCES += $(filtersdir)/osisstrongs.cpp
-libsword_la_SOURCES += $(filtersdir)/osisplain.cpp
-libsword_la_SOURCES += $(filtersdir)/osisrtf.cpp
-libsword_la_SOURCES += $(filtersdir)/osislemma.cpp
-libsword_la_SOURCES += $(filtersdir)/osisredletterwords.cpp
-libsword_la_SOURCES += $(filtersdir)/osisscripref.cpp
-
-libsword_la_SOURCES += $(filtersdir)/unicodertf.cpp
-libsword_la_SOURCES += $(filtersdir)/latin1utf8.cpp
-libsword_la_SOURCES += $(filtersdir)/latin1utf16.cpp
-libsword_la_SOURCES += $(filtersdir)/utf8utf16.cpp
-libsword_la_SOURCES += $(filtersdir)/utf16utf8.cpp
-libsword_la_SOURCES += $(filtersdir)/scsuutf8.cpp
-libsword_la_SOURCES += $(filtersdir)/utf8html.cpp
-libsword_la_SOURCES += $(filtersdir)/utf8latin1.cpp
-
-libsword_la_SOURCES += $(filtersdir)/utf8cantillation.cpp
-libsword_la_SOURCES += $(filtersdir)/utf8hebrewpoints.cpp
-libsword_la_SOURCES += $(filtersdir)/utf8greekaccents.cpp
-
-libsword_la_SOURCES += $(filtersdir)/greeklexattribs.cpp
-
-SWICUSRC = $(filtersdir)/utf8transliterator.cpp
-SWICUSRC += $(filtersdir)/utf8nfc.cpp
-SWICUSRC += $(filtersdir)/utf8nfkd.cpp
-SWICUSRC += $(filtersdir)/utf8arshaping.cpp
-SWICUSRC += $(filtersdir)/utf8bidireorder.cpp
-
-if ICU
-ICUDEFS = -D_ICU_
-DISTSWICUSRC =
-SWREALICUSRC = $(SWICUSRC)
-else
-if ICUSWORD
-ICUDEFS = -D_ICU_ -D_ICUSWORD_
-DISTSWICUSRC =
-SWREALICUSRC = $(SWICUSRC)
-else
-DISTSWICUSRC = $(SWICUSRC)
-SWREALICUSRC =
-endif
-endif
-
-INCLUDES += $(ICUDEFS)
-libsword_la_SOURCES += $(SWREALICUSRC)
-EXTRA_DIST = $(DISTSWICUSRC)
-
diff --git a/src/modules/filters/cipherfil.cpp b/src/modules/filters/cipherfil.cpp
deleted file mode 100644
index abdd0fc..0000000
--- a/src/modules/filters/cipherfil.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-/******************************************************************************
- *
- * cipherfil -	SWFilter descendant to decipher a module
- */
-
-
-#include <stdlib.h>
-#include <cipherfil.h>
-
-SWORD_NAMESPACE_START
-
-CipherFilter::CipherFilter(const char *key) {
-	cipher = new SWCipher((unsigned char *)key);
-}
-
-
-CipherFilter::~CipherFilter() {
-	delete cipher;
-}
-
-
-SWCipher *CipherFilter::getCipher() {
-	return cipher;
-}
-
-
-char CipherFilter::processText(SWBuf &text, const SWKey *key, const SWModule *module) {
-	if (text.length() > 2) { //check if it's large enough to substract 2 in the next step.
-		unsigned long len = text.length();
-		if (!key) {	// hack, using key to determine encipher, or decipher
-			cipher->cipherBuf(&len, text.getRawData()); //set buffer to enciphered text
-			memcpy(text.getRawData(), cipher->Buf(), len);
-//			text = cipher->Buf(); //get the deciphered buffer
-		}
-		else if ((unsigned long)key == 1) {
-			cipher->Buf(text.getRawData(), len);
-			memcpy(text.getRawData(), cipher->cipherBuf(&len), len);
-//			text = cipher->cipherBuf(&len);
-		}
-	}
-	return 0;
-}
-
-SWORD_NAMESPACE_END
diff --git a/src/modules/filters/gbffootnotes.cpp b/src/modules/filters/gbffootnotes.cpp
deleted file mode 100644
index 38f1106..0000000
--- a/src/modules/filters/gbffootnotes.cpp
+++ /dev/null
@@ -1,197 +0,0 @@
-/******************************************************************************
- *
- * gbffootnotes -	SWFilter descendant to hide or show footnotes
- *			in a GBF module.
- */
-
-
-#include <stdlib.h>
-#include <gbffootnotes.h>
-#include <swmodule.h>
-#include <swbuf.h>
-#include <versekey.h>
-#include <utilxml.h>
-#ifndef __GNUC__
-#else
-#include <unixstr.h>
-#endif
-
-SWORD_NAMESPACE_START
-
-const char oName[] = "Footnotes";
-const char oTip[] = "Toggles Footnotes On and Off if they exist";
-
-const SWBuf choices[3] = {"On", "Off", ""};
-const StringList oValues(&choices[0], &choices[2]);
-
-
-GBFFootnotes::GBFFootnotes() : SWOptionFilter(oName, oTip, &oValues) {
-	setOptionValue("Off");
-}
-
-
-GBFFootnotes::~GBFFootnotes() {
-}
-
-
-char GBFFootnotes::processText (SWBuf &text, const SWKey *key, const SWModule *module)
-{
-	
-	SWBuf token;
-	bool intoken    = false;
-	bool hide       = false;
-	SWBuf tagText;
-	XMLTag startTag;
-	SWBuf refs = "";
-	int footnoteNum = 1;
-	char buf[254];
-	VerseKey parser = key->getText();
-
-	SWBuf orig = text;
-	const char *from = orig.c_str();
-
-	for (text = ""; *from; from++) {
-		if (*from == '<') {
-			intoken = true;
-			token = "";
-			continue;
-		}
-		if (*from == '>') {	// process tokens
-			intoken = false;
-
-			XMLTag tag(token);
-			if (!strcmp(tag.getName(), "RF")) {
-				refs = "";
-				startTag = tag;
-				hide = true;
-				tagText = "";
-				continue;
-			}
-			else if (!strcmp(tag.getName(), "Rf")) {
-				if (module->isProcessEntryAttributes()) {
-					if(tagText.length() == 1 || !strcmp(module->Name(), "IGNT")) {
-						if (option) { // for ASV marks text in verse then put explanation at end of verse
-							text += " <FA>(";
-							text.append(tagText);
-							text += ")<Fr>";
-							hide = false;
-							continue;
-						}
-					}
-					SWBuf fc = module->getEntryAttributes()["Footnote"]["count"]["value"];
-					footnoteNum = (fc.length()) ? atoi(fc.c_str()) : 0;
-					sprintf(buf, "%i", ++footnoteNum);
-					module->getEntryAttributes()["Footnote"]["count"]["value"] = buf;
-					StringList attributes = startTag.getAttributeNames();
-					for (StringList::iterator it = attributes.begin(); it != attributes.end(); it++) {
-						module->getEntryAttributes()["Footnote"][buf][it->c_str()] = startTag.getAttribute(it->c_str());
-					}
-					module->getEntryAttributes()["Footnote"][buf]["body"] = tagText;
-					startTag.setAttribute("swordFootnote", buf);
-				}
-				hide = false;
-				if (option) {	
-					text += startTag;
-					text.append(tagText);
-				}
-				else	continue;
-			}
-			if (!hide) {
-				text += '<';
-				text.append(token);
-				text += '>';
-			}
-			else {
-				tagText += '<';
-				tagText.append(token);
-				tagText += '>';
-			}
-			continue;
-		}
-		if (intoken) { //copy token
-			token += *from;
-		}
-		else if (!hide) { //copy text which is not inside a token
-			text += *from;
-		}
-		else tagText += *from;
-	}
-	return 0;
-	
-	
-	
-	
-	
-	
-	
-	
-	/*
-	if (!option) {	// if we don't want footnotes
-		char token[4096]; // cheese.  Fix.
-		int tokpos = 0;
-		bool intoken = false;
-		int len;
-		bool hide = false;
-
-		const char *from;
-		SWBuf orig = text;
-		from = orig.c_str();
-		for (text = ""; *from; from++) {
-			if (*from == '<') {
-				intoken = true;
-				tokpos = 0;
-//				memset(token, 0, 4096);
-				token[0] = 0;
-				token[1] = 0;
-				token[2] = 0;
-				continue;
-			}
-			if (*from == '>') {	// process tokens
-				intoken = false;
-				switch (*token) {
-				case 'R':				// Reference
-					switch(token[1]) {
-					case 'F':               // Begin footnote
-						hide = true;
-						break;
-					case 'f':               // end footnote
-						hide = false;
-						break;
-					}
-					continue;	// skip token
-				case 'W':
-					if (token[1] == 'T') {
-						switch (token[2]) {
-						case 'P':
-						case 'S':
-						case 'A':
-							continue; // remove this token
-						default:
-							break;
-						}
-					}
-				}
-				// if not a footnote token, keep token in text
-				if (!hide) {
-					text += '<';
-					text += token;
-					text += '>';
-				}
-				continue;
-			}
-			if (intoken) {
-				if (tokpos < 4090)
-					token[tokpos++] = *from;
-					token[tokpos+2] = 0;	// +2 cuz we init token with 2 extra '0' because of switch statement
-			}
-			else	{
-				if (!hide) {
-					text += *from;
-				}
-			}
-		}
-	}
-	return 0;*/
-}
-
-SWORD_NAMESPACE_END
diff --git a/src/modules/filters/gbfheadings.cpp b/src/modules/filters/gbfheadings.cpp
deleted file mode 100644
index 01a34ca..0000000
--- a/src/modules/filters/gbfheadings.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-/******************************************************************************
- *
- * gbfheadings -	SWFilter descendant to hide or show headings
- *			in a GBF module.
- */
-
-
-#include <stdlib.h>
-#include <gbfheadings.h>
-#ifndef __GNUC__
-#else
-#include <unixstr.h>
-#endif
-
-SWORD_NAMESPACE_START
-
-
-const char oName[] = "Headings";
-const char oTip[] = "Toggles Headings On and Off if they exist";
-
-const SWBuf choices[3] = {"On", "Off", ""};
-const StringList oValues(&choices[0], &choices[2]);
-
-GBFHeadings::GBFHeadings() : SWOptionFilter(oName, oTip, &oValues) {
-	setOptionValue("Off");
-}
-
-
-GBFHeadings::~GBFHeadings() {
-}
-
-
-char GBFHeadings::processText (SWBuf &text, const SWKey *key, const SWModule *module) {
-	if (!option) {	// if we don't want headings
-		char token[2048]; // cheese.  Fix.
-		int tokpos = 0;
-		bool intoken = false;
-		int len;
-		bool hide = false;
-
-	const char *from;
-	SWBuf orig = text;
-	from = orig.c_str();
-	for (text = ""; *from; from++) {
-			if (*from == '<') {
-				intoken = true;
-				tokpos = 0;
-//				memset(token, 0, 2048);
-				token[0] = 0;
-				token[1] = 0;
-				token[2] = 0;
-				continue;
-			}
-			if (*from == '>') {	// process tokens
-				intoken = false;
-				switch (*token) {
-				case 'T':				// Reference
-					switch(token[1]) {
-					case 'S':               // Begin heading
-						hide = true;
-						break;
-					case 's':               // end heading
-						hide = false;
-						break;
-					}
-					continue;	// skip token
-				}
-				// if not a heading token, keep token in text
-				if (!hide) {
-					text += '<';
-					for (char *tok = token; *tok; tok++)
-						text += *tok;
-					text += '>';
-				}
-				continue;
-			}
-			if (intoken) {
-				if (tokpos < 2045)
-					token[tokpos++] = *from;
-					token[tokpos+2] = 0;
-			}
-			else	{
-				if (!hide) {
-					text += *from;
-				}
-			}
-		}
-	}
-	return 0;
-}
-
-SWORD_NAMESPACE_END
diff --git a/src/modules/filters/gbfhtml.cpp b/src/modules/filters/gbfhtml.cpp
deleted file mode 100644
index 775bc06..0000000
--- a/src/modules/filters/gbfhtml.cpp
+++ /dev/null
@@ -1,168 +0,0 @@
-/***************************************************************************
-                          gbfhtml.cpp  -   GBF to HTML filter 
-                             -------------------
-    begin                    : 2001-09-03
-    copyright            : 2001 by CrossWire Bible Society
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include <stdlib.h>
-#include <gbfhtml.h>
-#include <ctype.h>
-
-SWORD_NAMESPACE_START
-
-GBFHTML::GBFHTML() {
-	setTokenStart("<");
-	setTokenEnd(">");
-	
-	setTokenCaseSensitive(true);
-
-	addTokenSubstitute("Rf", ")</small></font>");
-	addTokenSubstitute("Rx", "</a>");
-	addTokenSubstitute("FI", "<i>"); // italics begin
-	addTokenSubstitute("Fi", "</i>");
-	addTokenSubstitute("FB", "<n>"); // bold begin
-	addTokenSubstitute("Fb", "</n>");
-	addTokenSubstitute("FR", "<font color=\"#FF0000\">"); // words of Jesus begin
-	addTokenSubstitute("Fr", "</font>");
-	addTokenSubstitute("FU", "<u>"); // underline begin
-	addTokenSubstitute("Fu", "</u>");
-	addTokenSubstitute("FO", "<cite>"); //  Old Testament quote begin
-	addTokenSubstitute("Fo", "</cite>");
-	addTokenSubstitute("FS", "<sup>"); // Superscript begin// Subscript begin
-	addTokenSubstitute("Fs", "</sup>");
-	addTokenSubstitute("FV", "<sub>"); // Subscript begin
-	addTokenSubstitute("Fv", "</sub>");
-	addTokenSubstitute("TT", "<big>"); // Book title begin
-	addTokenSubstitute("Tt", "</big>");
-	addTokenSubstitute("PP", "<cite>"); //  poetry  begin
-	addTokenSubstitute("Pp", "</cite>");
-	addTokenSubstitute("Fn", "</font>"); //  font  end
-	addTokenSubstitute("CL", "<br />"); //  new line
-	addTokenSubstitute("CM", "<!P><br />"); //  paragraph <!P> is a non showing comment that can be changed in the front end to <P> if desired
-	addTokenSubstitute("CG", ""); //  ???
-	addTokenSubstitute("CT", ""); // ???
-	addTokenSubstitute("JR", "<div align=\"right\">"); // right align begin
-	addTokenSubstitute("JC", "<div align=\"center\">"); // center align begin
-	addTokenSubstitute("JL", "</div>"); // align end
-	
-}
-
-
-bool GBFHTML::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData) {
-	const char *tok;
-	char val[128];
-	char *valto;
-	const char *num;
-	MyUserData *u = (MyUserData *)userData;
-
-	if (!substituteToken(buf, token)) {		
-		// deal with OSIS note tags.  Just hide till OSISRTF		
-		if (!strncmp(token, "note ", 5)) {
-			// let's stop text from going to output
-			u->suspendTextPassThru = true;
-		}
-		
-		else if (!strncmp(token, "/note", 5)) {
-			u->suspendTextPassThru = false;
-		}		
-
-		else if (!strncmp(token, "w", 1)) {
-			// OSIS Word (temporary until OSISRTF is done)
-			valto = val;
-			num = strstr(token, "lemma=\"x-Strongs:");
-			if (num) {
-				for (num+=17; ((*num) && (*num != '\"')); num++)
-					*valto++ = *num;
-				*valto = 0;
-				if (atoi((!isdigit(*val))?val+1:val) < 5627) {
-					buf += " <small><em>&lt;";
-					for (tok = (!isdigit(*val))?val+1:val; *tok; tok++)
-							buf += *tok;
-					buf += "&gt;</em></small> ";					
-				}
-			}
-			valto = val;
-			num = strstr(token, "morph=\"x-Robinson:");
-			if (num) {
-				for (num+=18; ((*num) && (*num != '\"')); num++)
-					*valto++ = *num;
-				*valto = 0;
-				// normal robinsons tense
-				buf += " <small><em>(";
-				for (tok = val; *tok; tok++)
-						buf += *tok;		
-				buf += ")</em></small> ";					
-			}
-		}
-		
-		else if (!strncmp(token, "WG", 2) || !strncmp(token, "WH", 2)) { // strong's numbers
-			buf += " <small><em>&lt;";
-			for (tok = token + 2; *tok; tok++)
-					buf += *tok;
-			buf += "&gt;</em></small> ";
-		}
-
-		else if (!strncmp(token, "WTG", 3) || !strncmp(token, "WTH", 3)) { // strong's numbers tense
-			buf += " <small><em>&lt;";
-			for (tok = token + 3; *tok; tok++)
-				if(*tok != '\"')
-					buf += *tok;
-			buf += ")</em></small> ";
-		}
-
-		else if (!strncmp(token, "RX", 2)) {
-			buf += "<i>";
-			for (tok = token + 3; *tok; tok++) {
-			  if(*tok != '<' && *tok+1 != 'R' && *tok+2 != 'x') {
-			    buf += *tok;
-			  }
-			  else {
-			    break;
-			  }
-			}
-			buf += "</i>";
-		}
-
-		else if (!strncmp(token, "RB", 2)) {
-			buf += "<i>";
-			u->hasFootnotePreTag = true;
-		}
-
-		else if (!strncmp(token, "RF", 2)) {
-			if (u->hasFootnotePreTag) {
-				u->hasFootnotePreTag = false;
-				buf += "</i> ";
-			}
-			buf += "<font color=\"#800000\"><small> (";
-		}
-
-		else if (!strncmp(token, "FN", 2)) {
-			buf += "<font face=\"";
-			for (tok = token + 2; *tok; tok++)				
-				if(*tok != '\"') 			
-					buf += *tok;
-			buf += "\">";
-		}
-
-		else if (!strncmp(token, "CA", 2)) {	// ASCII value
-			buf += (char)atoi(&token[2]);
-		}
-		
-		else {
-			return false;
-		}
-	}
-	return true;
-}
-
-SWORD_NAMESPACE_END
diff --git a/src/modules/filters/gbfhtmlhref.cpp b/src/modules/filters/gbfhtmlhref.cpp
deleted file mode 100644
index 4061150..0000000
--- a/src/modules/filters/gbfhtmlhref.cpp
+++ /dev/null
@@ -1,229 +0,0 @@
-/***************************************************************************
-                          gbfhtmlhref.cpp  -   GBF to HTML filter with hrefs 
-			        for strongs and morph tags
-                             -------------------
-    begin                    : 2001-09-03
-    copyright            : 2001 by CrossWire Bible Society
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include <stdlib.h>
-#include <gbfhtmlhref.h>
-#include <swmodule.h>
-#include <utilxml.h>
-#include <versekey.h>
-#include <ctype.h>
-
-SWORD_NAMESPACE_START
-
-GBFHTMLHREF::GBFHTMLHREF() {
-	setTokenStart("<");
-	setTokenEnd(">");
-	
-	setTokenCaseSensitive(true);
-
-	//addTokenSubstitute("Rf", ")</small></font>");
-	addTokenSubstitute("FA", "<font color=\"#800000\">"); // for ASV footnotes to mark text
-	addTokenSubstitute("Rx", "</a>");
-	addTokenSubstitute("FI", "<i>"); // italics begin
-	addTokenSubstitute("Fi", "</i>");
-	addTokenSubstitute("FB", "<b>"); // bold begin
-	addTokenSubstitute("Fb", "</b>");
-	addTokenSubstitute("FR", "<font color=\"#FF0000\">"); // words of Jesus begin
-	addTokenSubstitute("Fr", "</font>");
-	addTokenSubstitute("FU", "<u>"); // underline begin
-	addTokenSubstitute("Fu", "</u>");
-	addTokenSubstitute("FO", "<cite>"); //  Old Testament quote begin
-	addTokenSubstitute("Fo", "</cite>");
-	addTokenSubstitute("FS", "<sup>"); // Superscript begin// Subscript begin
-	addTokenSubstitute("Fs", "</sup>");
-	addTokenSubstitute("FV", "<sub>"); // Subscript begin
-	addTokenSubstitute("Fv", "</sub>");
-	addTokenSubstitute("TT", "<big>"); // Book title begin
-	addTokenSubstitute("Tt", "</big>");
-	addTokenSubstitute("PP", "<cite>"); //  poetry  begin
-	addTokenSubstitute("Pp", "</cite>");
-	addTokenSubstitute("Fn", "</font>"); //  font  end
-	addTokenSubstitute("CL", "<br />"); //  new line
-	addTokenSubstitute("CM", "<!P><br />"); //  paragraph <!P> is a non showing comment that can be changed in the front end to <P> if desired
-	addTokenSubstitute("CG", ""); //  ???
-	addTokenSubstitute("CT", ""); // ???
-	addTokenSubstitute("JR", "<div align=\"right\">"); // right align begin
-	addTokenSubstitute("JC", "<div align=\"center\">"); // center align begin
-	addTokenSubstitute("JL", "</div>"); // align end
-	
-}
-
-
-bool GBFHTMLHREF::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData) {
-	const char *tok;
-	char val[128];
-	char *valto;
-	const char *num;
-	MyUserData *u = (MyUserData *)userData;
-
-	if (!substituteToken(buf, token)) {
-		XMLTag tag(token);
-		if (!strncmp(token, "w", 1)) {
-			// OSIS Word (temporary until OSISRTF is done)
-			valto = val;
-			num = strstr(token, "lemma=\"x-Strongs:");
-			if (num) {
-				for (num+=17; ((*num) && (*num != '\"')); num++)
-					*valto++ = *num;
-				*valto = 0;
-				if (atoi((!isdigit(*val))?val+1:val) < 5627) {
-					buf += " <small><em>&lt;<a href=\"type=Strongs value=";
-					for (tok = val; *tok; tok++)
-							buf += *tok;
-					buf += "\">";
-					for (tok = (!isdigit(*val))?val+1:val; *tok; tok++)
-							buf += *tok;
-					buf += "</a>&gt;</em></small> ";
-					//cout << buf;
-					
-				}
-				/*	forget these for now
-				else {
-					// verb morph
-					sprintf(wordstr, "%03d", word-1);
-					module->getEntryAttributes()["Word"][wordstr]["Morph"] = val;
-				}
-				*/
-			}
-			valto = val;
-			num = strstr(token, "morph=\"x-Robinson:");
-			if (num) {
-				for (num+=18; ((*num) && (*num != '\"')); num++)
-					*valto++ = *num;
-				*valto = 0;
-				buf += " <small><em>(<a href=\"type=morph class=Robinson value=";
-				for (tok = val; *tok; tok++)
-				// normal robinsons tense
-						buf += *tok;
-				buf += "\">";
-				for (tok = val; *tok; tok++)				
-					//if(*tok != '\"') 			
-						buf += *tok;		
-				buf += "</a>)</em></small> ";					
-			}
-		}
-		
-		else if (!strncmp(token, "WG", 2) || !strncmp(token, "WH", 2)) { // strong's numbers
-			buf += " <small><em>&lt;<a href=\"type=Strongs value=";
-			for (tok = token+1; *tok; tok++)
-				//if(token[i] != '\"')
-					buf += *tok;
-			buf += "\">";
-			for (tok = token + 2; *tok; tok++)
-				//if(token[i] != '\"')
-					buf += *tok;
-			buf += "</a>&gt;</em></small>";
-		}
-
-		else if (!strncmp(token, "WTG", 3) || !strncmp(token, "WTH", 3)) { // strong's numbers tense
-			buf += " <small><em>(<a href=\"type=Strongs value=";
-			for (tok = token + 2; *tok; tok++)
-				if(*tok != '\"')
-					buf += *tok;
-			buf += "\">";
-			for (tok = token + 3; *tok; tok++)
-				if(*tok != '\"')
-					buf += *tok;
-			buf += "</a>)</em></small>";
-		}
-
-		else if (!strncmp(token, "WT", 2) && strncmp(token, "WTH", 3) && strncmp(token, "WTG", 3)) { // morph tags
-			buf += " <small><em>(<a href=\"type=morph class=none value=";
-			for (tok = token + 2; *tok; tok++)
-				if(*tok != '\"')
-					buf += *tok;
-			buf += "\">";
-			for (tok = token + 2; *tok; tok++)				
-				if(*tok != '\"') 			
-					buf += *tok;		
-			buf += "</a>)</em></small>";
-		}
-
-		else if (!strcmp(tag.getName(), "RX")) {
-			buf += "<a href=\"";
-			for (tok = token + 3; *tok; tok++) {
-			  if(*tok != '<' && *tok+1 != 'R' && *tok+2 != 'x') {
-			    buf += *tok;
-			  }
-			  else {
-			    break;
-			  }
-			}
-			buf += "\">";
-		}
-		else if (!strcmp(tag.getName(), "RF")) {
-			SWBuf type = tag.getAttribute("type");
-			SWBuf footnoteNumber = tag.getAttribute("swordFootnote");
-			VerseKey *vkey;
-			// see if we have a VerseKey * or descendant
-			try {
-				vkey = SWDYNAMIC_CAST(VerseKey, u->key);
-			}
-			catch ( ... ) {	}
-			if (vkey) {
-				// leave this special osis type in for crossReference notes types?  Might thml use this some day? Doesn't hurt.
-				//char ch = ((tag.getAttribute("type") && ((!strcmp(tag.getAttribute("type"), "crossReference")) || (!strcmp(tag.getAttribute("type"), "x-cross-ref")))) ? 'x':'n');
-				buf.appendFormatted("<a href=\"noteID=%s.%c.%s\"><small><sup>*%c</sup></small></a> ", vkey->getText(), 'n', footnoteNumber.c_str(), 'n');
-			}
-			u->suspendTextPassThru = true;
-		}
-		else if (!strcmp(tag.getName(), "Rf")) {
-			u->suspendTextPassThru = false;
-		}
-/*
-		else if (!strncmp(token, "RB", 2)) {
-			buf += "<i> ";
-			u->hasFootnotePreTag = true;
-		}
-
-		else if (!strncmp(token, "Rf", 2)) {
-			buf += "&nbsp<a href=\"note=";
-			buf += u->lastTextNode.c_str();
-			buf += "\">";
-			buf += "<small><sup>*n</sup></small></a>&nbsp";
-			// let's let text resume to output again
-			u->suspendTextPassThru = false;
-		}
-		
-		else if (!strncmp(token, "RF", 2)) {
-			if (u->hasFootnotePreTag) {
-				u->hasFootnotePreTag = false;
-				buf += "</i> ";
-			}
-			u->suspendTextPassThru = true;
-		}
-*/
-		else if (!strncmp(token, "FN", 2)) {
-			buf += "<font face=\"";
-			for (tok = token + 2; *tok; tok++)				
-				if(*tok != '\"') 			
-					buf += *tok;
-			buf += "\">";
-		}
-
-		else if (!strncmp(token, "CA", 2)) {	// ASCII value
-			buf += (char)atoi(&token[2]);
-		}
-		
-		else {
-			return false;
-		}
-	}
-	return true;
-}
-
-SWORD_NAMESPACE_END
diff --git a/src/modules/filters/gbfmorph.cpp b/src/modules/filters/gbfmorph.cpp
deleted file mode 100644
index 996baf9..0000000
--- a/src/modules/filters/gbfmorph.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-/******************************************************************************
- *
- * gbfmorph -	SWFilter descendant to hide or show morph tags
- *			in a GBF module.
- */
-
-
-#include <stdlib.h>
-#include <gbfmorph.h>
-#ifndef __GNUC__
-#else
-#include <unixstr.h>
-#endif
-
-SWORD_NAMESPACE_START
-
-const char oName[] = "Morphological Tags";
-const char oTip[] = "Toggles Morphological Tags On and Off if they exist";
-
-const SWBuf choices[3] = {"On", "Off", ""};
-const StringList oValues(&choices[0], &choices[2]);
-
-GBFMorph::GBFMorph() : SWOptionFilter(oName, oTip, &oValues) {
-	setOptionValue("Off");
-}
-
-
-GBFMorph::~GBFMorph() {
-}
-
-
-char GBFMorph::processText(SWBuf &text, const SWKey *key, const SWModule *module) {
-	if (!option) {	// if we don't want morph tags
-		const char *from;
-		char token[2048]; // cheese.  Fix.
-		int tokpos = 0;
-		bool intoken = false;
-		int len;
-		bool lastspace = false;
-
-		SWBuf orig = text;
-		from = orig.c_str();
-
-		for (text = ""; *from; from++) {
-			if (*from == '<') {
-				intoken = true;
-				tokpos = 0;
-				token[0] = 0;
-				token[1] = 0;
-				token[2] = 0;
-				continue;
-			}
-			if (*from == '>') {	// process tokens
-				intoken = false;
-				if (*token == 'W' && token[1] == 'T') {	// Morph
-				  if ((from[1] == ' ') || (from[1] == ',') || (from[1] == ';') || (from[1] == '.') || (from[1] == '?') || (from[1] == '!') || (from[1] == ')') || (from[1] == '\'') || (from[1] == '\"')) {
-				    if (lastspace)
-				      text--;
-				  }
-				  continue;
-				}
-				// if not a morph tag token, keep token in text
-				text += '<';
-				text += token;
-				text += '>';
-				continue;
-			}
-			if (intoken) {
-				if (tokpos < 2045)
-					token[tokpos++] = *from;
-					token[tokpos+2] = 0;
-			}
-			else	{
-				text += *from;
-				lastspace = (*from == ' ');
-			}
-		}
-	}
-	return 0;
-}
-
-SWORD_NAMESPACE_END
diff --git a/src/modules/filters/gbfosis.cpp b/src/modules/filters/gbfosis.cpp
deleted file mode 100644
index b5dd8e1..0000000
--- a/src/modules/filters/gbfosis.cpp
+++ /dev/null
@@ -1,439 +0,0 @@
-/******************************************************************************
- *
- * gbfstrongs -	SWFilter descendant to hide or show strongs number
- *			in a GBF module.
- */
-
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <gbfosis.h>
-#include <swmodule.h>
-#include <versekey.h>
-#include <swlog.h>
-#include <stdarg.h>
-#ifndef __GNUC__
-#else
-#include <unixstr.h>
-#endif
-
-SWORD_NAMESPACE_START
-
-GBFOSIS::GBFOSIS() {
-}
-
-
-GBFOSIS::~GBFOSIS() {
-}
-
-
-char GBFOSIS::processText(SWBuf &text, const SWKey *key, const SWModule *module) { 
-/*
-	char *to, *from, token[2048]; // cheese.  Fix.
-	int tokpos = 0;
-	bool intoken = false;
-	int len;
-	bool lastspace = false;
-	int word = 1;
-	char val[128];
-	char buf[128];
-	char wordstr[5];
-	char *valto;
-	char *ch;
-	char *textStart, *textEnd;
-	char *wordStart, *wordEnd;
-	char *fromStart;
-	bool newText = false;
-	bool newWord = false;
-	SWBuf tmp;
-	bool suspendTextPassThru = false;
-	bool keepToken = false;
-	bool handled = false;
-
-	len = strlen(text) + 1;	// shift string to right of buffer
-	if (len < maxlen) {
-		memmove(&text[maxlen - len], text, len);
-		from = &text[maxlen - len];
-	}
-	else	from = text;
-	
-	textStart = from;
-	fromStart = from;
-	wordStart = text;
-
-	static QuoteStack quoteStack;
-
-	// -------------------------------
-
-	for (to = text; *from; from++) {
-		if (*from == '<') {
-			intoken = true;
-			tokpos = 0;
-			token[0] = 0;
-			token[1] = 0;
-			token[2] = 0;
-			textEnd = from-1;
-			wordEnd = to;
-			continue;
-		}
-		if (*from == '>') {	// process tokens
-			intoken = false;
-			keepToken = false;
-			suspendTextPassThru = false;
-			newWord = true;
-			handled = false;
-
-			while (wordStart < (text+maxlen)) {
-//				if (strchr(" ,;.?!()'\"", *wordStart))
-				if (strchr(";, .:?!()'\"", *wordStart) && wordStart[0] && wordStart[1])
-					wordStart++;
-				else break;
-			}
-			while (wordEnd > wordStart) {
-				if (strchr(" ,;.:?!()'\"", *wordEnd))
-					wordEnd--;
-				else break;
-			}
-
-			// Scripture Reference
-			if (!strncmp(token, "scripRef", 8)) {
-	//			pushString(buf, "<reference work=\"Bible.KJV\" reference=\"");
-				suspendTextPassThru = true;
-				newText = true;
-				handled = true;
-			}
-			else	if (!strncmp(token, "/scripRef", 9)) {
-				tmp = "";
-				tmp.append(textStart, (int)(textEnd - textStart)+1);
-				pushString(&to, convertToOSIS(tmp.c_str(), key));
-				lastspace = false;
-				suspendTextPassThru = false;
-				handled = true;
-			}
-
-			// Footnote
-			if (!strcmp(token, "RF")) {
-	//			pushString(buf, "<reference work=\"Bible.KJV\" reference=\"");
-				pushString(&to, "<note type=\"x-StudyNote\">");
-				newText = true;
-				lastspace = false;
-				handled = true;
-			}
-			else	if (!strcmp(token, "Rf")) {
-				pushString(&to, "</note>");
-				lastspace = false;
-				handled = true;
-			}
-			// hebrew titles
-			if (!strcmp(token, "TH")) {
-				pushString(&to, "<title type=\"psalm\">");
-				newText = true;
-				lastspace = false;
-				handled = true;
-			}
-			else	if (!strcmp(token, "Th")) {
-				pushString(&to, "</title>");
-				lastspace = false;
-				handled = true;
-			}
-			// Italics assume transchange
-			if (!strcmp(token, "FI")) {
-				pushString(&to, "<transChange type=\"added\">");
-				newText = true;
-				lastspace = false;
-				handled = true;
-			}
-			else	if (!strcmp(token, "Fi")) {
-				pushString(&to, "</transChange>");
-				lastspace = false;
-				handled = true;
-			}
-			// Paragraph break.  For now use empty paragraph element
-			if (!strcmp(token, "CM")) {
-				pushString(&to, "<milestone type=\"x-p\" />");
-				newText = true;
-				lastspace = false;
-				handled = true;
-			}
-
-			// Figure
-			else	if (!strncmp(token, "img ", 4)) {
-				const char *src = strstr(token, "src");
-				if (!src)		// assert we have a src attribute
-					continue;
-//					return false;
-
-				pushString(&to, "<figure src=\"");
-				const char *c;
-				for (c = src;((*c) && (*c != '"')); c++);
-
-// uncomment for SWORD absolute path logic
-//				if (*(c+1) == '/') {
-//					pushString(buf, "file:");
-//					pushString(buf, module->getConfigEntry("AbsoluteDataPath"));
-//					if (*((*buf)-1) == '/')
-//						c++;		// skip '/'
-//				}
-// end of uncomment for asolute path logic 
-
-				for (c++;((*c) && (*c != '"')); c++)
-					*to++ = *c;
-
-				pushString(&to, "\" />");
-				lastspace = false;
-				handled = true;
-			}
-
-			// Strongs numbers
-			else if (*token == 'W' && (token[1] == 'G' || token[1] == 'H')) {	// Strongs
-				bool divineName = false;
-				if (module->isProcessEntryAttributes()) {
-					valto = val;
-					for (unsigned int i = 1; ((token[i]) && (i < 150)); i++)
-						*valto++ = token[i];
-					*valto = 0;
-					// normal strongs number
-					strstrip(val);
-					if (!strncmp(wordStart, "<w ", 3)) {
-						strtok(wordStart, ">");
-						char *attStart = strstr(wordStart, "lemma");
-						if (attStart) {
-							attStart += 7;
-							sprintf(buf, "x-Strongs:%s|", val);
-						}
-						else {
-							attStart = wordStart + 3;
-							sprintf(buf, "lemma=\"x-Strongs:%s\" ", val);
-						}
-						wordStart[strlen(wordStart)] = '>';
-						memmove(attStart+strlen(buf), attStart, (to-attStart)+1);
-						memcpy(attStart, buf, strlen(buf));
-						to+=strlen(buf);
-					}
-					else {
-						if (!strcmp(val, "H03068")) {	//divineName
-							sprintf(buf, "<divineName><w lemma=\"x-Strongs:%s\">", val);
-							divineName = true;
-						}
-						else sprintf(buf, "<w lemma=\"x-Strongs:%s\">", val);
-
-						memmove(wordStart+strlen(buf), wordStart, (to-wordStart)+1);
-						memcpy(wordStart, buf, strlen(buf));
-						to+=strlen(buf);
-
-						if (divineName) {
-							wordStart += 12;
-							pushString(&to, "</w></divineName>");
-						}
-						else	pushString(&to, "</w>");
-
-						module->getEntryAttributes()["Word"][wordstr]["Strongs"] = val;
-						lastspace = false;
-					}
-				}
-				handled = true;
-			}
-
-			// Morphology
-			else if (*token == 'W' && token[1] == 'T' && (token[2] == 'G' || token[2] == 'H')) {	// Strongs
-				valto = val;
-				for (unsigned int i = 1; ((token[i]) && (i < 150)); i++)
-					*valto++ = token[i];
-				*valto = 0;
-				strstrip(val);
-				if (!strncmp(wordStart, "<w ", 3)) {
-					strtok(wordStart, ">");
-					char *attStart = strstr(wordStart, "morph");
-					if (attStart) {
-						attStart += 7;
-						sprintf(buf, "x-%s:%s|", "StrongsMorph", val);
-					}
-					else {
-						attStart = wordStart + 3;
-						sprintf(buf, "morph=\"x-%s:%s\" ", "StrongsMorph", val);
-					}
-					wordStart[strlen(wordStart)] = '>';
-					memmove(attStart+strlen(buf), attStart, (to-attStart)+1);
-					memcpy(attStart, buf, strlen(buf));
-					to+=strlen(buf);
-				}
-				else {
-					sprintf(buf, "<w morph=\"x-%s:%s\">", "StrongsMorph", val);
-					memmove(wordStart+strlen(buf), wordStart, (to-wordStart)+1);
-					memcpy(wordStart, buf, strlen(buf));
-					to+=strlen(buf);
-					pushString(&to, "</w>");
-					lastspace = false;
-				}
-				handled = true;
-			}
-
-			if (!keepToken) {	
-				if (!handled) {
-					SWLog::systemlog->LogError("Unprocessed Token: <%s>", token);
-//					exit(-1);
-				}
-				if (from[1] && strchr(" ,;.:?!()'\"", from[1])) {
-					if (lastspace)
-						to--;
-				}
-				if (newText) {textStart = from+1; newText = false; }
-//				if (newWord) {wordStart = to; newWord = false; }
-				continue;
-			}
-			// if not a strongs token, keep token in text
-			*to++ = '<';
-			for (char *tok = token; *tok; tok++)
-				*to++ = *tok;
-			*to++ = '>';
-			if (newText) {textStart = to; newWord = false; }
-//			if (newWord) {wordStart = to; newWord = false; }
-			continue;
-		}
-		if (intoken) {
-			if ((tokpos < 2045) && ((*from != 10)&&(*from != 13))) {
-				token[tokpos++] = *from;
-				token[tokpos+2] = 0;
-			}
-		}
-		else	{
-			switch (*from) {
-			case '\'':
-			case '\"':
-			case '`':
-//				quoteStack.handleQuote(fromStart, from, &to);
-				*to++ = *from;
-				from++;
-				break;
-			default:
-				if (newWord && (*from != ' ')) {wordStart = to; newWord = false; memset(to, 0, 10); }
-				if (!suspendTextPassThru) {
-					*to++ = *from;
-					lastspace = (*from == ' ');
-				}
-			}
-		}
-	}
-
-	VerseKey *vkey = SWDYNAMIC_CAST(VerseKey, key);
-	if (vkey) {
-		char ref[254];
-		if (vkey->Verse())
-			sprintf(ref, "\t\t<verse osisID=\"%s\">", vkey->getOSISRef());
-		else *ref = 0;
-		if (*ref) {
-			memmove(text+strlen(ref), text, maxlen-strlen(ref)-1);
-			memcpy(text, ref, strlen(ref));
-			to+=strlen(ref);
-			if (vkey->Verse()) {
-				VerseKey tmp;
-				tmp = *vkey;
-				tmp.AutoNormalize(0);
-				tmp.Headings(1);
-				sprintf(ref, "</verse>");
-				pushString(&to, ref);
-				tmp = MAXVERSE;
-				if (*vkey == tmp) {
-					tmp.Verse(0);
-//					sprintf(ref, "\t</div>");
-//					pushString(&to, ref);
-					tmp = MAXCHAPTER;
-					tmp = MAXVERSE;
-					if (*vkey == tmp) {
-						tmp.Chapter(0);
-						tmp.Verse(0);
-//						sprintf(ref, "\t</div>");
-//						pushString(&to, ref);
-						if (!quoteStack.empty()) {
-							SWLog::systemlog->LogError("popping unclosed quote at end of book");
-							quoteStack.clear();
-						}
-					}
-				}
-			}
-
-//
-//			else if (vkey->Chapter()) {
-//				sprintf(ref, "\t<div type=\"chapter\" osisID=\"%s\">", vkey->getOSISRef());
-//			}
-//			else sprintf(ref, "\t<div type=\"book\" osisID=\"%s\">", vkey->getOSISRef());
-//
-		}
-	}
-	*to++ = 0;
-	*to = 0;
-*/
-	return 0;
-}
-
-
-const char *GBFOSIS::convertToOSIS(const char *inRef, const SWKey *key) {
-	static SWBuf outRef;
-
-	outRef = "";
-
-	VerseKey defLanguage;
-	ListKey verses = defLanguage.ParseVerseList(inRef, (*key), true);
-	const char *startFrag = inRef;
-	for (int i = 0; i < verses.Count(); i++) {
-		VerseKey *element = SWDYNAMIC_CAST(VerseKey, verses.GetElement(i));
-		char buf[5120];
-		char frag[800];
-		if (element) {
-			memmove(frag, startFrag, ((const char *)element->userData - startFrag) + 1);
-			frag[((const char *)element->userData - startFrag) + 1] = 0;
-			startFrag = (const char *)element->userData + 1;
-			sprintf(buf, "<reference osisRef=\"%s-%s\">%s</reference>", element->LowerBound().getOSISRef(), element->UpperBound().getOSISRef(), frag);
-		}
-		else {
-			memmove(frag, startFrag, ((const char *)verses.GetElement(i)->userData - startFrag) + 1);
-			frag[((const char *)verses.GetElement(i)->userData - startFrag) + 1] = 0;
-			startFrag = (const char *)verses.GetElement(i)->userData + 1;
-			sprintf(buf, "<reference osisRef=\"%s\">%s</reference>", VerseKey(*verses.GetElement(i)).getOSISRef(), frag);
-		}
-		outRef+=buf;
-	}
-	return outRef.c_str();
-}
-
-
-QuoteStack::QuoteStack() {
-	clear();
-}
-
-
-void QuoteStack::clear() {
-	while (!quotes.empty()) quotes.pop();
-}
-
-
-QuoteStack::~QuoteStack() {
-	clear();
-}
-
-
-void QuoteStack::handleQuote(char *buf, char *quotePos, SWBuf &text) {
-//QuoteInstance(char startChar = '\"', char level = 1, string uniqueID = "", char continueCount = 0) {
-	if (!quotes.empty()) {
-		QuoteInstance last = quotes.top();
-		if (last.startChar == *quotePos) {
-			text += "</quote>";
-			quotes.pop();
-		}
-		else {
-			quotes.push(QuoteInstance(*quotePos, last.level+1));
-			quotes.top().pushStartStream(text);
-		}
-	}
-	else {
-		quotes.push(QuoteInstance(*quotePos));
-		quotes.top().pushStartStream(text);
-	}
-}
-
-void QuoteStack::QuoteInstance::pushStartStream(SWBuf &text) {
-	text.appendFormatted("<quote level=\"%d\">", level);
-}
-
-SWORD_NAMESPACE_END
diff --git a/src/modules/filters/gbfplain.cpp b/src/modules/filters/gbfplain.cpp
deleted file mode 100644
index f519a25..0000000
--- a/src/modules/filters/gbfplain.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-/******************************************************************************
- *
- * gbfplain -	SWFilter descendant to strip out all GBF tags or convert to
- *		ASCII rendered symbols.
- */
-
-
-#include <stdlib.h>
-#include <gbfplain.h>
-
-SWORD_NAMESPACE_START
-
-GBFPlain::GBFPlain() {
-}
-
-
-char GBFPlain::processText (SWBuf &text, const SWKey *key, const SWModule *module)
-{
-	char token[2048];
-	int tokpos = 0;
-	bool intoken = false;
-	const char *from;
-	SWBuf orig = text;
-	from = orig.c_str();
-	for (text = ""; *from; from++) {
-		if (*from == '<') {
-			intoken = true;
-			tokpos = 0;
-			token[0] = 0;
-			token[1] = 0;
-			token[2] = 0;
-			continue;
-		}
-		if (*from == '>') {
-			intoken = false;
-						// process desired tokens
-			switch (*token) {
-			case 'W':	// Strongs
-				switch(token[1]) {
-					case 'G':               // Greek
-					case 'H':               // Hebrew
-					case 'T':               // Tense
-						text += " <";
-						for (char *tok = token + 2; *tok; tok++)
-							text += *tok;
-						text += "> ";
-						continue;
-				}
-				break;
-			case 'R':
-				switch(token[1]) {
-				case 'F':               // footnote begin
-					text += " [";
-					continue;
-				case 'f':               // footnote end
-					text += "] ";
-					continue;
-				}
-				break;
-			case 'C':
-				switch(token[1]) {
-				case 'A':               // ASCII value
-					text += (char)atoi(&token[2]);
-					continue;
-				case 'G':
-					text += ">";
-					continue;
-/*								Bug in WEB
-				case 'L':
-					*to++ = '<';
-					continue;
-*/
-				case 'L':	//        Bug in WEB.  Use above entry when fixed
-				case 'N':               // new line
-					text += '\n';
-					continue;
-				case 'M':               // new paragraph
-					text += "\n\n";
-					continue;
-				}
-				break;
-			}
-			continue;
-		}
-		if (intoken) {
-			if (tokpos < 2045)
-				token[tokpos++] = *from;
-				token[tokpos+2] = 0;
-		}
-		else	text += *from;
-	}
-	return 0;
-}
-
-SWORD_NAMESPACE_END
diff --git a/src/modules/filters/gbfredletterwords.cpp b/src/modules/filters/gbfredletterwords.cpp
deleted file mode 100644
index df7438d..0000000
--- a/src/modules/filters/gbfredletterwords.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-/******************************************************************************
- *
- * GBFRedLetterWords -	SWFilter descendant to toggle red coloring of words of
- *			Christ in a GBF module.
- */
-
-
-#include <stdlib.h>
-#include <gbfredletterwords.h>
-#include <swmodule.h>
-#ifndef __GNUC__
-#else
-#include <unixstr.h>
-#endif
-#include <ctype.h>
-
-SWORD_NAMESPACE_START
-
-const char oName[] = "Words of Christ in Red";
-const char oTip[] = "Toggles Red Coloring for Words of Christ On and Off if they are marked";
-
-const SWBuf choices[3] = {"On", "Off", ""};
-const StringList oValues(&choices[0], &choices[2]);
-
-GBFRedLetterWords::GBFRedLetterWords() : SWOptionFilter(oName, oTip, &oValues) {
-	setOptionValue("Off");
-}
-
-
-GBFRedLetterWords::~GBFRedLetterWords() {
-}
-
-
-char GBFRedLetterWords::processText(SWBuf &text, const SWKey *key, const SWModule *module) {
-/** This function removes the red letter words in Bible like the WEB
-* The words are marked by <FR> as start and <Fr> as end tag.
-*/
-	if (!option) {	// if we don't want footnotes
-		char token[4096]; // cheese.  Fix.
-		int tokpos = 0;
-		bool intoken = false;
-		int len;
-		bool hide = false;
-
-	const char *from;
-	SWBuf orig = text;
-	from = orig.c_str();
-	for (text = ""; *from; from++) {
-			if (*from == '<') {
-				intoken = true;
-				tokpos = 0;
-//				memset(token, 0, 4096);
-				token[0] = 0;
-				token[1] = 0;
-				token[2] = 0;
-				continue;
-			}
-			if (*from == '>') {	// process tokens
-				intoken = false;
-				/*switch (*token) {
-				case 'F':			// Font attribute
-					switch(token[1]) {
-					case 'R':               // Begin red letter words
-						hide = true;
-						break;
-					case 'r':               // end red letter words
-						hide = false;
-						break;
-					}
-					continue;	// skip token
-				}*/
-
-				//hide the token if either FR or Fr was detected
-				hide = (token[0] == 'F' && ( (token[1] == 'R') || (token[1] == 'r') ));
-
-				// if not a red letter word token, keep token in text
-				if (!hide) {
-					text += '<';
-					for (char *tok = token; *tok; tok++)
-						text += *tok;
-					text += '>';
-				}
-				continue;
-			}
-			if (intoken) {
-				if (tokpos < 4090)
-					token[tokpos++] = *from;
-					token[tokpos+2] = 0;	// +2 cuz we init token with 2 extra '0' because of switch statement
-			}
-			else {
-				text += *from;
-			}
-		}
-	}
-	return 0;
-}
-
-SWORD_NAMESPACE_END
diff --git a/src/modules/filters/gbfrtf.cpp b/src/modules/filters/gbfrtf.cpp
deleted file mode 100644
index 4a18fbf..0000000
--- a/src/modules/filters/gbfrtf.cpp
+++ /dev/null
@@ -1,289 +0,0 @@
-/******************************************************************************
- *
- * gbfrtf -	SWFilter descendant to convert all GBF tags to RTF tags
- */
-
-
-#include <gbfrtf.h>
-#include <ctype.h>
-
-SWORD_NAMESPACE_START
-
-GBFRTF::GBFRTF() {
-}
-
-
-char GBFRTF::processText(SWBuf &text, const SWKey *key, const SWModule *module)
-{
-	char token[2048];
-	char val[128];
-	char *valto;
-	char *num;
-	int tokpos = 0;
-	bool intoken = false;
-	int len;
-	const char *tok;
-	SWBuf strongnum;
-	SWBuf strongtense;
-	bool hideText = false;
-	int wordLen = 0;
-	int wordCount = 0;
-	int i;
-
-	const char *from;
-	SWBuf orig = text;
-	from = orig.c_str();
-	for (text = ""; *from; from++) {
-		if (*from == '<') {
-			wordLen = wordCount;
-			wordCount = 0;
-			intoken = true;
-			tokpos = 0;
-			token[0] = 0;
-			token[1] = 0;
-			token[2] = 0;
-			continue;
-		}
-		if (*from == '>') {
-			intoken = false;
-						// process desired tokens
-			// deal with OSIS note tags.  Just hide till OSISRTF
-			if (!strncmp(token, "note ", 5)) {
-				hideText = true;
-			}
-			if (!strncmp(token, "/note", 5)) {
-				hideText = false;
-			}
-
-			switch (*token) {
-			case 'w':	// OSIS Word (temporary until OSISRTF is done)
-				strongnum = "";
-				strongtense = "";
-				valto = val;
-				num = strstr(token, "lemma=\"x-Strongs:");
-				if (num) {
-					for (num+=17; ((*num) && (*num != '\"')); num++)
-						*valto++ = *num;
-					*valto = 0;
-					if (atoi((!isdigit(*val))?val+1:val) < 5627) {
-						// normal strongs number
-						strongnum += "{\\cf3 \\sub <";
-						for (tok = (!isdigit(*val))?val+1:val; *tok; tok++)
-							strongnum += *tok;
-						strongnum += ">}";
-					}
-					/*	forget these for now
-					else {
-						// verb morph
-						sprintf(wordstr, "%03d", word-1);
-						module->getEntryAttributes()["Word"][wordstr]["Morph"] = val;
-					}
-					*/
-				}
-				valto = val;
-				num = strstr(token, "morph=\"x-Robinson:");
-				if (num) {
-					for (num+=18; ((*num) && (*num != '\"')); num++)
-						*valto++ = *num;
-					*valto = 0;
-					// normal robinsons tense
-					strongtense += "{\\cf4 \\sub (";
-					for (tok = val; *tok; tok++)
-						strongtense += *tok;
-					strongtense += ")}";
-				}
-				continue;
-
-			case '/':
-				if (token[1] == 'w') {
-					if ((wordCount > 0) || (strongnum != "{\\cf3 \\sub <3588>}")) {
-						//for (i = 0; i < strongnum.length(); i++)
-							text += strongnum;
-					//for (i = 0; i < strongtense.length(); i++)
-						text += strongtense;
-					}
-				}
-				continue;
-
-			case 'W':	// Strongs
-				switch(token[1]) {
-				case 'G':               // Greek
-				case 'H':               // Hebrew
-					text += "{\\cf3 \\sub <";
-					for (tok = token + 2; *tok; tok++)
-						text += *tok;
-					text += ">}";
-					continue;
-
-				case 'T':               // Tense
-					text += "{\\cf4 \\sub (";
-					bool separate = false;
-					for (tok = token + 2; *tok; tok++) {
-						if (separate) {
-							text += "; ";
-							separate = false;
-						}
-						switch (*tok) {
-						case 'G':
-						case 'H':
-							for (tok++; *tok; tok++) {
-								if (isdigit(*tok)) {
-									text += *tok;
-									separate = true;
-								}
-								else {
-									tok--;
-									break;
-								}
-							}
-							break;
-						default:
-							for (; *tok; tok++) {
-							       text += *tok;
-							}
-						}
-					}
-					text += ")}";
-					continue;
-				}
-				break;
-			case 'R':
-				switch(token[1]) {
-				case 'X':
-					text += "<a href=\"\">";
-				  continue;
-				case 'x':
-					text += "</a>";
-				  continue;
-				case 'F':               // footnote begin
-					text += "{\\i1 \\sub (";
-					continue;
-				case 'f':               // footnote end
-					text += ") }";
-					continue;
-				}
-				break;
-			case 'F':			// font tags
-				switch(token[1]) {
-				case 'I':		// italic start
-					text += "\\i1 ";
-					continue;
-				case 'i':		// italic end
-					text += "\\i0 ";
-					continue;
-				case 'B':		// bold start
-					text += "\\b1 ";
-					continue;
-				case 'b':		// bold end
-					text += "\\b0 ";
-					continue;
-				case 'N':
-					text += '{';
-					if (!strnicmp(token+2, "Symbol", 6))
-						text += "\\f7 ";
-                                        if (!strnicmp(token+2, "Courier", 7))
-						text += "\\f8 ";
-					continue;
-				case 'n':
-					text += '}';
-					continue;
-				case 'S':
-					text += "{\\super ";
-					continue;
-				case 's':
-					text += '}';
-					continue;
-				case 'R':
-					text += "{\\cf6 ";
-					continue;
-				case 'r':
-					text += '}';
-					continue;
-				case 'O':
-				case 'C':
-					text += "\\scaps1 ";
-					continue;
-				case 'o':
-				case 'c':
-					text += "\\scaps0 ";
-					continue;
-				case 'V':
-					text += "{\\sub ";
-					continue;
-				case 'v':
-					text += '}';
-					continue;
-				case 'U':
-					text += "\\ul1 ";
-					continue;
-				case 'u':
-					text += "\\ul0 ";
-					continue;
-				}
-				break;
-			case 'C':			// special character tags
-				switch(token[1]) {
-				case 'A':               // ASCII value
-					text += (char)atoi(&token[2]);
-					continue;
-				case 'G':
-					text += '>';
-					continue;
-				case 'L':               // line break
-					text += "\\line ";
-					continue;
-				case 'M':               // new paragraph
-					text += "\\par ";
-					continue;
-				case 'T':
-					text += '<';
-				}
-				break;
-			case 'T':			// title formatting
-			  switch(token[1])
-			    {
-			    case 'T':               // Book title begin
-					text += "{\\large ";
-				 continue;
-			    case 't':
-				 text += '}';
-				 continue;
-			    case 'S':
-					text += "\\par {\\i1\\b1 ";
-			      continue;
-			    case 's':
-					text += "}\\par ";
-			      continue;
-			    }
-			  break;
-			case 'J':	// Strongs
-				switch(token[1]) {
-				case 'L':
-					text += "\\ql ";
-				case 'C':
-					text += "\\qc ";
-				case 'R':
-					text += "\\qr ";
-                                case 'F':
-                                	text += "\\qj ";
-                                }
-			}
-			continue;
-		}
-		if (intoken) {
-			if (tokpos < 2045)
-				token[tokpos++] = *from;
-				token[tokpos+2] = 0;
-		}
-		else {
-			if (!hideText) {
-				wordCount++;
-				text += *from;
-			}
-		}
-	}
-	return 0;
-}
-
-SWORD_NAMESPACE_END
-
diff --git a/src/modules/filters/gbfstrongs.cpp b/src/modules/filters/gbfstrongs.cpp
deleted file mode 100644
index bd5088a..0000000
--- a/src/modules/filters/gbfstrongs.cpp
+++ /dev/null
@@ -1,116 +0,0 @@
-/******************************************************************************
- *
- * gbfstrongs -	SWFilter descendant to hide or show strongs number
- *			in a GBF module.
- */
-
-
-#include <stdlib.h>
-#include <gbfstrongs.h>
-#include <swmodule.h>
-#ifndef __GNUC__
-#else
-#include <unixstr.h>
-#endif
-#include <ctype.h>
-
-SWORD_NAMESPACE_START
-
-const char oName[] = "Strong's Numbers";
-const char oTip[] = "Toggles Strong's Numbers On and Off if they exist";
-
-const SWBuf choices[3] = {"On", "Off", ""};
-const StringList oValues(&choices[0], &choices[2]);
-
-GBFStrongs::GBFStrongs() : SWOptionFilter(oName, oTip, &oValues) {
-	setOptionValue("Off");
-}
-
-
-GBFStrongs::~GBFStrongs() {
-}
-
-
-char GBFStrongs::processText(SWBuf &text, const SWKey *key, const SWModule *module) {
-	char token[2048]; // cheese.  Fix.
-	int tokpos = 0;
-	bool intoken = false;
-	int len;
-	bool lastspace = false;
-	int word = 1;
-	char val[128];
-	char wordstr[5];
-	char *valto;
-	char *ch;
-	unsigned int textStart = 0, textEnd = 0;
-	bool newText = false;
-	SWBuf tmp;
-	const char *from;
-
-	SWBuf orig = text;
-	from = orig.c_str();
-
-	for (text = ""; *from; from++) {
-		if (*from == '<') {
-			intoken = true;
-			tokpos = 0;
-			token[0] = 0;
-			token[1] = 0;
-			token[2] = 0;
-			textEnd = text.size();
-			continue;
-		}
-		if (*from == '>') {	// process tokens
-			intoken = false;
-
-			if (*token == 'W' && (token[1] == 'G' || token[1] == 'H')) {	// Strongs
-				if (module->isProcessEntryAttributes()) {
-					valto = val;
-					for (unsigned int i = 2; ((token[i]) && (i < 150)); i++)
-						*valto++ = token[i];
-					*valto = 0;
-					if (atoi((!isdigit(*val))?val+1:val) < 5627) {
-						// normal strongs number
-						sprintf(wordstr, "%03d", word++);
-						module->getEntryAttributes()["Word"][wordstr]["Strongs"] = val;
-						tmp = "";
-						tmp.append(text.c_str()+textStart, (int)(textEnd - textStart));
-						module->getEntryAttributes()["Word"][wordstr]["Text"] = tmp;
-						newText = true;
-					}
-					else {
-						// verb morph
-						sprintf(wordstr, "%03d", word-1);
-						module->getEntryAttributes()["Word"][wordstr]["Morph"] = val;
-					}
-				}
-				if (!option) {
-					if ((from[1] == ' ') || (from[1] == ',') || (from[1] == ';') || (from[1] == '.') || (from[1] == '?') || (from[1] == '!') || (from[1] == ')') || (from[1] == '\'') || (from[1] == '\"')) {
-						if (lastspace)
-							text--;
-					}
-					if (newText) {textStart = text.size(); newText = false; }
-					continue;
-				}
-			}
-			// if not a strongs token, keep token in text
-			text += '<';
-			text += token;
-			text += '>';
-			if (newText) {textStart = text.size(); newText = false; }
-			continue;
-		}
-		if (intoken) {
-			if (tokpos < 2045)
-				token[tokpos++] = *from;
-				token[tokpos+2] = 0;
-		}
-		else	{
-			text += *from;
-			lastspace = (*from == ' ');
-		}
-	}
-	return 0;
-}
-
-SWORD_NAMESPACE_END
diff --git a/src/modules/filters/gbfthml.cpp b/src/modules/filters/gbfthml.cpp
deleted file mode 100644
index 03b8d8a..0000000
--- a/src/modules/filters/gbfthml.cpp
+++ /dev/null
@@ -1,216 +0,0 @@
-/***************************************************************************
-                     gbfthml.cpp  -  GBF to ThML filter
-                             -------------------
-    begin                : 1999-10-27
-    copyright            : 2001 by CrossWire Bible Society
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include <stdlib.h>
-#include <gbfthml.h>
-
-SWORD_NAMESPACE_START
-
-GBFThML::GBFThML()
-{
-}
-
-
-char GBFThML::processText(SWBuf &text, const SWKey *key, const SWModule *module) {
-	const char *from;
-	char token[2048];
-	int tokpos = 0;
-	bool intoken 	= false;
-	int len;
-	const char *tok;
-
-	SWBuf orig = text;
-	from = orig.c_str();
-
-	for (text = ""; *from; from++) {
-		if (*from == '<') {
-			intoken = true;
-			tokpos = 0;
-			token[0] = 0;
-			token[1] = 0;
-			token[2] = 0;
-			continue;
-		}
-		if (*from == '>')
-		{
-			intoken = false;
-			// process desired tokens
-			switch (*token) {
-			case 'W':	// Strongs
-			  switch(token[1]) {
-			  case 'G':
-			  case 'H':			    
-			    text += "<sync type=\"Strongs\" value=\"";
-			    for (tok = token + 1; *tok; tok++)
-				 text += *tok;
-			    text += "\" />";
-			    continue;
-			    
-			  case 'T':               // Tense
-			    text += "<sync type=\"Morph\" value=\"";
-			    for (tok = token + 2; *tok; tok++)
-				 text += *tok;
-			    text += "\" />";
-			    continue;
-				}
-			  break;
-			case 'R':
-			  switch(token[1])
-			    {
-			    case 'X':
-				 text += "<a href=\"";
-				 for (tok = token + 3; *tok; tok++) {
-				if(*tok != '<' && *tok+1 != 'R' && *tok+2 != 'x') {
-				  text += *tok;
-				}
-				else {
-				  break;
-				}
-				 }
-				 text += "\">";
-				 continue;
-			    case 'x':
-				 text += "</a>";
-				 continue;
-			    case 'F':               // footnote begin
-				 text += "<note>";
-				 continue;
-			    case 'f':               // footnote end
-				 text += "</note>";
-				 continue;
-			    }
-			  break;
-			case 'F':			// font tags
-			  switch(token[1])
-			    {
-			    case 'N':
-				 text += "<font face=\"";
-				 for (tok = token + 2; *tok; tok++)
-					text += *tok;
-				text += "\">";
-				 continue;
-			    case 'n':
-				 text += "</font>";
-				 continue;
-			    case 'I':		// italic start
-				 text += "<i>";
-				 continue;
-			    case 'i':		// italic end
-				 text += "</i>";
-				 continue;
-			    case 'B':		// bold start
-				 text += "<b>";
-				 continue;
-			    case 'b':		// bold end
-				 text += "</b>";
-				 continue;
-
-			    case 'R':		// words of Jesus begin
-				 text += "<font color=\"#ff0000\">";
-				 continue;
-			    case 'r':		// words of Jesus end
-				 text += "</font>";
-				 continue;
-			    case 'U':		// Underline start
-				 text += "<u>";
-				 continue;
-			    case 'u':		// Underline end
-				 text += "</u>";
-				 continue;
-			    case 'O':		// Old Testament quote begin
-				 text += "<cite>";
-				 continue;
-			    case 'o':		// Old Testament quote end
-				 text += "</cite>";
-				 continue;
-			    case 'S':		// Superscript begin
-				 text += "<sup>";
-				 continue;
-			    case 's':		// Superscript end
-				 text += "</sup>";
-				 continue;
-			    case 'V':		// Subscript begin
-				 text += "<sub>";
-				 continue;
-			    case 'v':		// Subscript end
-				 text += "</sub>";
-				 continue;
-			    }
-			  break;
-			case 'C':			// special character tags
-			  switch(token[1])
-				{
-				case 'A':               // ASCII value
-				  text += (char)atoi(&token[2]);
-				  continue;
-				case 'G':
-				  //*to++ = ' ';
-				  continue;
-				case 'L':               // line break
-				 text += "<br /> ";
-				  continue;
-				case 'M':               // new paragraph
-				 text += "<p />";
-				  continue;
-				case 'T':
-				  //*to++ = ' ';
-				  continue;
-				}
-			  break;
-			case 'T':			// title formatting
-			  switch(token[1])
-			    {
-			    case 'T':               // Book title begin
-				 text += "<big>";
-				 continue;
-			    case 't':
-				 text += "</big>";
-				 continue;
-			    case 'S':
-				 text += "<div class=\"sechead\">";
-				 continue;
-			    case 's':
-				 text += "</div>";
-				 continue;
-			    }
-			  break;
-
-			case 'P':			// special formatting
-			  switch(token[1]) {
-			    case 'P':               // Poetry begin
-				 text += "<verse>";
-				 continue;
-			    case 'p':
-				 text += "</verse>";
-				 continue;
-			    }
-			  break;
-			}
-			continue;
-		}
-		if (intoken) {
-			if (tokpos < 2045)
-				token[tokpos++] = *from;
-				token[tokpos+2] = 0;
-		}
-		else	text += *from;
-	}
-	return 0;
-}
-
-
-
-SWORD_NAMESPACE_END
diff --git a/src/modules/filters/gbfwebif.cpp b/src/modules/filters/gbfwebif.cpp
deleted file mode 100644
index 131f359..0000000
--- a/src/modules/filters/gbfwebif.cpp
+++ /dev/null
@@ -1,161 +0,0 @@
-/***************************************************************************
-                          GBFWEBIF.cpp  -   GBF to HTML filter with hrefs 
-			        for strongs and morph tags
-                             -------------------
-    begin                    : 2001-09-03
-    copyright            : 2001 by CrossWire Bible Society
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include <gbfwebif.h>
-#include <ctype.h>
-#include <utilweb.h>
-
-SWORD_NAMESPACE_START
-
-GBFWEBIF::GBFWEBIF() : baseURL(""), passageStudyURL(baseURL + "passagestudy.jsp") {
-//all is done in GBFHTMLHREF since it inherits form this class
-	addTokenSubstitute("FR", "<span class=\"wordsOfJesus\">"); // words of Jesus begin
-	addTokenSubstitute("Fr", "</span>");
-}
-
-bool GBFWEBIF::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData) {
-	const char *tok;
-	char val[128];
-	char *valto;
-	const char *num;
-	SWBuf url;
-
-	if (!substituteToken(buf, token)) {
-		if (!strncmp(token, "w", 1)) {
-			// OSIS Word (temporary until OSISRTF is done)
-			valto = val;
-			num = strstr(token, "lemma=\"x-Strongs:");
-
-			if (num) {
-				for (num+=17; ((*num) && (*num != '\"')); num++)
-					*valto++ = *num;
-				*valto = 0;
-
-				if (atoi((!isdigit(*val))?val+1:val) < 5627) {
-					buf += " <small><em>&lt;";
-					url = "";
-					for (tok = val; *tok; tok++) {
-						url += *tok;
-					}
-					if ((url.length() > 1) && strchr("GH", url[0])) {
-						if (isdigit(url[1]))
-							url = url.c_str()+1;
-					}
-					buf.appendFormatted("<a href=\"%s?showStrong=%s#cv\">", passageStudyURL.c_str(), encodeURL(url).c_str());
-
-					for (tok = (!isdigit(*val))?val+1:val; *tok; tok++) {
-						buf += *tok;
-					}
-					buf += "</a>&gt;</em></small> ";
-				}
-			}
-			valto = val;
-			num = strstr(token, "morph=\"x-Robinson:");
-			if (num) {
-				for (num+=18; ((*num) && (*num != '\"')); num++)
-					*valto++ = *num;
-				*valto = 0;
-				buf += " <small><em>(";
-				url = "";
-				for (tok = val; *tok; tok++) {
-				// normal robinsons tense
-					buf += *tok;
-				}
-				buf.appendFormatted("<a href=\"%s?showMorph=%s#cv\">", passageStudyURL.c_str(), encodeURL(url).c_str());
-
-				for (tok = val; *tok; tok++) {
-					buf += *tok;
-				}
-				buf += "</a>)</em></small> ";
-			}
-		}
-
-		else if (!strncmp(token, "WG", 2) || !strncmp(token, "WH", 2)) { // strong's numbers
-			buf += " <small><em>&lt;";
-			url = "";
-
-			for (tok = token+1; *tok; tok++) {
-				url += *tok;
-			}
-			if ((url.length() > 1) && strchr("GH", url[0])) {
-				if (isdigit(url[1]))
-					url = url.c_str()+1;
-			}
-			buf.appendFormatted("<a href=\"%s?showStrong=%s#cv\">", passageStudyURL.c_str(), encodeURL(url).c_str());
-
-			for (tok = token + 2; *tok; tok++) {
-				buf += *tok;
-			}
-			buf += "</a>&gt;</em></small>";
-		}
-
-		else if (!strncmp(token, "WTG", 3) || !strncmp(token, "WTH", 3)) { // strong's numbers tense
-			buf += " <small><em>(";
-			url = "";
-			for (tok = token + 2; *tok; tok++) {
-				if(*tok != '\"')
-					url += *tok;
-			}
-			if ((url.length() > 1) && strchr("GH", url[0])) {
-				if (isdigit(url[1]))
-					url = url.c_str()+1;
-			}
-			buf.appendFormatted("<a href=\"%s?showStrong=%s#cv\">", passageStudyURL.c_str(), encodeURL(url).c_str());
-
-			for (tok = token + 3; *tok; tok++)
-				if(*tok != '\"')
-					buf += *tok;
-			buf += "</a>)</em></small>";
-		}
-
-		else if (!strncmp(token, "WT", 2) && strncmp(token, "WTH", 3) && strncmp(token, "WTG", 3)) { // morph tags
-			buf += " <small><em>(";
-			for (tok = token + 2; *tok; tok++) {
-				if(*tok != '\"')
-					buf += *tok;
-			}
-			buf.appendFormatted("<a href=\"%s?showMorph=%s#cv\">", passageStudyURL.c_str(), encodeURL(url).c_str());
-
-			for (tok = token + 2; *tok; tok++) {
-				if(*tok != '\"')
-					buf += *tok;
-			}
-			buf += "</a>)</em></small>";
-		}
-
-		else if (!strncmp(token, "RX", 2)) {
-			buf += "<a href=\"";
-			for (tok = token + 3; *tok; tok++) {
-			  if(*tok != '<' && *tok+1 != 'R' && *tok+2 != 'x') {
-			    buf += *tok;
-			  }
-			  else {
-			    break;
-			  }
-			}
-
-			buf.appendFormatted("a href=\"%s?key=%s#cv\">", passageStudyURL.c_str(), encodeURL(url).c_str());
-		}
-
-		else {
-			return GBFHTMLHREF::handleToken(buf, token, userData);
-		}
-	}
-	return true;
-}
-
-SWORD_NAMESPACE_END
diff --git a/src/modules/filters/greeklexattribs.cpp b/src/modules/filters/greeklexattribs.cpp
deleted file mode 100644
index 073ba39..0000000
--- a/src/modules/filters/greeklexattribs.cpp
+++ /dev/null
@@ -1,100 +0,0 @@
-/******************************************************************************
- *
- * greeklexattribs -	SWFilter descendant to set entry attributes for greek
- * 	                lexicons
- */
-
-
-#include <stdlib.h>
-#include <ctype.h>
-#include <string>
-#include <greeklexattribs.h>
-#include <swmodule.h>
-
-using std::string;
-
-SWORD_NAMESPACE_START
-
-GreekLexAttribs::GreekLexAttribs() {
-}
-
-
-char GreekLexAttribs::processText(SWBuf &text, const SWKey *key, const SWModule *module) {
-
-	if (module->isProcessEntryAttributes()) {
-		const char *from;
-		bool inAV = false;
-		string phrase;
-		string freq;
-		char val[128], *valto;
-		char wordstr[7];
-		const char *currentPhrase = 0, *ch = 0;
-		const char *currentPhraseEnd = 0;
-		int number = 0;
-
-
-		for (from = text.c_str(); *from; from++) {
-			if (inAV) {
-				if (currentPhrase == 0) {
-					if (isalpha(*from))
-						currentPhrase = from;
-				}
-				else {
-					if ((!isalpha(*from)) && (*from != ' ') && (*from != '+') && (*from !='(') && (*from != ')') && (*from != '\'')) {
-						if (*from == '<') {
-							if (!currentPhraseEnd)
-								currentPhraseEnd = from - 1;
-							for (; *from && *from != '>'; from++) {
-								if (!strncmp(from, "value=\"", 7)) {
-									valto = val;
-									from += 7;
-									for (unsigned int i = 0; from[i] != '\"' && i < 127; i++)
-										*valto++ = from[i];
-									*valto = 0;
-									sprintf(wordstr, "%03d", number+1);
-									module->getEntryAttributes()["AVPhrase"][wordstr]["CompoundedWith"] = val;
-									from += strlen(val);
-								}
-							}
-							continue;
-						}
-
-						phrase = "";
-						phrase.append(currentPhrase, (int)(((currentPhraseEnd>currentPhrase)?currentPhraseEnd:from) - currentPhrase)-1);
-						currentPhrase = from;
-						while (*from && isdigit(*from)) from++;
-						freq = "";
-						freq.append(currentPhrase, (int)(from - currentPhrase));
-						if ((freq.length() > 0) && (phrase.length() > 0)) {
-							sprintf(wordstr, "%03d", ++number);
-							if ((strchr(phrase.c_str(), '(') > phrase.c_str()) && (strchr(phrase.c_str(), ')') > phrase.c_str() + 1)) {
-								string tmp = phrase.substr(0, phrase.find_first_of("("));
-								phrase.erase(phrase.find_first_of("("), 1);
-								phrase.erase(phrase.find_first_of(")"), 1);
-								phrase.erase(0,phrase.find_first_not_of("\r\n\v\t ")); phrase.erase(phrase.find_last_not_of("\r\n\v\t ")+1);
-								module->getEntryAttributes()["AVPhrase"][wordstr]["Alt"] = phrase.c_str();
-								phrase = tmp;
-							}
-							phrase.erase(0,phrase.find_first_not_of("\r\n\v\t ")); phrase.erase(phrase.find_last_not_of("\r\n\v\t ")+1);
-							freq.erase(0,freq.find_first_not_of("\r\n\v\t ")); freq.erase(freq.find_last_not_of("\r\n\v\t ")+1);
-							module->getEntryAttributes()["AVPhrase"][wordstr]["Phrase"] = phrase.c_str();
-							module->getEntryAttributes()["AVPhrase"][wordstr]["Frequency"] = freq.c_str();
-							currentPhrase = 0;
-							currentPhraseEnd = 0;
-						}
-					}
-				}
-				if (*from == ';') inAV = false;
-
-			}
-			else if (!strncmp(from, "AV-", 3)) {
-				inAV = true;
-				from+=2;
-			}
-		}
-	}
-	return 0;
-}
-
-
-SWORD_NAMESPACE_END
diff --git a/src/modules/filters/latin1utf16.cpp b/src/modules/filters/latin1utf16.cpp
deleted file mode 100644
index 8067381..0000000
--- a/src/modules/filters/latin1utf16.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-/******************************************************************************
- *
- * Latin1UTF16 -	SWFilter descendant to convert a Latin-1 character to UTF-16
- *
- */
-
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <latin1utf16.h>
-
-SWORD_NAMESPACE_START
-
-Latin1UTF16::Latin1UTF16() {
-}
-
-
-char Latin1UTF16::processText(SWBuf &text, const SWKey *key, const SWModule *module) {
-    const unsigned char *from;
-    int len;
-	 if ((unsigned long)key < 2)	// hack, we're en(1)/de(0)ciphering
-		return -1;
-   
-    
-	SWBuf orig = text;
-	from = (const unsigned char *)orig.c_str();
-
-	for (text = ""; *from; from++) {
-		text.setSize(text.size()+2);
-	   switch (*from) {
-	case 0x80: // '€'
-		*((unsigned short *)(text.getRawData()+(text.size()-2))) = (unsigned short) 0x20AC;
-		break;
-	case 0x82: // '‚'
-		*((unsigned short *)(text.getRawData()+(text.size()-2))) = (unsigned short) 0x201A;
-		break;
-	case 0x83: // 'ƒ'
-		*((unsigned short *)(text.getRawData()+(text.size()-2))) = (unsigned short) 0x0192;
-		break;
-	case 0x84: // '„'
-		*((unsigned short *)(text.getRawData()+(text.size()-2))) = (unsigned short) 0x201E;
-		break;
-	case 0x85: // '…'
-		*((unsigned short *)(text.getRawData()+(text.size()-2))) = (unsigned short) 0x2026;
-		break;
-	case 0x86: // '†'
-		*((unsigned short *)(text.getRawData()+(text.size()-2))) = (unsigned short) 0x2020;
-		break;
-	case 0x87: // '‡'
-		*((unsigned short *)(text.getRawData()+(text.size()-2))) = (unsigned short) 0x2021;
-		break;
-	case 0x88: // 'ˆ'
-		*((unsigned short *)(text.getRawData()+(text.size()-2))) = (unsigned short) 0x02C6;
-		break;
-	case 0x89: // '‰'
-		*((unsigned short *)(text.getRawData()+(text.size()-2))) = (unsigned short) 0x2030;
-		break;
-	case 0x8A: // 'Š'
-		*((unsigned short *)(text.getRawData()+(text.size()-2))) = (unsigned short) 0x0160;
-		break;
-	case 0x8B: // '‹'
-		*((unsigned short *)(text.getRawData()+(text.size()-2))) = (unsigned short) 0x2039;
-		break;
-	case 0x8C: // 'Œ'
-		*((unsigned short *)(text.getRawData()+(text.size()-2))) = (unsigned short) 0x0152;
-		break;
-	case 0x8E: // 'Ž'
-		*((unsigned short *)(text.getRawData()+(text.size()-2))) = (unsigned short) 0x017D;
-		break;
-	case 0x91: // '‘'
-		*((unsigned short *)(text.getRawData()+(text.size()-2))) = (unsigned short) 0x2018;
-		break;
-	case 0x92: // '’'
-		*((unsigned short *)(text.getRawData()+(text.size()-2))) = (unsigned short) 0x2019;
-		break;
-	case 0x93: // '“'
-		*((unsigned short *)(text.getRawData()+(text.size()-2))) = (unsigned short) 0x201C;
-		break;
-	case 0x94: // '”'
-		*((unsigned short *)(text.getRawData()+(text.size()-2))) = (unsigned short) 0x201D;
-		break;
-	case 0x95: // '•'
-		*((unsigned short *)(text.getRawData()+(text.size()-2))) = (unsigned short) 0x2022;
-		break;
-	case 0x96: // '–'
-		*((unsigned short *)(text.getRawData()+(text.size()-2))) = (unsigned short) 0x2013;
-		break;
-	case 0x97: // '—'
-		*((unsigned short *)(text.getRawData()+(text.size()-2))) = (unsigned short) 0x2014;
-		break;
-	case 0x98: // '˜'
-		*((unsigned short *)(text.getRawData()+(text.size()-2))) = (unsigned short) 0x02DC;
-		break;
-	case 0x99: // '™'
-		*((unsigned short *)(text.getRawData()+(text.size()-2))) = (unsigned short) 0x2122;
-		break;
-	case 0x9A: // 'š'
-		*((unsigned short *)(text.getRawData()+(text.size()-2))) = (unsigned short) 0x0161;
-		break;
-	case 0x9B: // '›'
-		*((unsigned short *)(text.getRawData()+(text.size()-2))) = (unsigned short) 0x203A;
-		break;
-	case 0x9C: // 'œ'
-		*((unsigned short *)(text.getRawData()+(text.size()-2))) = (unsigned short) 0x0153;
-		break;
-	case 0x9E: // 'ž'
-		*((unsigned short *)(text.getRawData()+(text.size()-2))) = (unsigned short) 0x017E;
-		break;
-	case 0x9F: // 'Ÿ'
-		*((unsigned short *)(text.getRawData()+(text.size()-2))) = (unsigned short) 0x0178;
-		break;
-	   default:
-		*((unsigned short *)(text.getRawData()+(text.size()-2))) = (unsigned short) *from;
-	   }
-    }
-    return 0;
-}
-
-SWORD_NAMESPACE_END
diff --git a/src/modules/filters/latin1utf8.cpp b/src/modules/filters/latin1utf8.cpp
deleted file mode 100644
index 6d7d87b..0000000
--- a/src/modules/filters/latin1utf8.cpp
+++ /dev/null
@@ -1,173 +0,0 @@
-/******************************************************************************
- *
- * Latin1UTF8 -	SWFilter descendant to convert a Latin-1 character to UTF-8
- *
- */
-
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <latin1utf8.h>
-#include <swmodule.h>
-
-SWORD_NAMESPACE_START
-
-Latin1UTF8::Latin1UTF8() {
-}
-
-
-char Latin1UTF8::processText(SWBuf &text, const SWKey *key, const SWModule *module)
-{
-    const unsigned char *from;
-
-	 if ((unsigned long)key < 2)	// hack, we're en(1)/de(0)ciphering
-		return -1;
-
-	SWBuf orig = text;
-	from = (const unsigned char *)orig.c_str();
-
-	for (text = ""; *from; from++) {
-	  if (*from < 0x80) {
-	    text += *from;
-	  }
-	  else if (*from < 0xc0) {
-                switch(*from) {
-        	case 0x80: // '€'
-	        	text += 0xe2; // 'â'
-		        text += 0x82; // '‚'
-        		text += 0xac; // '¬'
-	        	break;
-        	case 0x82: // '‚'
-	        	text += 0xe2; // 'â'
-		        text += 0x80; // '€'
-        		text += 0x9a; // 'š'
-	        	break;
-        	case 0x83: // 'ƒ'
-	        	text += 0xc6; // 'Æ'
-		        text += 0x92; // '’'
-        		break;
-	        case 0x84: // '„'
-		        text += 0xe2; // 'â'
-        		text += 0x80; // '€'
-	        	text += 0x9e; // 'ž'
-		        break;
-        	case 0x85: // '…'
-	        	text += 0xe2; // 'â'
-		        text += 0x80; // '€'
-        		text += 0xa6; // '¦'
-	        	break;
-        	case 0x86: // '†'
-        		text += 0xe2; // 'â'
-	        	text += 0x80; // '€'
-		        text += 0xa0; // ' '
-        		break;
-	        case 0x87: // '‡'
-		        text += 0xe2; // 'â'
-        		text += 0x80; // '€'
-	        	text += 0xa1; // '¡'
-		        break;
-        	case 0x88: // 'ˆ'
-	        	text += 0xcb; // 'Ë'
-		        text += 0x86; // '†'
-        		break;
-	        case 0x89: // '‰'
-		        text += 0xe2; // 'â'
-        		text += 0x80; // '€'
-	        	text += 0xb0; // '°'
-		        break;
-        	case 0x8A: // 'Š'
-	        	text += 0xc5; // 'Å'
-		        text += 0xa0; // ' '
-        		break;
-	        case 0x8B: // '‹'
-		        text += 0xe2; // 'â'
-        		text += 0x80; // '€'
-	        	text += 0xb9; // '¹'
-		        break;
-        	case 0x8C: // 'Œ'
-	        	text += 0xc5; // 'Å'
-		        text += 0x92; // '’'
-        		break;
-	        case 0x8E: // 'Ž'
-		        text += 0xc5; // 'Å'
-        		text += 0xbd; // '½'
-	        	break;
-        	case 0x91: // '‘'
-        		text += 0xe2; // 'â'
-	        	text += 0x80; // '€'
-		        text += 0x98; // '˜'
-        		break;
-	        case 0x92: // '’'
-		        text += 0xe2; // 'â'
-        		text += 0x80; // '€'
-	        	text += 0x99; // '™'
-		        break;
-        	case 0x93: // '“'
-	        	text += 0xe2; // 'â'
-		        text += 0x80; // '€'
-        		text += 0x9c; // 'œ'
-	        	break;
-        	case 0x94: // '”'
-	        	text += 0xe2; // 'â'
-		        text += 0x80; // '€'
-        		text += 0x9d; // '�'
-	        	break;
-        	case 0x95: // '•'
-	        	text += 0xe2; // 'â'
-		        text += 0x80; // '€'
-        		text += 0xa2; // '¢'
-	        	break;
-        	case 0x96: // '–'
-	        	text += 0xe2; // 'â'
-		        text += 0x80; // '€'
-        		text += 0x93; // '“'
-	        	break;
-        	case 0x97: // '—'
-	        	text += 0xe2; // 'â'
-		        text += 0x80; // '€'
-        		text += 0x94; // '”'
-	        	break;
-        	case 0x98: // '˜'
-	        	text += 0xcb; // 'Ë'
-		        text += 0x9c; // 'œ'
-        		break;
-	        case 0x99: // '™'
-		        text += 0xe2; // 'â'
-        		text += 0x84; // '„'
-	        	text += 0xa2; // '¢'
-		        break;
-        	case 0x9A: // 'š'
-	        	text += 0xc5; // 'Å'
-		        text += 0xa1; // '¡'
-        		break;
-	        case 0x9B: // '›'
-		        text += 0xe2; // 'â'
-        		text += 0x80; // '€'
-	        	text += 0xba; // 'º'
-		        break;
-        	case 0x9C: // 'œ'
-	        	text += 0xc5; // 'Å'
-		        text += 0x93; // '“'
-        		break;
-	        case 0x9E: // 'ž'
-		        text += 0xc5; // 'Å'
-        		text += 0xbe; // '¾'
-	        	break;
-        	case 0x9F: // 'Ÿ'
-	        	text += 0xc5; // 'Å'
-		        text += 0xb8; // '¸'
-        		break;
-                default:
-                        text += 0xC2;
-                        text += *from;
-                }
-	  }
-	  else {
-	    text += 0xC3;
-	    text += (*from - 0x40);
-	  }
-	}
-	return 0;
-}
-
-SWORD_NAMESPACE_END
diff --git a/src/modules/filters/osisfootnotes.cpp b/src/modules/filters/osisfootnotes.cpp
deleted file mode 100644
index 59a7cae..0000000
--- a/src/modules/filters/osisfootnotes.cpp
+++ /dev/null
@@ -1,138 +0,0 @@
-/******************************************************************************
- *
- * osisfootnotes -	SWFilter descendant to hide or show footnotes
- *			in an OSIS module.
- */
-
-
-#include <stdlib.h>
-#include <osisfootnotes.h>
-#include <swmodule.h>
-#include <swbuf.h>
-#include <versekey.h>
-#include <utilxml.h>
-#ifndef __GNUC__
-#else
-#include <unixstr.h>
-#endif
-
-SWORD_NAMESPACE_START
-
-const char oName[] = "Footnotes";
-const char oTip[] = "Toggles Footnotes On and Off if they exist";
-
-const SWBuf choices[3] = {"On", "Off", ""};
-const StringList oValues(&choices[0], &choices[2]);
-
-OSISFootnotes::OSISFootnotes() : SWOptionFilter(oName, oTip, &oValues) {
-	setOptionValue("Off");
-}
-
-
-OSISFootnotes::~OSISFootnotes() {
-}
-
-
-char OSISFootnotes::processText(SWBuf &text, const SWKey *key, const SWModule *module) {
-	SWBuf token;
-	bool intoken    = false;
-	bool hide       = false;
-	SWBuf tagText;
-	XMLTag startTag;
-	SWBuf refs = "";
-	int footnoteNum = 1;
-	char buf[254];
-	VerseKey parser = key->getText();
-
-	SWBuf orig = text;
-	const char *from = orig.c_str();
-
-	for (text = ""; *from; from++) {
-
-		// remove all newlines temporarily to fix kjv2003 module
-		if ((*from == 10) || (*from == 13)) {
-			if ((text.length()>1) && (text[text.length()-2] != ' ') && (*(from+1) != ' '))
-				text += ' ';
-			continue;
-		}
-
-		
-		if (*from == '<') {
-			intoken = true;
-			token = "";
-			continue;
-		}
-		if (*from == '>') {	// process tokens
-			intoken = false;
-
-			XMLTag tag(token);
-			if (!strcmp(tag.getName(), "note")) {
-				if (!tag.isEndTag()) {
-					if (SWBuf("strongsMarkup") == tag.getAttribute("type")) {  // handle bug in KJV2003 module where some note open tags were <note ... />
-						tag.setEmpty(false);
-					}
-					if (!tag.isEmpty()) {
-//					if ((!tag.isEmpty()) || (SWBuf("strongsMarkup") == tag.getAttribute("type"))) {
-						refs = "";
-						startTag = tag;
-						hide = true;
-						tagText = "";
-						continue;
-					}
-				}
-				if (hide && tag.isEndTag()) {
-					if (module->isProcessEntryAttributes()) {
-						sprintf(buf, "%i", footnoteNum++);
-						StringList attributes = startTag.getAttributeNames();
-						for (StringList::iterator it = attributes.begin(); it != attributes.end(); it++) {
-							module->getEntryAttributes()["Footnote"][buf][it->c_str()] = startTag.getAttribute(it->c_str());
-						}
-						module->getEntryAttributes()["Footnote"][buf]["body"] = tagText;
-						startTag.setAttribute("swordFootnote", buf);
-						if ((startTag.getAttribute("type")) && (!strcmp(startTag.getAttribute("type"), "crossReference"))) {
-							if (!refs.length())
-								refs = parser.ParseVerseList(tagText.c_str(), parser, true).getRangeText();
-							module->getEntryAttributes()["Footnote"][buf]["refList"] = refs.c_str();
-						}
-					}
-					hide = false;
-					if ((option) || ((startTag.getAttribute("type") && (!strcmp(startTag.getAttribute("type"), "crossReference"))))) {	// we want the tag in the text; crossReferences are handled by another filter
-						text += startTag;
-						text.append(tagText);
-					}
-					else	continue;
-				}
-			}
-
-			// if not a heading token, keep token in text
-			if ((!strcmp(tag.getName(), "reference")) && (!tag.isEndTag())) {
-				SWBuf osisRef = tag.getAttribute("osisRef");
-				if (refs.length())
-					refs += "; ";
-				refs += osisRef;
-			}
-			if (!hide) {
-				text += '<';
-				text.append(token);
-				text += '>';
-			}
-			else {
-				tagText += '<';
-				tagText.append(token);
-				tagText += '>';
-			}
-			continue;
-		}
-		if (intoken) { //copy token
-			token += *from;
-		}
-		else if (!hide) { //copy text which is not inside a token
-			text += *from;
-		}
-		else tagText += *from;
-	}
-	return 0;
-}
-
-SWORD_NAMESPACE_END
-
diff --git a/src/modules/filters/osisheadings.cpp b/src/modules/filters/osisheadings.cpp
deleted file mode 100644
index 8ec9ce3..0000000
--- a/src/modules/filters/osisheadings.cpp
+++ /dev/null
@@ -1,118 +0,0 @@
-/******************************************************************************
- *
- *osisheadings -	SWFilter descendant to hide or show headings
- *			in an OSIS module.
- */
-
-
-#include <stdlib.h>
-#include <osisheadings.h>
-#include <swmodule.h>
-#include <utilxml.h>
-#ifndef __GNUC__
-#else
-#include <unixstr.h>
-#endif
-
-SWORD_NAMESPACE_START
-
-const char oName[] = "Headings";
-const char oTip[] = "Toggles Headings On and Off if they exist";
-
-const SWBuf choices[3] = {"On", "Off", ""};
-const StringList oValues(&choices[0], &choices[2]);
-
-OSISHeadings::OSISHeadings() : SWOptionFilter(oName, oTip, &oValues) {
-	setOptionValue("Off");
-}
-
-
-OSISHeadings::~OSISHeadings() {
-}
-
-
-char OSISHeadings::processText(SWBuf &text, const SWKey *key, const SWModule *module) {
-	SWBuf token;
-	bool intoken    = false;
-	bool hide       = false;
-	bool preverse   = false;
-	SWBuf header;
-	int headerNum   = 0;
-	int pvHeaderNum = 0;
-	char buf[254];
-
-	SWBuf orig = text;
-	const char *from = orig.c_str();
-
-	for (text = ""; *from; from++) {
-		if (*from == '<') {
-			intoken = true;
-			token = "";
-			continue;
-		}
-		if (*from == '>') {	// process tokens
-			intoken = false;
-
-			XMLTag tag(token);
-			if (!stricmp(tag.getName(), "title")) {
-				if ((tag.getAttribute("subtype")) && (!stricmp(tag.getAttribute("subtype"), "x-preverse"))) {
-					hide = true;
-					preverse = true;
-					header = "";
-					continue;
-				}
-				if (!tag.isEndTag()) {
-					hide = true;
-					header = "";
-					if (option) {	// we want the tag in the text
-						text += '<';
-						text.append(token);
-						text += '>';
-					}
-					continue;
-				}
-				if (hide && tag.isEndTag()) {
-
-					if (module->isProcessEntryAttributes() && option) {
-						if (preverse) {
-							sprintf(buf, "%i", pvHeaderNum++);
-							module->getEntryAttributes()["Heading"]["Preverse"][buf] = header;
-						}
-						else {
-							sprintf(buf, "%i", headerNum++);
-							module->getEntryAttributes()["Heading"]["Interverse"][buf] = header;
-							if (option) {	// we want the tag in the text
-								text.append(header);
-							}
-						}
-					}
-					hide = false;
-					if ((!option) || (preverse)) {	// we don't want the tag in the text anymore
-						preverse = false;
-						continue;
-					}
-					preverse = false;
-				}
-			}
-
-			// if not a heading token, keep token in text
-			if (!hide) {
-				text += '<';
-				text.append(token);
-				text += '>';
-			}
-			continue;
-		}
-		if (intoken) { //copy token
-			token += *from;
-		}
-		else if (!hide) { //copy text which is not inside a token
-			text += *from;
-		}
-		else header += *from;
-	}
-	return 0;
-}
-
-SWORD_NAMESPACE_END
-
diff --git a/src/modules/filters/osishtmlhref.cpp b/src/modules/filters/osishtmlhref.cpp
deleted file mode 100644
index 26e6dff..0000000
--- a/src/modules/filters/osishtmlhref.cpp
+++ /dev/null
@@ -1,339 +0,0 @@
-/***************************************************************************
-                     osishtmlhref.cpp  -  OSIS to HTML with hrefs filter
-                             -------------------
-    begin                : 2003-06-24
-    copyright            : 2003 by CrossWire Bible Society
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include <stdlib.h>
-#include <osishtmlhref.h>
-#include <utilxml.h>
-#include <versekey.h>
-#include <swmodule.h>
-
-SWORD_NAMESPACE_START
-
-
-OSISHTMLHREF::MyUserData::MyUserData(const SWModule *module, const SWKey *key) : BasicFilterUserData(module, key) {
-	osisQToTick = ((!module->getConfigEntry("OSISqToTick")) || (strcmp(module->getConfigEntry("OSISqToTick"), "false")));
-}
-
-
-OSISHTMLHREF::OSISHTMLHREF() {
-	setTokenStart("<");
-	setTokenEnd(">");
-
-	setEscapeStart("&");
-	setEscapeEnd(";");
-
-	setEscapeStringCaseSensitive(true);
-
-	addEscapeStringSubstitute("amp", "&");
-	addEscapeStringSubstitute("apos", "'");
-	addEscapeStringSubstitute("lt", "<");
-	addEscapeStringSubstitute("gt", ">");
-	addEscapeStringSubstitute("quot", "\"");
-	addTokenSubstitute("lg", "<br />");
-	addTokenSubstitute("/lg", "<br />");
-
-	setTokenCaseSensitive(true);
-}
-
-
-bool OSISHTMLHREF::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData) {
-  // manually process if it wasn't a simple substitution
-	if (!substituteToken(buf, token)) {
-		MyUserData *u = (MyUserData *)userData;
-		XMLTag tag(token);
-
-		// <w> tag
-		if (!strcmp(tag.getName(), "w")) {
-
-			// start <w> tag
-			if ((!tag.isEmpty()) && (!tag.isEndTag())) {
-				u->w = token;
-			}
-
-			// end or empty <w> tag
-			else {
-				bool endTag = tag.isEndTag();
-				SWBuf lastText;
-				bool show = true;	// to handle unplaced article in kjv2003-- temporary till combined
-
-				if (endTag) {
-					tag = u->w.c_str();
-					lastText = u->lastTextNode.c_str();
-				}
-				else lastText = "stuff";
-
-				const char *attrib;
-				const char *val;
-				if (attrib = tag.getAttribute("xlit")) {
-					val = strchr(attrib, ':');
-					val = (val) ? (val + 1) : attrib;
-					buf.appendFormatted(" %s", val);
-				}
-				if (attrib = tag.getAttribute("gloss")) {
-					val = strchr(attrib, ':');
-					val = (val) ? (val + 1) : attrib;
-					buf.appendFormatted(" %s", val);
-				}
-				if (attrib = tag.getAttribute("lemma")) {
-					int count = tag.getAttributePartCount("lemma");
-					int i = (count > 1) ? 0 : -1;		// -1 for whole value cuz it's faster, but does the same thing as 0
-					do {
-						attrib = tag.getAttribute("lemma", i);
-						if (i < 0) i = 0;	// to handle our -1 condition
-						val = strchr(attrib, ':');
-						val = (val) ? (val + 1) : attrib;
-						const char *val2 = val;
-						if ((strchr("GH", *val)) && (isdigit(val[1])))
-							val2++;
-						if ((!strcmp(val2, "3588")) && (lastText.length() < 1))
-							show = false;
-						else	buf.appendFormatted(" <small><em>&lt;<a href=\"type=Strongs value=%s\">%s</a>&gt;</em></small> ", val, val2);
-					} while (++i < count);
-				}
-				if ((attrib = tag.getAttribute("morph")) && (show)) {
-					SWBuf savelemma = tag.getAttribute("savlm");
-					if ((strstr(savelemma.c_str(), "3588")) && (lastText.length() < 1))
-						show = false;
-					if (show) {
-						int count = tag.getAttributePartCount("morph");
-						int i = (count > 1) ? 0 : -1;		// -1 for whole value cuz it's faster, but does the same thing as 0
-						do {
-							attrib = tag.getAttribute("morph", i);
-							if (i < 0) i = 0;	// to handle our -1 condition
-							val = strchr(attrib, ':');
-							val = (val) ? (val + 1) : attrib;
-							const char *val2 = val;
-							if ((*val == 'T') && (strchr("GH", val[1])) && (isdigit(val[2])))
-								val2+=2;
-							buf.appendFormatted(" <small><em>(<a href=\"type=morph class=%s value=%s\">%s</a>)</em></small> ", tag.getAttribute("morph"), val, val2);
-						} while (++i < count);
-					}
-				}
-				if (attrib = tag.getAttribute("POS")) {
-					val = strchr(attrib, ':');
-					val = (val) ? (val + 1) : attrib;
-					buf.appendFormatted(" %s", val);
-				}
-
-				/*if (endTag)
-					buf += "}";*/
-			}
-		}
-
-		// <note> tag
-		else if (!strcmp(tag.getName(), "note")) {
-			if (!tag.isEndTag()) {
-				if (!tag.isEmpty()) {
-					SWBuf type = tag.getAttribute("type");
-
-					if (type != "strongsMarkup") {	// leave strong's markup notes out, in the future we'll probably have different option filters to turn different note types on or off
-						SWBuf footnoteNumber = tag.getAttribute("swordFootnote");
-						VerseKey *vkey;
-						// see if we have a VerseKey * or descendant
-						try {
-							vkey = SWDYNAMIC_CAST(VerseKey, u->key);
-						}
-						catch ( ... ) {	}
-						if (vkey) {
-							char ch = ((tag.getAttribute("type") && ((!strcmp(tag.getAttribute("type"), "crossReference")) || (!strcmp(tag.getAttribute("type"), "x-cross-ref")))) ? 'x':'n');
-							buf.appendFormatted("<a href=\"noteID=%s.%c.%s\"><small><sup>*%c</sup></small></a> ", vkey->getText(), ch, footnoteNumber.c_str(), ch);
-						}
-					}
-					u->suspendTextPassThru = true;
-				}
-			}
-			if (tag.isEndTag()) {
-				u->suspendTextPassThru = false;
-			}
-		}
-
-		// <p> paragraph tag
-		else if (!strcmp(tag.getName(), "p")) {
-			if ((!tag.isEndTag()) && (!tag.isEmpty())) {	// non-empty start tag
-				buf += "<!P><br />";
-			}
-			else if (tag.isEndTag()) {	// end tag
-				buf += "<!/P><br />";
-				userData->supressAdjacentWhitespace = true;
-			}
-			else {					// empty paragraph break marker
-				buf += "<!P><br />";
-				userData->supressAdjacentWhitespace = true;
-			}
-		}
-
-		// <reference> tag
-		else if (!strcmp(tag.getName(), "reference")) {
-			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
-				buf += "<a href=\"\">";
-			}
-			else if (tag.isEndTag()) {
-				buf += "</a>";
-			}
-		}
-
-		// <l> poetry, etc
-		else if (!strcmp(tag.getName(), "l")) {
-			if (tag.isEmpty()) {
-				buf += "<br />";
-			}
-			else if (tag.isEndTag()) {
-				buf += "<br />";
-			}
-			else if (tag.getAttribute("sID")) {	// empty line marker
-				buf += "<br />";
-			}
-		}
-
-		// <milestone type="line"/>
-		else if ((!strcmp(tag.getName(), "milestone")) && (tag.getAttribute("type")) && (!strcmp(tag.getAttribute("type"), "line"))) {
-			buf += "<br />";
-			userData->supressAdjacentWhitespace = true;
-		}
-
-		// <title>
-		else if (!strcmp(tag.getName(), "title")) {
-			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
-				buf += "<b>";
-			}
-			else if (tag.isEndTag()) {
-				buf += "</b><br />";
-			}
-		}
-
-		// <hi> hi?  hi contrast?
-		else if (!strcmp(tag.getName(), "hi")) {
-			SWBuf type = tag.getAttribute("type");
-			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
-				if (type == "b" || type == "x-b") {
-					buf += "<b> ";
-					u->inBold = true;
-				}
-				else {	// all other types
-					buf += "<i> ";
-					u->inBold = false;
-				}
-			}
-			else if (tag.isEndTag()) {
-				if(u->inBold) {
-					buf += "</b>";
-					u->inBold = false;
-				}
-				else
-				      buf += "</i>";
-			}
-			else {	// empty hi marker
-				// what to do?  is this even valid?
-			}
-		}
-
-		// <q> quote
-		else if (!strcmp(tag.getName(), "q")) {
-			SWBuf type = tag.getAttribute("type");
-			SWBuf who = tag.getAttribute("who");
-			const char *lev = tag.getAttribute("level");
-			int level = (lev) ? atoi(lev) : 1;
-			
-			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
-				/*buf += "{";*/
-
-				//alternate " and '
-				if (u->osisQToTick)
-					buf += (level % 2) ? '\"' : '\'';
-				
-				if (who == "Jesus") {
-					buf += "<font color=\"red\"> ";
-				}
-			}
-			else if (tag.isEndTag()) {
-				//alternate " and '
-				if (u->osisQToTick)
-					buf += (level % 2) ? '\"' : '\'';
-				//buf += "</font>";
-			}
-			else {	// empty quote marker
-				//alternate " and '
-				if (u->osisQToTick)
-					buf += (level % 2) ? '\"' : '\'';
-			}
-		}
-
-		// <transChange>
-		else if (!strcmp(tag.getName(), "transChange")) {
-			SWBuf type = tag.getAttribute("type");
-			
-			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
-
-// just do all transChange tags this way for now
-//				if (type == "supplied")
-					buf += "<i>";
-			}
-			else if (tag.isEndTag()) {
-				buf += "</i>";
-			}
-			else {	// empty transChange marker?
-			}
-		}
-
-		// image
-		else if (!strcmp(tag.getName(), "figure")) {
-			const char *src = tag.getAttribute("src");
-			if (!src)		// assert we have a src attribute
-				return false;
-
-			char* filepath = new char[strlen(u->module->getConfigEntry("AbsoluteDataPath")) + strlen(token)];
-			*filepath = 0;
-			strcpy(filepath, userData->module->getConfigEntry("AbsoluteDataPath"));
-			strcat(filepath, src);
-
-// we do this because BibleCS looks for this EXACT format for an image tag
-			buf+="<image src=\"";
-			buf+=filepath;
-			buf+="\" />";
-/*
-			char imgc;
-			for (c = filepath + strlen(filepath); c > filepath && *c != '.'; c--);
-			c++;
-			FILE* imgfile;
-				    if (stricmp(c, "jpg") || stricmp(c, "jpeg")) {
-						  imgfile = fopen(filepath, "r");
-						  if (imgfile != NULL) {
-								buf += "{\\nonshppict {\\pict\\jpegblip ";
-								while (feof(imgfile) != EOF) {
-									   buf.appendFormatted("%2x", fgetc(imgfile));
-								}
-								fclose(imgfile);
-								buf += "}}";
-						  }
-				    }
-				    else if (stricmp(c, "png")) {
-						  buf += "{\\*\\shppict {\\pict\\pngblip ";
-
-						  buf += "}}";
-				    }
-*/
-			delete [] filepath;
-		}
-		
-		else {
-		      return false;  // we still didn't handle token
-		}
-	}
-	return true;
-}
-
-
-SWORD_NAMESPACE_END
diff --git a/src/modules/filters/osislemma.cpp b/src/modules/filters/osislemma.cpp
deleted file mode 100644
index e31c002..0000000
--- a/src/modules/filters/osislemma.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-/******************************************************************************
- *
- * osislemma          -	SWFilter descendant to hide or show lemmata
- *			in a OSIS module.
- */
-
-
-#include <stdlib.h>
-#include <osislemma.h>
-#include <utilxml.h>
-#ifndef __GNUC__
-#else
-#include <unixstr.h>
-#endif
-
-SWORD_NAMESPACE_START
-
-const char oName[] = "Lemmas";
-const char oTip[] = "Toggles Lemmas On and Off if they exist";
-
-const SWBuf choices[3] = {"On", "Off", ""};
-const StringList oValues(&choices[0], &choices[2]);
-
-OSISLemma::OSISLemma() : SWOptionFilter(oName, oTip, &oValues) {
-	setOptionValue("Off");
-}
-
-
-OSISLemma::~OSISLemma() {
-}
-
-
-char OSISLemma::processText(SWBuf &text, const SWKey *key, const SWModule *module) {
-	if (!option) {	// if we don't want lemmas
-		const char *from;
-		char token[2048]; // cheese.  Fix.
-		int tokpos = 0;
-		bool intoken = false;
-		bool lastspace = false;
-		SWBuf orig = text;
-		from = orig.c_str();
-
-		for (text = ""; *from; from++) {
-			if (*from == '<') {
-				intoken = true;
-				tokpos = 0;
-				token[0] = 0;
-				continue;
-			}
-			if (*from == '>') {	// process tokens
-				intoken = false;
-				XMLTag tag(token);
-				if ((!strcmp(tag.getName(), "w")) && (!tag.isEndTag())) {	// Lemma
-					SWBuf lemma = tag.getAttribute("lemma");
-					if (lemma.length()) {
-						tag.setAttribute("lemma", 0);
-					 	tag.setAttribute("savlm", lemma.c_str());
-					}
-				}
-				// keep tag, possibly with the lemma removed
-				text += tag;
-				continue;
-			}
-			if (intoken) {
-				if (tokpos < 2045)
-					token[tokpos++] = *from;
-					token[tokpos] = 0;
-			}
-			else	{
-				text += *from;
-				lastspace = (*from == ' ');
-			}
-		}
-	}
-	return 0;
-}
-
-SWORD_NAMESPACE_END
diff --git a/src/modules/filters/osismorph.cpp b/src/modules/filters/osismorph.cpp
deleted file mode 100644
index 1b2d116..0000000
--- a/src/modules/filters/osismorph.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-/******************************************************************************
- *
- * osismorph -	SWFilter descendant to hide or show morph tags
- *			in a OSIS module.
- */
-
-
-#include <stdlib.h>
-#include <osismorph.h>
-#include <utilxml.h>
-#ifndef __GNUC__
-#else
-#include <unixstr.h>
-#endif
-
-SWORD_NAMESPACE_START
-
-const char oName[] = "Morphological Tags";
-const char oTip[] = "Toggles Morphological Tags On and Off if they exist";
-
-const SWBuf choices[3] = {"On", "Off", ""};
-const StringList oValues(&choices[0], &choices[2]);
-
-OSISMorph::OSISMorph() : SWOptionFilter(oName, oTip, &oValues) {
-	setOptionValue("Off");
-}
-
-
-OSISMorph::~OSISMorph() {
-}
-
-
-char OSISMorph::processText(SWBuf &text, const SWKey *key, const SWModule *module) {
-	if (!option) {	// if we don't want morph tags
-		const char *from;
-		char token[2048]; // cheese.  Fix.
-		int tokpos = 0;
-		bool intoken = false;
-		bool lastspace = false;
-		SWBuf orig = text;
-		from = orig.c_str();
-
-		for (text = ""; *from; from++) {
-			if (*from == '<') {
-				intoken = true;
-				tokpos = 0;
-				token[0] = 0;
-				continue;
-			}
-			if (*from == '>') {	// process tokens
-				intoken = false;
-				XMLTag tag(token);
-				if ((!strcmp(tag.getName(), "w")) && (!tag.isEndTag())) {	// Morph
-					if (tag.getAttribute("morph"))
-						tag.setAttribute("morph", 0);
-				}
-				// keep tag, possibly with the morph removed
-				text += tag;
-				continue;
-			}
-			if (intoken) {
-				if (tokpos < 2045)
-					token[tokpos++] = *from;
-					token[tokpos] = 0;
-			}
-			else	{
-				text += *from;
-				lastspace = (*from == ' ');
-			}
-		}
-	}
-	return 0;
-}
-
-SWORD_NAMESPACE_END
diff --git a/src/modules/filters/osisplain.cpp b/src/modules/filters/osisplain.cpp
deleted file mode 100644
index 7a12a27..0000000
--- a/src/modules/filters/osisplain.cpp
+++ /dev/null
@@ -1,151 +0,0 @@
-/***************************************************************************
-                     osisplain.cpp  -  OSIS to Plaintext filter
-                             -------------------
-    begin                : 2003-02-15
-    copyright            : 2003 by CrossWire Bible Society
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include <stdlib.h>
-#include <osisplain.h>
-#include <utilxml.h>
-#include <ctype.h>
-
-SWORD_NAMESPACE_START
-
-OSISPlain::OSISPlain() {
-	setTokenStart("<");
-	setTokenEnd(">");
-
-	setEscapeStart("&");
-	setEscapeEnd(";");
-
-	setEscapeStringCaseSensitive(true);
-
-	addEscapeStringSubstitute("amp", "&");
-	addEscapeStringSubstitute("apos", "'");
-	addEscapeStringSubstitute("lt", "<");
-	addEscapeStringSubstitute("gt", ">");
-	addEscapeStringSubstitute("quot", "\"");
-
-
-        addTokenSubstitute("title", "\n");
-        addTokenSubstitute("/title", "\n");
-        addTokenSubstitute("/l", "\n");
-        addTokenSubstitute("lg", "\n");
-        addTokenSubstitute("/lg", "\n");
-
-        setTokenCaseSensitive(true);
-}
-
-
-bool OSISPlain::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData) {
-        // manually process if it wasn't a simple substitution
-	if (!substituteToken(buf, token)) {
-		MyUserData *u = (MyUserData *)userData;
-                XMLTag tag(token);
-		if (((*token == 'w') && (token[1] == ' ')) ||
-		((*token == '/') && (token[1] == 'w') && (!token[2]))) {
-			bool start = false;
-			if (*token == 'w') {
-				if (token[strlen(token)-1] != '/') {
-					u->w = token;
-					return true;
-				}
-				start = true;
-			}
-			tag = (start) ? token : u->w.c_str();
-			bool show = true;	// to handle unplaced article in kjv2003-- temporary till combined
-
-			SWBuf lastText = (start) ? "stuff" : u->lastTextNode.c_str();
-
-			const char *attrib;
-			const char *val;
-			if (attrib = tag.getAttribute("xlit")) {
-				val = strchr(attrib, ':');
-				val = (val) ? (val + 1) : attrib;
-				buf.appendFormatted(" <%s>", val);
-			}
-			if (attrib = tag.getAttribute("gloss")) {
-				val = strchr(attrib, ':');
-				val = (val) ? (val + 1) : attrib;
-				buf.appendFormatted(" <%s>", val);
-			}
-			if (attrib = tag.getAttribute("lemma")) {
-				int count = tag.getAttributePartCount("lemma");
-				int i = (count > 1) ? 0 : -1;		// -1 for whole value cuz it's faster, but does the same thing as 0
-				do {
-					attrib = tag.getAttribute("lemma", i);
-					if (i < 0) i = 0;	// to handle our -1 condition
-					val = strchr(attrib, ':');
-					val = (val) ? (val + 1) : attrib;
-					if ((strchr("GH", *val)) && (isdigit(val[1])))
-						val++;
-					if ((!strcmp(val, "3588")) && (lastText.length() < 1))
-						show = false;
-					else	buf.appendFormatted(" <%s>}", val);
-				} while (++i < count);
-			}
-			if ((attrib = tag.getAttribute("morph")) && (show)) {
-				int count = tag.getAttributePartCount("morph");
-				int i = (count > 1) ? 0 : -1;		// -1 for whole value cuz it's faster, but does the same thing as 0
-				do {
-					attrib = tag.getAttribute("morph", i);
-					if (i < 0) i = 0;	// to handle our -1 condition
-					val = strchr(attrib, ':');
-					val = (val) ? (val + 1) : attrib;
-					if ((*val == 'T') && (strchr("GH", val[1])) && (isdigit(val[2])))
-						val+=2;
-					buf.appendFormatted(" (%s)", val);
-				} while (++i < count);
-			}
-			if (attrib = tag.getAttribute("POS")) {
-				val = strchr(attrib, ':');
-				val = (val) ? (val + 1) : attrib;
-				buf.appendFormatted(" <%s>", val);
-			}
-		}
-
-		// <note> tag
-		else if (!strncmp(token, "note", 4)) {
-				if (!strstr(token, "strongsMarkup")) {	// leave strong's markup notes out, in the future we'll probably have different option filters to turn different note types on or off
-					buf += " (";
-				}
-				else	u->suspendTextPassThru = true;
-			}
-		else if (!strncmp(token, "/note", 5)) {
-			if (!u->suspendTextPassThru)
-				buf += ")";
-			else	u->suspendTextPassThru = false;
-		}
-
-		// <p> paragraph tag
-		else if (((*token == 'p') && ((token[1] == ' ') || (!token[1]))) ||
-			((*token == '/') && (token[1] == 'p') && (!token[2]))) {
-				userData->supressAdjacentWhitespace = true;
-				buf += "\n";
-		}
-
-                // <milestone type="line"/>
-                else if ((!strcmp(tag.getName(), "milestone")) && (tag.getAttribute("type")) && (!strcmp(tag.getAttribute("type"), "line"))) {
-			userData->supressAdjacentWhitespace = true;
-        		buf += "\n";
-                }
-
-		else {
-			return false;  // we still didn't handle token
-		}
-	}
-	return true;
-}
-
-
-SWORD_NAMESPACE_END
diff --git a/src/modules/filters/osisredletterwords.cpp b/src/modules/filters/osisredletterwords.cpp
deleted file mode 100644
index a9a4834..0000000
--- a/src/modules/filters/osisredletterwords.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-/******************************************************************************
- *
- * OSISRedLetterWords -	SWFilter descendant to toggle red coloring for words
- *			of Christ in an OSIS module.
- */
-
-
-#include <stdlib.h>
-#include <osisredletterwords.h>
-#include <swmodule.h>
-#include <utilxml.h>
-#ifndef __GNUC__
-#else
-#include <unixstr.h>
-#endif
-
-SWORD_NAMESPACE_START
-
-const char oName[] = "Words of Christ in Red";
-const char oTip[] = "Toggles Red Coloring for Words of Christ On and Off if they are marked";
-
-const SWBuf choices[3] = {"On", "Off", ""};
-const StringList oValues(&choices[0], &choices[2]);
-
-OSISRedLetterWords::OSISRedLetterWords() : SWOptionFilter(oName, oTip, &oValues) {
-	setOptionValue("On");
-}
-
-
-OSISRedLetterWords::~OSISRedLetterWords() {
-}
-
-
-char OSISRedLetterWords::processText(SWBuf &text, const SWKey *key, const SWModule *module) {
-	SWBuf token;
-	bool intoken    = false;
-	char buf[254];
-
-	SWBuf orig = text;
-	const char *from = orig.c_str();
-
-	if (!option)
-	for (text = ""; *from; from++) {
-		if (*from == '<') {
-			intoken = true;
-			token = "";
-			continue;
-		}
-		if (*from == '>') {	// process tokens
-			intoken = false;
-
-			XMLTag tag(token);
-			if (!stricmp(tag.getName(), "q")) {
-				if ((tag.getAttribute("who")) && (!stricmp(tag.getAttribute("who"), "Jesus"))) {
-					tag.setAttribute("who", 0);
-					text += tag;	// tag toString already has < and >
-					continue;
-				}
-			}
-			// if we haven't modified, still use original token instead of tag, so we don't reorder attribs and stuff.  It doesn't really matter, but this is less intrusive to the original markup.
-			text += '<';
-			text.append(token);
-			text += '>';
-			continue;
-		}
-		if (intoken) { //copy token
-			token += *from;
-		}
-		else { //copy text which is not inside a token
-			text += *from;
-		}
-	}
-	return 0;
-}
-
-SWORD_NAMESPACE_END
-
diff --git a/src/modules/filters/osisrtf.cpp b/src/modules/filters/osisrtf.cpp
deleted file mode 100644
index e94e8ae..0000000
--- a/src/modules/filters/osisrtf.cpp
+++ /dev/null
@@ -1,333 +0,0 @@
-/***************************************************************************
-                     osisrtf.cpp  -  OSIS to RTF filter
-                             -------------------
-    begin                : 2003-02-15
-    copyright            : 2003 by CrossWire Bible Society
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include <stdlib.h>
-#include <osisrtf.h>
-#include <utilxml.h>
-#include <versekey.h>
-#include <swmodule.h>
-
-SWORD_NAMESPACE_START
-
-
-OSISRTF::MyUserData::MyUserData(const SWModule *module, const SWKey *key) : BasicFilterUserData(module, key) {
-	inXRefNote = false;
-	BiblicalText = false;
-	if (module) {
-		version = module->Name();
-		BiblicalText = (!strcmp(module->Type(), "Biblical Texts"));
-	}	
-	osisQToTick = ((!module->getConfigEntry("OSISqToTick")) || (strcmp(module->getConfigEntry("OSISqToTick"), "false")));
-}
-
-
-OSISRTF::OSISRTF() {
-	setTokenStart("<");
-	setTokenEnd(">");
-  
-	setEscapeStart("&");
-	setEscapeEnd(";");
-  
-	setEscapeStringCaseSensitive(true);
-
-	addEscapeStringSubstitute("amp", "&");
-	addEscapeStringSubstitute("apos", "'");
-	addEscapeStringSubstitute("lt", "<");
-	addEscapeStringSubstitute("gt", ">");
-	addEscapeStringSubstitute("quot", "\"");
-	addTokenSubstitute("lg", "{\\par}");
-	addTokenSubstitute("/lg", "{\\par}");
-
-	setTokenCaseSensitive(true);
-}
-
-
-bool OSISRTF::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData) {
-  // manually process if it wasn't a simple substitution
-	if (!substituteToken(buf, token)) {
-		MyUserData *u = (MyUserData *)userData;
-		XMLTag tag(token);
-
-		// <w> tag
-		if (!strcmp(tag.getName(), "w")) {
-
-			// start <w> tag
-			if ((!tag.isEmpty()) && (!tag.isEndTag())) {
-				buf += "{";
-				u->w = token;
-			}
-
-			// end or empty <w> tag
-			else {
-				bool endTag = tag.isEndTag();
-				SWBuf lastText;
-				bool show = true;	// to handle unplaced article in kjv2003-- temporary till combined
-
-				if (endTag) {
-					tag = u->w.c_str();
-					lastText = u->lastTextNode.c_str();
-				}
-				else lastText = "stuff";
-
-				const char *attrib;
-				const char *val;
-				if (attrib = tag.getAttribute("xlit")) {
-					val = strchr(attrib, ':');
-					val = (val) ? (val + 1) : attrib;
-					buf.appendFormatted(" {\\fs15 <%s>}", val);
-				}
-				if (attrib = tag.getAttribute("gloss")) {
-					val = strchr(attrib, ':');
-					val = (val) ? (val + 1) : attrib;
-					buf.appendFormatted(" {\\fs15 <%s>}", val);
-				}
-				if (attrib = tag.getAttribute("lemma")) {
-					int count = tag.getAttributePartCount("lemma");
-					int i = (count > 1) ? 0 : -1;		// -1 for whole value cuz it's faster, but does the same thing as 0
-					do {
-						attrib = tag.getAttribute("lemma", i);
-						if (i < 0) i = 0;	// to handle our -1 condition
-						val = strchr(attrib, ':');
-						val = (val) ? (val + 1) : attrib;
-						if ((strchr("GH", *val)) && (isdigit(val[1])))
-							val++;
-						if ((!strcmp(val, "3588")) && (lastText.length() < 1))
-							show = false;
-						else	buf.appendFormatted(" {\\cf3 \\sub <%s>}", val);
-					} while (++i < count);
-				}
-				if ((attrib = tag.getAttribute("morph")) && (show)) {
-					SWBuf savelemma = tag.getAttribute("savlm");
-					if ((strstr(savelemma.c_str(), "3588")) && (lastText.length() < 1))
-						show = false;
-					if (show) {
-						int count = tag.getAttributePartCount("morph");
-						int i = (count > 1) ? 0 : -1;		// -1 for whole value cuz it's faster, but does the same thing as 0
-						do {
-							attrib = tag.getAttribute("morph", i);
-							if (i < 0) i = 0;	// to handle our -1 condition
-							val = strchr(attrib, ':');
-							val = (val) ? (val + 1) : attrib;
-							if ((*val == 'T') && (strchr("GH", val[1])) && (isdigit(val[2])))
-								val+=2;
-							buf.appendFormatted(" {\\cf4 \\sub (%s)}", val);
-						} while (++i < count);
-					}
-				}
-				if (attrib = tag.getAttribute("POS")) {
-					val = strchr(attrib, ':');
-					val = (val) ? (val + 1) : attrib;
-					buf.appendFormatted(" {\\fs15 <%s>}", val);
-				}
-
-				if (endTag)
-					buf += "}";
-			}
-		}
-
-		// <note> tag
-		else if (!strcmp(tag.getName(), "note")) {
-			if (!tag.isEndTag()) {
-				if (!tag.isEmpty()) {
-					SWBuf type = tag.getAttribute("type");
-
-					if (type != "strongsMarkup") {	// leave strong's markup notes out, in the future we'll probably have different option filters to turn different note types on or off
-						SWBuf footnoteNumber = tag.getAttribute("swordFootnote");
-						VerseKey *vkey;
-						// see if we have a VerseKey * or descendant
-						try {
-							vkey = SWDYNAMIC_CAST(VerseKey, u->key);
-						}
-						catch ( ... ) {	}
-						if (vkey) {
-							char ch = ((!strcmp(type.c_str(), "crossReference")) || (!strcmp(type.c_str(), "x-cross-ref"))) ? 'x':'n';
-							buf.appendFormatted("{\\super <a href=\"\">*%c%i.%s</a>} ", ch, vkey->Verse(), footnoteNumber.c_str());
-							u->inXRefNote = (ch == 'x');
-						}
-					}
-					u->suspendTextPassThru = true;
-				}
-			}
-			if (tag.isEndTag()) {
-				u->suspendTextPassThru = false;
-				u->inXRefNote = false;
-			}
-		}
-
-		// <p> paragraph tag
-		else if (!strcmp(tag.getName(), "p")) {
-			if ((!tag.isEndTag()) && (!tag.isEmpty())) {	// non-empty start tag
-				buf += "{\\par ";
-			}
-			else if (tag.isEndTag()) {	// end tag
-				buf += "\\par}";
-				userData->supressAdjacentWhitespace = true;
-			}
-			else {					// empty paragraph break marker
-				buf += "{\\par\\par}";
-				userData->supressAdjacentWhitespace = true;
-			}
-		}
-
-		// <reference> tag
-		else if (!strcmp(tag.getName(), "reference")) {
-			if (!u->inXRefNote) {	// only show these if we're not in an xref note
-				if ((!tag.isEndTag()) && (!tag.isEmpty())) {
-					buf += "{<a href=\"\">";
-				}
-				else if (tag.isEndTag()) {
-					buf += "</a>}";
-				}
-			}
-		}
-
-		// <l> poetry
-		else if (!strcmp(tag.getName(), "l")) {
-			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
-				buf += "{";
-			}
-			else if (tag.isEndTag()) {
-				buf += "\\par}";
-			}
-			else if (tag.getAttribute("sID")) {	// empty line marker
-				buf += "{\\par}";
-			}
-		}
-
-		// <milestone type="line"/>
-		else if ((!strcmp(tag.getName(), "milestone")) && (tag.getAttribute("type")) && (!strcmp(tag.getAttribute("type"), "line"))) {
-			buf += "{\\par}";
-			userData->supressAdjacentWhitespace = true;
-		}
-
-		// <title>
-		else if (!strcmp(tag.getName(), "title")) {
-			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
-				buf += "{\\par\\i1\\b1 ";
-			}
-			else if (tag.isEndTag()) {
-				buf += "\\par}";
-			}
-		}
-
-		// <hi>
-		else if (!strcmp(tag.getName(), "hi")) {
-			SWBuf type = tag.getAttribute("type");
-			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
-				if (type == "b" || type == "x-b")
-					buf += "{\\b1 ";
-				else	// all other types
-					buf += "{\\i1 ";
-			}
-			else if (tag.isEndTag()) {
-				buf += "}";
-			}
-		}
-
-		// <q> quote
-		else if (!strcmp(tag.getName(), "q")) {
-			SWBuf type = tag.getAttribute("type");
-			SWBuf who = tag.getAttribute("who");
-			const char *lev = tag.getAttribute("level");
-			int level = (lev) ? atoi(lev) : 1;
-
-			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
-				buf += "{";
-
-				//alternate " and '
-				if (u->osisQToTick)
-					buf += (level % 2) ? '\"' : '\'';
-
-				if (who == "Jesus")
-					buf += "\\cf6 ";
-			}
-			else if (tag.isEndTag()) {
-				//alternate " and '
-				if (u->osisQToTick)
-					buf += (level % 2) ? '\"' : '\'';
-				buf += "}";
-			}
-			else {	// empty quote marker
-				//alternate " and '
-				if (u->osisQToTick)
-					buf += (level % 2) ? '\"' : '\'';
-			}
-		}
-
-		// <transChange>
-		else if (!strcmp(tag.getName(), "transChange")) {
-			SWBuf type = tag.getAttribute("type");
-
-			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
-
-// just do all transChange tags this way for now
-//				if (type == "supplied")
-					buf += "{\\i1 ";
-			}
-			else if (tag.isEndTag()) {
-				buf += "}";
-			}
-		}
-
-		// image
-		else if (!strcmp(tag.getName(), "figure")) {
-			const char *src = tag.getAttribute("src");
-			if (!src)		// assert we have a src attribute
-				return false;
-
-			char* filepath = new char[strlen(u->module->getConfigEntry("AbsoluteDataPath")) + strlen(token)];
-			*filepath = 0;
-			strcpy(filepath, userData->module->getConfigEntry("AbsoluteDataPath"));
-			strcat(filepath, src);
-
-// we do this because BibleCS looks for this EXACT format for an image tag
-			buf+="<img src=\"";
-			buf+=filepath;
-			buf+="\" />";
-/*
-			char imgc;
-			for (c = filepath + strlen(filepath); c > filepath && *c != '.'; c--);
-			c++;
-			FILE* imgfile;
-				    if (stricmp(c, "jpg") || stricmp(c, "jpeg")) {
-						  imgfile = fopen(filepath, "r");
-						  if (imgfile != NULL) {
-								buf += "{\\nonshppict {\\pict\\jpegblip ";
-								while (feof(imgfile) != EOF) {
-									   buf.appendFormatted("%2x", fgetc(imgfile));
-								}
-								fclose(imgfile);
-								buf += "}}";
-						  }
-				    }
-				    else if (stricmp(c, "png")) {
-						  buf += "{\\*\\shppict {\\pict\\pngblip ";
-
-						  buf += "}}";
-				    }
-*/
-			delete [] filepath;
-		}
-		else {
-			return false;  // we still didn't handle token
-		}
-	}
-	return true;
-}
-
-
-SWORD_NAMESPACE_END
-
diff --git a/src/modules/filters/osisscripref.cpp b/src/modules/filters/osisscripref.cpp
deleted file mode 100644
index 566e08a..0000000
--- a/src/modules/filters/osisscripref.cpp
+++ /dev/null
@@ -1,104 +0,0 @@
-/******************************************************************************
- *
- * OSISScripref -	SWFilter descendant to hide or show scripture references
- *			in an OSIS module.
- */
-
-
-#include <stdlib.h>
-#include <osisscripref.h>
-#include <swmodule.h>
-#include <utilxml.h>
-#ifndef __GNUC__
-#else
-#include <unixstr.h>
-#endif
-
-SWORD_NAMESPACE_START
-
-const char oName[] = "Cross-references";
-const char oTip[] = "Toggles Scripture Cross-references On and Off if they exist";
-
-const SWBuf choices[3] = {"On", "Off", ""};
-const StringList oValues(&choices[0], &choices[2]);
-
-OSISScripref::OSISScripref() : SWOptionFilter(oName, oTip, &oValues) {
-	setOptionValue("On");
-}
-
-
-OSISScripref::~OSISScripref() {
-}
-
-
-char OSISScripref::processText(SWBuf &text, const SWKey *key, const SWModule *module) {
-	SWBuf token;
-	bool intoken    = false;
-	bool hide       = false;
-	SWBuf tagText;
-	XMLTag startTag;
-	int tagTextNum  = 1;
-	int footnoteNum = 1;
-	char buf[254];
-
-	SWBuf orig = text;
-	const char *from = orig.c_str();
-
-	for (text = ""; *from; from++) {
-		if (*from == '<') {
-			intoken = true;
-			token = "";
-			continue;
-		}
-		if (*from == '>') {	// process tokens
-			intoken = false;
-
-			XMLTag tag(token);
-			if (!strcmp(tag.getName(), "note")) {
-				if (!tag.isEndTag() && (!tag.isEmpty())) {
-					startTag = tag;
-					if ((tag.getAttribute("type")) &&	(!strcmp(tag.getAttribute("type"), "crossReference"))) {
-						hide = true;
-						tagText = "";
-						if (option) {	// we want the tag in the text
-							text += '<';
-							text.append(token);
-							text += '>';
-						}
-						continue;
-					}
-				}
-				if (hide && tag.isEndTag()) {
-					hide = false;
-					if (option) {	// we want the tag in the text
-						text.append(tagText);  // end tag gets added further down
-					}
-					else	continue;	// don't let the end tag get added to the text
-				}
-			}
-
-			// if not a heading token, keep token in text
-			if (!hide) {
-				text += '<';
-				text.append(token);
-				text += '>';
-			}
-			else {
-				tagText += '<';
-				tagText.append(token);
-				tagText += '>';
-			}
-			continue;
-		}
-		if (intoken) { //copy token
-			token += *from;
-		}
-		else if (!hide) { //copy text which is not inside a token
-			text += *from;
-		}
-		else tagText += *from;
-	}
-	return 0;
-}
-
-SWORD_NAMESPACE_END
diff --git a/src/modules/filters/osisstrongs.cpp b/src/modules/filters/osisstrongs.cpp
deleted file mode 100644
index 7949b50..0000000
--- a/src/modules/filters/osisstrongs.cpp
+++ /dev/null
@@ -1,128 +0,0 @@
-/******************************************************************************
- *
- * osisstrongs -	SWFilter descendant to hide or show strongs number
- *			in a OSIS module.
- */
-
-
-#include <stdlib.h>
-#include <osisstrongs.h>
-#include <swmodule.h>
-#ifndef __GNUC__
-#else
-#include <unixstr.h>
-#endif
-#include <ctype.h>
-
-SWORD_NAMESPACE_START
-
-const char oName[] = "Strong's Numbers";
-const char oTip[] = "Toggles Strong's Numbers On and Off if they exist";
-
-const SWBuf choices[3] = {"On", "Off", ""};
-const StringList oValues(&choices[0], &choices[2]);
-
-
-OSISStrongs::OSISStrongs() : SWOptionFilter(oName, oTip, &oValues) {
-	setOptionValue("Off");
-}
-
-
-OSISStrongs::~OSISStrongs() {
-}
-
-
-char OSISStrongs::processText(SWBuf &text, const SWKey *key, const SWModule *module) {
-	const char *from;
-	char token[2048]; // cheese.  Fix.
-	int tokpos = 0;
-	bool intoken = false;
-	int len;
-	bool lastspace = false;
-	int word = 1;
-	char val[128];
-	char wordstr[5];
-	char *valto;
-	char *ch;
-	unsigned int textStart = 0, textEnd = 0;
-	bool newText = false;
-	SWBuf tmp;
-
-	SWBuf orig = text;
-	from = orig.c_str();
-
-	len = strlen(text) + 1;	// shift string to right of buffer
-
-	for (text = ""; *from; from++) {
-		if (*from == '<') {
-			intoken = true;
-			tokpos = 0;
-			token[0] = 0;
-			token[1] = 0;
-			token[2] = 0;
-			textEnd = text.size();
-			continue;
-		}
-		if (*from == '>') {	// process tokens
-			intoken = false;
-			if ((*token == 'w') && (token[1] == ' ')) {	// Word
-				if (module->isProcessEntryAttributes()) {
-					valto = val;
-					char *num = strstr(token, "lemma=\"x-Strongs:");
-					if (num) {
-						for (num+=17; ((*num) && (*num != '\"')); num++)
-							*valto++ = *num;
-						*valto = 0;
-						if (atoi((!isdigit(*val))?val+1:val) < 5627) {
-							// normal strongs number
-							sprintf(wordstr, "%03d", word++);
-							module->getEntryAttributes()["Word"][wordstr]["Strongs"] = val;
-							tmp = "";
-							tmp.append(text.c_str()+textStart, (int)(textEnd - textStart));
-							module->getEntryAttributes()["Word"][wordstr]["Text"] = tmp;
-							newText = true;
-						}
-						else {
-							// verb morph
-							sprintf(wordstr, "%03d", word-1);
-							module->getEntryAttributes()["Word"][wordstr]["Morph"] = val;
-						}
-					}
-				}
-				if (!option) {
-					char *num = strstr(token, "lemma=\"x-Strongs:");
-					if (num) {
-						memcpy(num, "savlm", 5);
-/*						
-						for (int i = 0; i < 17; i++)
-							*num++ = ' ';
-						for (; ((*num) && (*num!='\"')); num++)
-							*num = ' ';
-						if (*num)
-							*num = ' ';
-*/
-					}
-				}
-			}
-			// if not a strongs token, keep token in text
-			text += '<';
-			for (char *tok = token; *tok; tok++)
-				text += *tok;
-			text += '>';
-			if (newText) {textStart = text.size(); newText = false; }
-			continue;
-		}
-		if (intoken) {
-			if (tokpos < 2045)
-				token[tokpos++] = *from;
-				token[tokpos+2] = 0;
-		}
-		else	{
-			text += *from;
-			lastspace = (*from == ' ');
-		}
-	}
-	return 0;
-}
-
-SWORD_NAMESPACE_END
diff --git a/src/modules/filters/osiswebif.cpp b/src/modules/filters/osiswebif.cpp
deleted file mode 100644
index f2db7b7..0000000
--- a/src/modules/filters/osiswebif.cpp
+++ /dev/null
@@ -1,212 +0,0 @@
-/***************************************************************************
-                          OSISWEBIF.cpp  -   OSIS to HTML filter with hrefs 
-			        for strongs and morph tags
-                             -------------------
-    begin                    : 2003-10-23
-    copyright            : 2003 by CrossWire Bible Society
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include <stdlib.h>
-#include <osiswebif.h>
-#include <utilxml.h>
-#include <versekey.h>
-#include <swmodule.h>
-#include <ctype.h>
-
-
-SWORD_NAMESPACE_START
-
-
-OSISWEBIF::OSISWEBIF() : baseURL(""), passageStudyURL(baseURL + "passagestudy.jsp") {
-}
-
-bool OSISWEBIF::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData) {
-  // manually process if it wasn't a simple substitution
-	if (!substituteToken(buf, token)) {
-		MyUserData *u = (MyUserData *)userData;
-		XMLTag tag(token);
-
-		// <w> tag
-		if (!strcmp(tag.getName(), "w")) {
-
-			// start <w> tag
-			if ((!tag.isEmpty()) && (!tag.isEndTag())) {
-				u->w = token;
-			}
-
-			// end or empty <w> tag
-			else {
-				bool endTag = tag.isEndTag();
-				SWBuf lastText;
-				bool show = true;	// to handle unplaced article in kjv2003-- temporary till combined
-
-				if (endTag) {
-					tag = u->w.c_str();
-					lastText = u->lastTextNode.c_str();
-				}
-				else lastText = "stuff";
-
-				const char *attrib;
-				const char *val;
-				if (attrib = tag.getAttribute("xlit")) {
-					val = strchr(attrib, ':');
-					val = (val) ? (val + 1) : attrib;
-					buf.appendFormatted(" %s", val);
-				}
-				if (attrib = tag.getAttribute("gloss")) {
-					val = strchr(attrib, ':');
-					val = (val) ? (val + 1) : attrib;
-					buf.appendFormatted(" %s", val);
-				}
-				if (attrib = tag.getAttribute("lemma")) {
-					int count = tag.getAttributePartCount("lemma");
-					int i = (count > 1) ? 0 : -1;		// -1 for whole value cuz it's faster, but does the same thing as 0
-					do {
-						attrib = tag.getAttribute("lemma", i);
-						if (i < 0) i = 0;	// to handle our -1 condition
-						val = strchr(attrib, ':');
-						val = (val) ? (val + 1) : attrib;
-						const char *val2 = val;
-						if ((strchr("GH", *val)) && (isdigit(val[1])))
-							val2++;
-						if ((!strcmp(val2, "3588")) && (lastText.length() < 1))
-							show = false;
-						else	buf.appendFormatted(" <small><em>&lt;<a href=\"%s?showStrong=%s#cv\">%s</a>&gt;</em></small> ", passageStudyURL.c_str(), encodeURL(val2).c_str(), val2);
-					} while (++i < count);
-				}
-				if ((attrib = tag.getAttribute("morph")) && (show)) {
-					SWBuf savelemma = tag.getAttribute("savlm");
-					if ((strstr(savelemma.c_str(), "3588")) && (lastText.length() < 1))
-						show = false;
-					if (show) {
-						int count = tag.getAttributePartCount("morph");
-						int i = (count > 1) ? 0 : -1;		// -1 for whole value cuz it's faster, but does the same thing as 0
-						do {
-							attrib = tag.getAttribute("morph", i);
-							if (i < 0) i = 0;	// to handle our -1 condition
-							val = strchr(attrib, ':');
-							val = (val) ? (val + 1) : attrib;
-							const char *val2 = val;
-							if ((*val == 'T') && (strchr("GH", val[1])) && (isdigit(val[2])))
-								val2+=2;
-							buf.appendFormatted(" <small><em>(<a href=\"%s?showMorph=%s#cv\">%s</a>)</em></small> ", passageStudyURL.c_str(), encodeURL(val2).c_str(), val2);
-						} while (++i < count);
-					}
-				}
-				if (attrib = tag.getAttribute("POS")) {
-					val = strchr(attrib, ':');
-					val = (val) ? (val + 1) : attrib;
-					buf.appendFormatted(" %s", val);
-				}
-
-				/*if (endTag)
-					buf += "}";*/
-			}
-		}
-
-		// <note> tag
-		else if (!strcmp(tag.getName(), "note")) {
-			if (!tag.isEndTag()) {
-				if (!tag.isEmpty()) {
-					SWBuf type = tag.getAttribute("type");
-
-					if (type != "strongsMarkup") {	// leave strong's markup notes out, in the future we'll probably have different option filters to turn different note types on or off
-						SWBuf footnoteNumber = tag.getAttribute("swordFootnote");
-						VerseKey *vkey;
-						// see if we have a VerseKey * or descendant
-						try {
-							vkey = SWDYNAMIC_CAST(VerseKey, u->key);
-						}
-						catch ( ... ) {	}
-						if (vkey) {
-							char ch = ((tag.getAttribute("type") && ((!strcmp(tag.getAttribute("type"), "crossReference")) || (!strcmp(tag.getAttribute("type"), "x-cross-ref")))) ? 'x':'n');
-//							buf.appendFormatted("<a href=\"noteID=%s.%c.%s\"><small><sup>*%c</sup></small></a> ", vkey->getText(), ch, footnoteNumber.c_str(), ch);
-						}
-					}
-					u->suspendTextPassThru = true;
-				}
-			}
-			if (tag.isEndTag()) {
-				u->suspendTextPassThru = false;
-			}
-		}
-		// <title>
-		else if (!strcmp(tag.getName(), "title")) {
-			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
-				buf += "<h3>";
-			}
-			else if (tag.isEndTag()) {
-				buf += "</h3>";
-			}
-		}
-
-		// <q> quote
-		else if (!strcmp(tag.getName(), "q")) {
-			SWBuf type = tag.getAttribute("type");
-			SWBuf who = tag.getAttribute("who");
-			const char *lev = tag.getAttribute("level");
-			int level = (lev) ? atoi(lev) : 1;
-			
-			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
-				/*buf += "{";*/
-
-				//alternate " and '
-				if (u->osisQToTick)
-					buf += (level % 2) ? '\"' : '\'';
-				
-				if (who == "Jesus") {
-					buf += "<span class=\"wordsOfJesus\"> ";
-				}
-			}
-			else if (tag.isEndTag()) {
-				//alternate " and '
-				if (u->osisQToTick)
-					buf += (level % 2) ? '\"' : '\'';
-				buf += "</span>";
-			}
-			else {	// empty quote marker
-				//alternate " and '
-				if (u->osisQToTick)
-					buf += (level % 2) ? '\"' : '\'';
-			}
-		}
-
-		// <transChange>
-		else if (!strcmp(tag.getName(), "transChange")) {
-			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
-				SWBuf type = tag.getAttribute("type");
-				u->lastTransChange = type;
-
-// just do all transChange tags this way for now
-				if ((type == "added") || (type == "supplied"))
-					buf += "<i>";
-				else if (type == "tenseChange")
-					buf += "*";
-			}
-			else if (tag.isEndTag()) {
-				SWBuf type = u->lastTransChange;
-				if ((type == "added") || (type == "supplied"))
-					buf += "</i>";
-			}
-			else {	// empty transChange marker?
-			}
-		}
-		else {
-			return OSISHTMLHREF::handleToken(buf, token, userData);
-		}
-	}
-	return true;
-}
-
-
-SWORD_NAMESPACE_END
-
diff --git a/src/modules/filters/plainfootnotes.cpp b/src/modules/filters/plainfootnotes.cpp
deleted file mode 100644
index 0ae50ef..0000000
--- a/src/modules/filters/plainfootnotes.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
-/***************************************************************************
-                          plainfootnotes.cpp  -  description
-                             -------------------
-    begin                : Wed Oct 13 1999
-    copyright            : (C) 1999 by The team of BibleTime
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include <plainfootnotes.h>
-#include <swkey.h>
-
-#include <stdlib.h>
-#ifndef __GNUC__
-#else
-#include <unixstr.h>
-#endif
-
-SWORD_NAMESPACE_START
-
-const char oName[] = "Footnotes";
-const char oTip[] = "Toggles Footnotes On and Off In Bible Texts If They Exist";
-
-const SWBuf choices[3] = {"On", "Off", ""};
-const StringList oValues(&choices[0], &choices[2]);
-
-PLAINFootnotes::PLAINFootnotes() : SWOptionFilter(oName, oTip, &oValues) {
-	setOptionValue("Off");
-}
-
-PLAINFootnotes::~PLAINFootnotes(){
-}
-
-
-char PLAINFootnotes::processText(SWBuf &text, const SWKey *key, const SWModule *module) {
-	if (!option) {	// if we don't want footnotes
-		//char token[2048];
-		//SWBuf token;
-		//int tokpos = 0;
-		//bool intoken 	= false;
-		//bool lastspace = false;
-
-		bool hide = false;
-
-		SWBuf orig = text;
-		const char *from = orig.c_str();
-		for (text = ""; *from; from++) {
-		 	if (*from == '{') // Footnote start
-			{
-				hide = true;
-				continue;
-			}
-			else if (*from == '}') // Footnote end
-			{
-				hide = false;
-				continue;
-			}
-			
-			//if (intoken) {
-				//if (tokpos < 2045)
-			//		token += *from;
-				//	token[tokpos+2] = 0;
-			//}
-			//else	{
-				if (!hide) {
-					text = *from;
-					//lastspace = (*from == ' ');
-				}
-			//}
-		}
-	}
-	return 0;
-}
-
-SWORD_NAMESPACE_END
diff --git a/src/modules/filters/plainhtml.cpp b/src/modules/filters/plainhtml.cpp
deleted file mode 100644
index 19f4bc2..0000000
--- a/src/modules/filters/plainhtml.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-/***************************************************************************
-                          rwphtml.cpp  -  description
-                             -------------------
-    begin                : Thu Jun 24 1999
-    copyright            : (C) 1999 by Torsten Uhlmann
-    email                : TUhlmann@gmx.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include <plainhtml.h>
-
-SWORD_NAMESPACE_START
-
-PLAINHTML::PLAINHTML()
-{
-}
-
-
-char PLAINHTML::processText(SWBuf &text, const SWKey *key, const SWModule *module)
-{
-	int count = 0;
-
-	SWBuf orig = text;
-	const char *from = orig.c_str();
-	for (text = ""; *from; from++) 
-	{
-		if ((*from == '\n') && (from[1] == '\n')) // two newlinea are a paragraph
-		{
-			text += "<P>";
-			from++;
-			continue;
-		} else {
-			if ((*from == '\n')) // && (from[1] != '\n')) // only one new line
-			{
-				text += "<BR>";
-				continue;
-			}
-		}
-		
-		if (*from == '{') { //footnote start
-			text += "<FONT COLOR=\"#80000\"><SMALL> (";
-			continue;
-		}
-		else if (*from == '}') //footnote end
-		{
-			text += ") </SMALL></FONT>";
-			continue;
-		}
-		else if ((*from == ' ') && (count > 5000))
-		{
-			text += "<WBR>";
-			count = 0;
-			continue;
-		}
-
-		text += *from;
-		count++;
-	}
-	return 0;
-}
-
-SWORD_NAMESPACE_END
diff --git a/src/modules/filters/rtfhtml.cpp b/src/modules/filters/rtfhtml.cpp
deleted file mode 100644
index 6b228fb..0000000
--- a/src/modules/filters/rtfhtml.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-/***************************************************************************
-                          rtfhtml.cpp  -  description
-                             -------------------
-    begin                : Wed Oct 13 1999
-    copyright            : (C) 1999 by The team of BibleTime
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include <stdlib.h>
-#include <rtfhtml.h>
-
-SWORD_NAMESPACE_START
-
-RTFHTML::RTFHTML() {
-
-}
-
-
-char RTFHTML::processText(SWBuf &text, const SWKey *key, const SWModule *module)
-{
-	bool center = false;
-
-	const char *from;
-	SWBuf orig = text;
-	from = orig.c_str();
-	for (text = ""; *from; from++)
-	{
-		if (*from == '\\') // a RTF command
-		{
-			if ( !strncmp(from+1, "pard", 4) )
-				//(from[1] == 'p') && (from[2] == 'a') && (from[3] == 'r') && (from[4] == 'd'))
-			{ // switch all modifiers off
-				if (center)
-				{
-					text += "</CENTER>";
-					center = false;
-				}
-				from += 4;
-				continue;
-			}
-			if ( !strncmp(from+1, "par", 3) )
-				//(from[1] == 'p') && (from[2] == 'a') && (from[3] == 'r'))
-			{
-				text += "<P>\n";
-				from += 3;
-				continue;
-			}
-			if (from[1] == ' ')
-			{
-				from += 1;
-				continue;
-			}
-			if ( !strncmp(from+1, "qc", 2) )
-			//(from[1] == 'q') && (from[2] == 'c')) // center on
-			{
-				if (!center)
-				{
-					text += "<CENTER>";
-					center = true;
-				}
-				from += 2;
-				continue;
-			}
-		}
-
-		text += *from;
-	}
-	return 0;
-}
-
-SWORD_NAMESPACE_END
diff --git a/src/modules/filters/scsuutf8.cpp b/src/modules/filters/scsuutf8.cpp
deleted file mode 100644
index aff265d..0000000
--- a/src/modules/filters/scsuutf8.cpp
+++ /dev/null
@@ -1,226 +0,0 @@
-/******************************************************************************
- *
- * SCSUUTF8 -	SWFilter descendant to convert a SCSU character to UTF-8
- *
- */
-
-
-/* This class is based on:
- * http://czyborra.com/scsu/scsu.c written by Roman Czyborra@dds.nl
- * on Andrea's balcony in North Amsterdam on 1998-08-04
- * Thanks to Richard Verhoeven <rcb5@win.tue.nl> for his suggestion
- * to correct the haphazard "if" after UQU to "else if" on 1998-10-01
- * 
- * This is a deflator to UTF-8 output for input compressed in SCSU,
- * the (Reuters) Standard Compression Scheme for Unicode as described
- * in http://www.unicode.org/unicode/reports/tr6.html
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <swmodule.h>
-
-#include <scsuutf8.h>
-
-SWORD_NAMESPACE_START
-
-SCSUUTF8::SCSUUTF8() {
-}
-
-
-unsigned char* SCSUUTF8::UTF8Output(unsigned long uchar, unsigned char* text)
-{
-  /* join UTF-16 surrogates without any pairing sanity checks */
-
-  static int d;
-  
-  if (uchar >= 0xd800 && uchar <= 0xdbff) { d = uchar & 0x3f; return text;  }
-  if (uchar >= 0xdc00 && uchar <= 0xdfff) { uchar = uchar + 0x2400 + d * 0x400; }
-  
-  /* output one character as UTF-8 multibyte sequence */
-  
-  if (uchar < 0x80) {
-    *text++ = c;
-  }
-  else if (uchar < 0x800) { 
-    *text++ = 0xc0 | uchar >> 6; 
-    *text++ = 0x80 | uchar & 0x3f;
-  }
-  else if (uchar < 0x10000) {
-    *text++ = 0xe0 | uchar >> 12; 
-    *text++ = 0x80 | uchar >> 6 & 0x3f;
-    *text++ = 0x80 | uchar & 0x3f;
-  }
-  else if (uchar < 0x200000) {
-    *text++ = 0xf0 | uchar >> 18;
-    *text++ = 0x80 | uchar >> 12 & 0x3f; 
-    *text++ = 0x80 | uchar >> 6 & 0x3f; 
-    *text++ = 0x80 | uchar & 0x3f;
-  }  
-  
-  return text;
-}
-
-char SCSUUTF8::processText(SWBuf &text, const SWKey *key, const SWModule *module) {
-/*
-  unsigned char *to, *from;
-  unsigned long buflen = len * FILTERPAD;
-  char active = 0, mode = 0;
-	 if ((unsigned long)key < 2)	// hack, we're en(1)/de(0)ciphering
-		return -1;
-
-  static unsigned short start[8] = {0x0000,0x0080,0x0100,0x0300,0x2000,0x2080,0x2100,0x3000};
-  static unsigned short slide[8] = {0x0080,0x00C0,0x0400,0x0600,0x0900,0x3040,0x30A0,0xFF00};
-  static unsigned short win[256]   = {
-    0x0000, 0x0080, 0x0100, 0x0180, 0x0200, 0x0280, 0x0300, 0x0380,
-    0x0400, 0x0480, 0x0500, 0x0580, 0x0600, 0x0680, 0x0700, 0x0780,
-    0x0800, 0x0880, 0x0900, 0x0980, 0x0A00, 0x0A80, 0x0B00, 0x0B80,
-    0x0C00, 0x0C80, 0x0D00, 0x0D80, 0x0E00, 0x0E80, 0x0F00, 0x0F80,
-    0x1000, 0x1080, 0x1100, 0x1180, 0x1200, 0x1280, 0x1300, 0x1380,
-    0x1400, 0x1480, 0x1500, 0x1580, 0x1600, 0x1680, 0x1700, 0x1780,
-    0x1800, 0x1880, 0x1900, 0x1980, 0x1A00, 0x1A80, 0x1B00, 0x1B80,
-    0x1C00, 0x1C80, 0x1D00, 0x1D80, 0x1E00, 0x1E80, 0x1F00, 0x1F80,
-    0x2000, 0x2080, 0x2100, 0x2180, 0x2200, 0x2280, 0x2300, 0x2380,
-    0x2400, 0x2480, 0x2500, 0x2580, 0x2600, 0x2680, 0x2700, 0x2780,
-    0x2800, 0x2880, 0x2900, 0x2980, 0x2A00, 0x2A80, 0x2B00, 0x2B80,
-    0x2C00, 0x2C80, 0x2D00, 0x2D80, 0x2E00, 0x2E80, 0x2F00, 0x2F80,
-    0x3000, 0x3080, 0x3100, 0x3180, 0x3200, 0x3280, 0x3300, 0x3800,
-    0xE000, 0xE080, 0xE100, 0xE180, 0xE200, 0xE280, 0xE300, 0xE380,
-    0xE400, 0xE480, 0xE500, 0xE580, 0xE600, 0xE680, 0xE700, 0xE780,
-    0xE800, 0xE880, 0xE900, 0xE980, 0xEA00, 0xEA80, 0xEB00, 0xEB80,
-    0xEC00, 0xEC80, 0xED00, 0xED80, 0xEE00, 0xEE80, 0xEF00, 0xEF80,
-    0xF000, 0xF080, 0xF100, 0xF180, 0xF200, 0xF280, 0xF300, 0xF380,
-    0xF400, 0xF480, 0xF500, 0xF580, 0xF600, 0xF680, 0xF700, 0xF780,
-    0xF800, 0xF880, 0xF900, 0xF980, 0xFA00, 0xFA80, 0xFB00, 0xFB80,
-    0xFC00, 0xFC80, 0xFD00, 0xFD80, 0xFE00, 0xFE80, 0xFF00, 0xFF80,
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x0000, 0x00C0, 0x0250, 0x0370, 0x0530, 0x3040, 0x30A0, 0xFF60
-  };
-
-  if (!len)
-	   return 0;
-
-  memmove(&text[buflen - len], text, len);
-  from = (unsigned char*)&text[buflen - len];
-  to = (unsigned char *)text;
-
-  // -------------------------------
-
-  for (int i = 0; i < len;) {
-
-
-	 if (i >= len) break;
-	 c = from[i++];
-
-	 if (c >= 0x80)
-	{
-	  to = UTF8Output (c - 0x80 + slide[active], to);
-	}
-	 else if (c >= 0x20 && c <= 0x7F)
-	{
-	  to = UTF8Output (c, to);
-	}
-	 else if (c == 0x0 || c == 0x9 || c == 0xA || c == 0xC || c == 0xD)
-	{
-	  to = UTF8Output (c, to);
-	}
-	 else if (c >= 0x1 && c <= 0x8) // SQn
-	{
-		if (i >= len) break;
-	  d = from[i++]; // single quote
-
-	  to = UTF8Output (d < 0x80 ? d + start [c - 0x1] :
-		  d - 0x80 + slide [c - 0x1], to);
-	}
-	 else if (c >= 0x10 && c <= 0x17) // SCn
-	{
-	  active = c - 0x10; // change window
-	}
-	 else if (c >= 0x18 && c <= 0x1F) // SDn
-	{
-	  active = c - 0x18;  // define window
-		if (i >= len) break;
-	  slide [active] = win [from[i++]];
-	}
-	 else if (c == 0xB) // SDX
-	{
-		if (i >= len) break;
-		c = from[i++];
-
-		if (i >= len) break;
-		d = from[i++];
-
-	  slide [active = c>>5] = 0x10000 + (((c & 0x1F) << 8 | d) << 7);
-	}
-	 else if (c == 0xE) // SQU
-	{
-		if (i >= len) break;
-	  c = from[i++]; // SQU
-
-		if (i >= len) break;
-		to = UTF8Output (c << 8 | from[i++], to);
-		}
-	 else if (c == 0xF) // SCU
-	{
-	  mode = 1; // change to Unicode mode
-
-	  while (mode)
-	    {
-		    if (i >= len) break;
-		 c = from[i++];
-
-		 if (c <= 0xDF || c >= 0xF3)
-		{
-			   if (i >= len) break;
-		  to = UTF8Output (c << 8 | from[i++], to);
-		}
-		 else if (c == 0xF0) // UQU
-		{
-			   if (i >= len) break;
-		  c = from[i++];
-
-			   if (i >= len) break;
-			   to = UTF8Output (c << 8 | from[i++], to);
-		}
-		 else if (c >= 0xE0 && c <= 0xE7) // UCn
-		{
-		  active = c - 0xE0; mode = 0;
-		}
-		 else if (c >= 0xE8 && c <= 0xEF) // UDn
-		{
-			   if (i >= len) break;
-		  slide [active=c-0xE8] = win [from[i++]]; mode = 0;
-		}
-		 else if (c == 0xF1) // UDX
-		{
-			   if (i >= len) break;
-		  c = from[i++];
-
-			   if (i >= len) break;
-			   d = from[i++];
-
-		  slide [active = c>>5] =
-		    0x10000 + (((c & 0x1F) << 8 | d) << 7); mode = 0;
-		}
-	    }
-	}
-
-
-  }
-
-  *to++ = 0;
-  *to = 0;
-*/
-  return 0;
-}
-
-SWORD_NAMESPACE_END
diff --git a/src/modules/filters/swbasicfilter.cpp b/src/modules/filters/swbasicfilter.cpp
deleted file mode 100644
index 55c8843..0000000
--- a/src/modules/filters/swbasicfilter.cpp
+++ /dev/null
@@ -1,321 +0,0 @@
-/******************************************************************************
- *  swbasicfilter.h	- definition of class SWBasicFilter.  An SWFilter
- *  				impl that provides some basic methods that
- *  				many filters will need and can use as a starting
- *  				point. 
- *
- * $Id: swbasicfilter.cpp,v 1.33 2003/10/24 02:43:46 scribe Exp $
- *
- * Copyright 2001 CrossWire Bible Society (http://www.crosswire.org)
- *	CrossWire Bible Society
- *	P. O. Box 2528
- *	Tempe, AZ  85280-2528
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation version 2.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- */
-
-#include <stdlib.h>
-#include <swbasicfilter.h>
-#include <stdio.h>
-#include <stdarg.h>
-
-SWORD_NAMESPACE_START
-
-const char SWBasicFilter::INITIALIZE = 1;
-const char SWBasicFilter::PRECHAR    = 2;
-const char SWBasicFilter::POSTCHAR   = 4;
-const char SWBasicFilter::FINALIZE   = 8;
-
-SWBasicFilter::SWBasicFilter() {
-	processStages = 0;
-	tokenStart    = 0;
-	tokenEnd      = 0;
-	escStart      = 0;
-	escEnd        = 0;
-
-	setTokenStart("<");
-	setTokenEnd(">");
-	setEscapeStart("&");
-	setEscapeEnd(";");
-
-	escStringCaseSensitive = false;
-	tokenCaseSensitive     = false;
-	passThruUnknownToken   = false;
-	passThruUnknownEsc     = false;
-}
-
-
-void SWBasicFilter::setPassThruUnknownToken(bool val) {
-	passThruUnknownToken = val;
-}
-
-
-void SWBasicFilter::setPassThruUnknownEscapeString(bool val) {
-	passThruUnknownEsc = val;
-}
-
-
-void SWBasicFilter::setTokenCaseSensitive(bool val) {
-	tokenCaseSensitive = val;
-}
-
-
-void SWBasicFilter::setEscapeStringCaseSensitive(bool val) {
-	escStringCaseSensitive = val;
-}
-
-
-SWBasicFilter::~SWBasicFilter() {
-	if (tokenStart)
-		delete [] tokenStart;
-
-	if (tokenEnd)
-		delete [] tokenEnd;
-
-	if (escStart)
-		delete [] escStart;
-
-	if (escEnd)
-		delete [] escEnd;
-}
-
-
-void SWBasicFilter::addTokenSubstitute(const char *findString, const char *replaceString) {
-	char *buf = 0;
-
-	if (!tokenCaseSensitive) {
-		stdstr(&buf, findString);
-		toupperstr(buf);
-		tokenSubMap[buf] = replaceString;
-		delete [] buf;
-	}
-	else tokenSubMap[findString] = replaceString;
-}
-
-
-void SWBasicFilter::replaceTokenSubstitute(const char *findString, const char *replaceString) {
-	if (tokenSubMap.find(findString) != tokenSubMap.end()) {
-		tokenSubMap.erase( tokenSubMap.find(findString) ); //erase entry
-	}
-	addTokenSubstitute(findString, replaceString);
-}
-
-
-void SWBasicFilter::addEscapeStringSubstitute(const char *findString, const char *replaceString) {
-	char *buf = 0;
-
-	if (!escStringCaseSensitive) {
-		stdstr(&buf, findString);
-		toupperstr(buf);
-		escSubMap.insert(DualStringMap::value_type(buf, replaceString));
-		delete [] buf;
-	}
-	else escSubMap.insert(DualStringMap::value_type(findString, replaceString));
-}
-
-void SWBasicFilter::replaceEscapeStringSubstitute(const char *findString, const char *replaceString) {
-        if (escSubMap.find(findString) != escSubMap.end()) {
-                escSubMap.erase( escSubMap.find(findString) ); //erase entry
-        }
-        addEscapeStringSubstitute(findString, replaceString);
-}
-
-
-bool SWBasicFilter::substituteToken(SWBuf &buf, const char *token) {
-	DualStringMap::iterator it;
-
-	if (!tokenCaseSensitive) {
-	        char *tmp = 0;
-		stdstr(&tmp, token);
-		toupperstr(tmp);
-		it = tokenSubMap.find(tmp);
-		delete [] tmp;
-	} else
-	it = tokenSubMap.find(token);
-
-	if (it != tokenSubMap.end()) {
-		buf += it->second.c_str();
-		return true;
-	}
-	return false;
-}
-
-
-bool SWBasicFilter::substituteEscapeString(SWBuf &buf, const char *escString) {
-	DualStringMap::iterator it;
-
-	if (!escStringCaseSensitive) {
-	        char *tmp = 0;
-		stdstr(&tmp, escString);
-		toupperstr(tmp);
-		it = escSubMap.find(tmp);
-		delete [] tmp;
-	} else 
-	it = escSubMap.find(escString);
-
-	if (it != escSubMap.end()) {
-		buf += it->second.c_str();
-		return true;
-	}
-	return false;
-}
-
-
-bool SWBasicFilter::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData) {
-	return substituteToken(buf, token);
-}
-
-
-bool SWBasicFilter::handleEscapeString(SWBuf &buf, const char *escString, BasicFilterUserData *userData) {
-	return substituteEscapeString(buf, escString);
-}
-
-
-void SWBasicFilter::setEscapeStart(const char *escStart) {
-	stdstr(&(this->escStart), escStart);
-	escStartLen = strlen(escStart);
-}
-
-
-void SWBasicFilter::setEscapeEnd(const char *escEnd) {
-	stdstr(&(this->escEnd), escEnd);
-	escEndLen   = strlen(escEnd);
-}
-
-
-void SWBasicFilter::setTokenStart(const char *tokenStart) {
-	stdstr(&(this->tokenStart), tokenStart);
-	tokenStartLen = strlen(tokenStart);
-}
-
-
-void SWBasicFilter::setTokenEnd(const char *tokenEnd) {
-	stdstr(&(this->tokenEnd), tokenEnd);
-	tokenEndLen   = strlen(tokenEnd);
-}
-
-
-char SWBasicFilter::processText(SWBuf &text, const SWKey *key, const SWModule *module) {
-        char *from;
-        char token[4096];
-	int tokpos = 0;
-	bool intoken = false;
-	bool inEsc = false;
-	char escStartPos = 0, escEndPos = 0;
-	char tokenStartPos = 0, tokenEndPos = 0;
-	SWBuf lastTextNode;
-	BasicFilterUserData *userData = createUserData(module, key);
-
-	SWBuf orig = text;
-	from = orig.getRawData();
-	text = "";
-
-	if (processStages & INITIALIZE) {
-		if (processStage(INITIALIZE, text, from, userData)) {	// processStage handled it all
-			delete userData;
-			return 0;
-		}
-	}
-
-	for (;*from; from++) {
-
-		if (processStages & PRECHAR) {
-			if (processStage(PRECHAR, text, from, userData))	// processStage handled this char
-				continue;
-		}
-
-		if (*from == tokenStart[tokenStartPos]) {
-			if (tokenStartPos == (tokenStartLen - 1)) {
-				intoken = true;
-				tokpos = 0;
-				token[0] = 0;
-				token[1] = 0;
-				token[2] = 0;
-				inEsc = false;
-			}
-			else tokenStartPos++;
-			continue;
-		}
-
-		if (*from == escStart[escStartPos]) {
-			if (escStartPos == (escStartLen - 1)) {
-				intoken = true;
-				tokpos = 0;
-				token[0] = 0;
-				token[1] = 0;
-				token[2] = 0;
-				inEsc = true;
-			}
-			else escStartPos++;
-			continue;
-		}
-
-		if (inEsc) {
-			if (*from == escEnd[escEndPos]) {
-				if (escEndPos == (escEndLen - 1)) {
-					intoken = false;
-					userData->lastTextNode = lastTextNode;
-					if ((!handleEscapeString(text, token, userData)) && (passThruUnknownEsc)) {
-						text += escStart;
-						text += token;
-						text += escEnd;
-					}
-					escEndPos = escStartPos = tokenEndPos = tokenStartPos = 0;
-					lastTextNode = "";
-					continue;
-				}
-			}
-		}
-
-		if (!inEsc) {
-			if (*from == tokenEnd[tokenEndPos]) {
-				if (tokenEndPos == (tokenEndLen - 1)) {
-					intoken = false;
-					userData->lastTextNode = lastTextNode;
-					if ((!handleToken(text, token, userData)) && (passThruUnknownToken)) {
-						text += tokenStart;
-						text += token;
-						text += tokenEnd;
-					}
-					escEndPos = escStartPos = tokenEndPos = tokenStartPos = 0;
-					lastTextNode = "";
-					continue;
-				}
-			}
-		}
-
-		if (intoken) {
-			if (tokpos < 4090)
-				token[tokpos++] = *from;
-				token[tokpos+2] = 0;
-		}
-		else {
-			if ((!userData->supressAdjacentWhitespace) || (*from != ' ')) {
-				if (!userData->suspendTextPassThru)
-					text += *from;
-				lastTextNode += *from;
-			}
-			userData->supressAdjacentWhitespace = false;
-		}
-
-		if (processStages & POSTCHAR)
-			processStage(POSTCHAR, text, from, userData);
-
-	}
-
-	if (processStages & FINALIZE)
-		processStage(FINALIZE, text, from, userData);
-
-	delete userData;
-	return 0;
-}
-
-SWORD_NAMESPACE_END
diff --git a/src/modules/filters/swoptfilter.cpp b/src/modules/filters/swoptfilter.cpp
deleted file mode 100644
index 4eb3c82..0000000
--- a/src/modules/filters/swoptfilter.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-/******************************************************************************
- *
- * swoptfilter -	SWFilter descendant and base class for all option filters
- */
-
-
-#include <swoptfilter.h>
-
-SWORD_NAMESPACE_START
-
-
-SWOptionFilter::SWOptionFilter(const char *oName, const char *oTip, const StringList *oValues) {
-	optName   = oName;
-	optTip    = oTip;
-	optValues = oValues;
-}
-
-
-SWOptionFilter::~SWOptionFilter() {
-}
-
-
-void SWOptionFilter::setOptionValue(const char *ival) {
-	for (StringList::const_iterator loop = optValues->begin(); loop != optValues->end(); loop++) {
-		if (!stricmp(loop->c_str(), ival)) {
-			optionValue = *loop;
-			option = (!stricmp(ival, "On"));	// convenience for boolean filters
-			break;
-		}
-	}
-}
-
-const char *SWOptionFilter::getOptionValue() {
-	return optionValue;
-}
-
-
-SWORD_NAMESPACE_END
diff --git a/src/modules/filters/thmlfootnotes.cpp b/src/modules/filters/thmlfootnotes.cpp
deleted file mode 100644
index 8b52d98..0000000
--- a/src/modules/filters/thmlfootnotes.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-/******************************************************************************
- *
- * thmlfootnotes -	SWFilter descendant to hide or show footnotes
- *			in a ThML module.
- */
-
-
-#include <stdlib.h>
-#include <thmlfootnotes.h>
-#include <swmodule.h>
-#include <swbuf.h>
-#include <versekey.h>
-#include <utilxml.h>
-#ifndef __GNUC__
-#else
-#include <unixstr.h>
-#endif
-
-SWORD_NAMESPACE_START
-
-const char oName[] = "Footnotes";
-const char oTip[] = "Toggles Footnotes On and Off if they exist";
-
-const SWBuf choices[3] = {"On", "Off", ""};
-const StringList oValues(&choices[0], &choices[2]);
-
-ThMLFootnotes::ThMLFootnotes() : SWOptionFilter(oName, oTip, &oValues) {
-	setOptionValue("Off");
-}
-
-
-ThMLFootnotes::~ThMLFootnotes() {
-}
-
-
-char ThMLFootnotes::processText(SWBuf &text, const SWKey *key, const SWModule *module) {
-	SWBuf token;
-	bool intoken    = false;
-	bool hide       = false;
-	SWBuf tagText;
-	XMLTag startTag;
-	SWBuf refs = "";
-	int footnoteNum = 1;
-	char buf[254];
-	VerseKey parser = key->getText();
-
-	SWBuf orig = text;
-	const char *from = orig.c_str();
-
-	for (text = ""; *from; from++) {
-		if (*from == '<') {
-			intoken = true;
-			token = "";
-			continue;
-		}
-		if (*from == '>') {	// process tokens
-			intoken = false;
-
-			XMLTag tag(token);
-			if (!strcmp(tag.getName(), "note")) {
-				if (!tag.isEndTag()) {
-					if (!tag.isEmpty()) {
-						refs = "";
-						startTag = tag;
-						hide = true;
-						tagText = "";
-						continue;
-					}
-				}
-				if (hide && tag.isEndTag()) {
-					if (module->isProcessEntryAttributes()) {
-						SWBuf fc = module->getEntryAttributes()["Footnote"]["count"]["value"];
-						footnoteNum = (fc.length()) ? atoi(fc.c_str()) : 0;
-						sprintf(buf, "%i", ++footnoteNum);
-						module->getEntryAttributes()["Footnote"]["count"]["value"] = buf;
-						StringList attributes = startTag.getAttributeNames();
-						for (StringList::iterator it = attributes.begin(); it != attributes.end(); it++) {
-							module->getEntryAttributes()["Footnote"][buf][it->c_str()] = startTag.getAttribute(it->c_str());
-						}
-						module->getEntryAttributes()["Footnote"][buf]["body"] = tagText;
-						startTag.setAttribute("swordFootnote", buf);
-						if ((startTag.getAttribute("type")) && (!strcmp(startTag.getAttribute("type"), "crossReference"))) {
-							if (!refs.length())
-								refs = parser.ParseVerseList(tagText.c_str(), parser, true).getRangeText();
-							module->getEntryAttributes()["Footnote"][buf]["refList"] = refs.c_str();
-						}
-					}
-					hide = false;
-					if ((option) || ((startTag.getAttribute("type") && (!strcmp(startTag.getAttribute("type"), "crossReference"))))) {	// we want the tag in the text; crossReferences are handled by another filter
-						text += startTag;
-						text.append(tagText);
-					}
-					else	continue;
-				}
-			}
-
-			// if not a note token, keep token in text
-			if ((!strcmp(tag.getName(), "scripRef")) && (!tag.isEndTag())) {
-				SWBuf osisRef = tag.getAttribute("passage");
-				if (refs.length())
-					refs += "; ";
-				refs += osisRef;
-			}
-			if (!hide) {
-				text += '<';
-				text.append(token);
-				text += '>';
-			}
-			else {
-				tagText += '<';
-				tagText.append(token);
-				tagText += '>';
-			}
-			continue;
-		}
-		if (intoken) { //copy token
-			token += *from;
-		}
-		else if (!hide) { //copy text which is not inside a token
-			text += *from;
-		}
-		else tagText += *from;
-	}
-	return 0;
-}
-
-SWORD_NAMESPACE_END
diff --git a/src/modules/filters/thmlgbf.cpp b/src/modules/filters/thmlgbf.cpp
deleted file mode 100644
index a65ddaf..0000000
--- a/src/modules/filters/thmlgbf.cpp
+++ /dev/null
@@ -1,283 +0,0 @@
-/***************************************************************************
-                     thmlgbf.cpp  -  ThML to GBF filter
-                             -------------------
-    begin                : 1999-10-28
-    copyright            : 2001 by CrossWire Bible Society
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include <stdlib.h>
-#include <thmlgbf.h>
-
-SWORD_NAMESPACE_START
-
-ThMLGBF::ThMLGBF()
-{
-}
-
-
-char ThMLGBF::processText(SWBuf &text, const SWKey *key, const SWModule *module) {
-	const char *from;
-	char token[2048];
-	int tokpos = 0;
-	bool intoken 	= false;
-	int len;
-	bool ampersand = false;
-	bool sechead = false;
-	bool title = false;  
-
-	SWBuf orig = text;
-	from = orig.c_str();
-
-	for (text = ""; *from; from++) {
-		if (*from == '<') {
-			intoken = true;
-			tokpos = 0;
-			token[0] = 0;
-			token[1] = 0;
-			token[2] = 0;
-			ampersand = false;
-			continue;
-		}
-		else if (*from == '&') {
-			intoken = true;
-			tokpos = 0;
-			memset(token, 0, 2048);
-			ampersand = true;
-			continue;
-		}
-		if (*from == ';' && ampersand) {
-			intoken = false;
-	
-			if (!strncmp("nbsp", token, 4)) text += ' ';
-			else if (!strncmp("quot", token, 4)) text += '"';
-			else if (!strncmp("amp", token, 3)) text += '&';
-			else if (!strncmp("lt", token, 2)) text += '<';
-			else if (!strncmp("gt", token, 2)) text += '>';
-			else if (!strncmp("brvbar", token, 6)) text += '|';
-			else if (!strncmp("sect", token, 4)) text += '§';
-			else if (!strncmp("copy", token, 4)) text += '©';
-			else if (!strncmp("laquo", token, 5)) text += '«';
-			else if (!strncmp("reg", token, 3)) text += '®';
-			else if (!strncmp("acute", token, 5)) text += '´';
-			else if (!strncmp("para", token, 4)) text += '¶';
-			else if (!strncmp("raquo", token, 5)) text += '»';
-			
-			else if (!strncmp("Aacute", token, 6)) text += 'Á';
-			else if (!strncmp("Agrave", token, 6)) text += 'À';
-			else if (!strncmp("Acirc", token, 5)) text += 'Â';
-			else if (!strncmp("Auml", token, 4)) text += 'Ä';
-			else if (!strncmp("Atilde", token, 6)) text += 'Ã';
-			else if (!strncmp("Aring", token, 5)) text += 'Å';
-			else if (!strncmp("aacute", token, 6)) text += 'á';
-			else if (!strncmp("agrave", token, 6)) text += 'à';
-			else if (!strncmp("acirc", token, 5)) text += 'â';
-			else if (!strncmp("auml", token, 4)) text += 'ä';
-			else if (!strncmp("atilde", token, 6)) text += 'ã';
-			else if (!strncmp("aring", token, 5)) text += 'å';
-			else if (!strncmp("Eacute", token, 6)) text += 'É';
-			else if (!strncmp("Egrave", token, 6)) text += 'È';
-			else if (!strncmp("Ecirc", token, 5)) text += 'Ê';
-			else if (!strncmp("Euml", token, 4)) text += 'Ë';
-			else if (!strncmp("eacute", token, 6)) text += 'é';
-			else if (!strncmp("egrave", token, 6)) text += 'è';
-			else if (!strncmp("ecirc", token, 5)) text += 'ê';
-			else if (!strncmp("euml", token, 4)) text += 'ë';
-			else if (!strncmp("Iacute", token, 6)) text += 'Í';
-			else if (!strncmp("Igrave", token, 6)) text += 'Ì';
-			else if (!strncmp("Icirc", token, 5)) text += 'Î';
-			else if (!strncmp("Iuml", token, 4)) text += 'Ï';
-			else if (!strncmp("iacute", token, 6)) text += 'í';
-			else if (!strncmp("igrave", token, 6)) text += 'ì';
-			else if (!strncmp("icirc", token, 5)) text += 'î';
-			else if (!strncmp("iuml", token, 4)) text += 'ï';
-			else if (!strncmp("Oacute", token, 6)) text += 'Ó';
-			else if (!strncmp("Ograve", token, 6)) text += 'Ò';
-			else if (!strncmp("Ocirc", token, 5)) text += 'Ô';
-			else if (!strncmp("Ouml", token, 4)) text += 'Ö';
-			else if (!strncmp("Otilde", token, 6)) text += 'Õ';
-			else if (!strncmp("oacute", token, 6)) text += 'ó';
-			else if (!strncmp("ograve", token, 6)) text += 'ò';
-			else if (!strncmp("ocirc", token, 5)) text += 'ô';
-			else if (!strncmp("ouml", token, 4)) text += 'ö';
-			else if (!strncmp("otilde", token, 6)) text += 'õ';
-			else if (!strncmp("Uacute", token, 6)) text += 'Ú';
-			else if (!strncmp("Ugrave", token, 6)) text += 'Ù';
-			else if (!strncmp("Ucirc", token, 5)) text += 'Û';
-			else if (!strncmp("Uuml", token, 4)) text += 'Ü';
-			else if (!strncmp("uacute", token, 6)) text += 'ú';
-			else if (!strncmp("ugrave", token, 6)) text += 'ù';
-			else if (!strncmp("ucirc", token, 5)) text += 'û';
-			else if (!strncmp("uuml", token, 4)) text += 'ü';
-			else if (!strncmp("Yacute", token, 6)) text += 'Ý';
-			else if (!strncmp("yacute", token, 6)) text += 'ý';
-			else if (!strncmp("yuml", token, 4)) text += 'ÿ';
-			
-			else if (!strncmp("deg", token, 3)) text += '°';
-			else if (!strncmp("plusmn", token, 6)) text += '±';
-			else if (!strncmp("sup2", token, 4)) text += '²';
-			else if (!strncmp("sup3", token, 4)) text += '³';
-			else if (!strncmp("sup1", token, 4)) text += '¹';
-			else if (!strncmp("nbsp", token, 4)) text += 'º';
-			else if (!strncmp("pound", token, 5)) text += '£';
-			else if (!strncmp("cent", token, 4)) text += '¢';
-			else if (!strncmp("frac14", token, 6)) text += '¼';
-			else if (!strncmp("frac12", token, 6)) text += '½';
-			else if (!strncmp("frac34", token, 6)) text += '¾';
-			else if (!strncmp("iquest", token, 6)) text += '¿';
-			else if (!strncmp("iexcl", token, 5)) text += '¡';
-			else if (!strncmp("ETH", token, 3)) text += 'Ð';
-			else if (!strncmp("eth", token, 3)) text += 'ð';
-			else if (!strncmp("THORN", token, 5)) text += 'Þ';
-			else if (!strncmp("thorn", token, 5)) text += 'þ';
-			else if (!strncmp("AElig", token, 5)) text += 'Æ';
-			else if (!strncmp("aelig", token, 5)) text += 'æ';
-			else if (!strncmp("Oslash", token, 6)) text += 'Ø';
-			else if (!strncmp("curren", token, 6)) text += '¤';
-			else if (!strncmp("Ccedil", token, 6)) text += 'Ç';
-			else if (!strncmp("ccedil", token, 6)) text += 'ç';
-			else if (!strncmp("szlig", token, 5)) text += 'ß';
-			else if (!strncmp("Ntilde", token, 6)) text += 'Ñ';
-			else if (!strncmp("ntilde", token, 6)) text += 'ñ';
-			else if (!strncmp("yen", token, 3)) text += '¥';
-			else if (!strncmp("not", token, 3)) text += '¬';
-			else if (!strncmp("ordf", token, 4)) text += 'ª';
-			else if (!strncmp("uml", token, 3)) text += '¨';
-			else if (!strncmp("shy", token, 3)) text += '­';
-			else if (!strncmp("macr", token, 4)) text += '¯';
-			continue;
-		
-		}
-		else if (*from == '>' && !ampersand) {
-			intoken = false;
-			// process desired tokens
-			if (!strncmp(token, "sync type=\"Strongs\" value=\"", 27)) {
-				text += "<W";
-				for (unsigned int i = 27; token[i] != '\"'; i++)
-					text += token[i];
-				text += '>';
-				continue;
-			}
-			if (!strncmp(token, "sync type=\"morph\" value=\"", 25)) {
-				text += "<WT";
-				for (unsigned int i = 25; token[i] != '\"'; i++)
-					text += token[i];
-				text += '>';
-				continue;
-			}
-			else if (!strncmp(token, "scripRef", 8)) {
-				text += "<RX>";
-				continue;
-			}
- 			else if (!strncmp(token, "/scripRef", 9)) {
-				text += "<Rx>";
-				continue;
-			}
-			else if (!strncmp(token, "note", 4)) {
-				text += "<RF>";
-				continue;
-			}
-			else if (!strncmp(token, "/note", 5)) {
-				text += "<Rf>";
-				continue;
-			}
-			else if (!strncmp(token, "sup", 3)) {
-				text += "<FS>";
-			}
-			else if (!strncmp(token, "/sup", 4)) {
-				text += "<Fs>";
-			}
-			else if (!strnicmp(token, "font color=#ff0000", 18)) {
-				text += "<FR>";
-				continue;
-			}
-			else if (!strnicmp(token, "/font", 5)) {
-				text += "<Fr>";
-				continue;
-			}
-			else if (!strncmp(token, "div class=\"sechead\"", 19)) {
-				text += "<TS>";
-				sechead = true;
-				continue;
-			}
-			else if (sechead && !strncmp(token, "/div", 19)) {
-				text += "<Ts>";
-				sechead = false;
-				continue;
-			}
-			else if (!strncmp(token, "div class=\"title\"", 19)) {
-				text += "<TT>";
-				title = true;
-				continue;
-			}
-			else if (title && !strncmp(token, "/div", 19)) {
-				text += "<Tt>";
-				title = false;
-				continue;
-			}
-			else if (!strnicmp(token, "br", 2)) {
-				text += "<CL>";
-				continue;
-			}
-			else switch(*token) {
-			case 'I':			// font tags
-			case 'i':
-				text += "<FI>";
-				continue;
-			case 'B':		// bold start
-			case 'b':
-				text += "<FB>";
-				continue;
-			case '/':
-				switch(token[1]) {
-				case 'P':
-				case 'p':
-					text += "<CM>";
-					continue;
-				case 'I':
-				case 'i':		// italic end
-					text += "<Fi>";
-					continue;
-				case 'B':		// bold start
-				case 'b':
-					text += "<Fb>";
-					continue;
-				}
-			}
-			continue;
-		}
-		if (intoken) {
-			if (tokpos < 2045)
-				token[tokpos++] = *from;
-				token[tokpos+2] = 0;
-		}
-		else	text += *from;
-	}
-
-	orig = text;
-	from = orig.c_str();
-	for (text = ""; *from; from++) {  //loop to remove extra spaces
-                if ((strchr(" \t\n\r", *from))) {
-                        while (*(from+1) && (strchr(" \t\n\r", *(from+1)))) {
-                                from++;
-                        }
-                        text += " ";
-                }
-                else {
-                        text += *from;
-                }
-        }
-        text += (char)0;
-        
-	return 0;
-}
-
-SWORD_NAMESPACE_END
diff --git a/src/modules/filters/thmlheadings.cpp b/src/modules/filters/thmlheadings.cpp
deleted file mode 100644
index bc764bb..0000000
--- a/src/modules/filters/thmlheadings.cpp
+++ /dev/null
@@ -1,96 +0,0 @@
-/******************************************************************************
- *
- * thmlheadings -	SWFilter descendant to hide or show headings
- *			in a ThML module.
- */
-
-
-#include <stdlib.h>
-#include <thmlheadings.h>
-#include <utilxml.h>
-
-#include <iostream>
-
-#ifndef __GNUC__
-#else
-#include <unixstr.h>
-#endif
-
-SWORD_NAMESPACE_START
-
-const char oName[] = "Headings";
-const char oTip[] = "Toggles Headings On and Off if they exist";
-
-const SWBuf choices[3] = {"On", "Off", ""};
-const StringList oValues(&choices[0], &choices[2]);
-
-ThMLHeadings::ThMLHeadings() : SWOptionFilter(oName, oTip, &oValues) {
-	setOptionValue("Off");
-}
-
-
-ThMLHeadings::~ThMLHeadings() {
-}
-
-
-char ThMLHeadings::processText(SWBuf &text, const SWKey *key, const SWModule *module) {
-	if (!option) {	// if we don't want headings
-		SWBuf token;
-		bool intoken = false;
-		bool hide = false;
-
-		SWBuf orig = text;
-		const char *from = orig.c_str();
-
-		for (text = ""; *from; from++) {
-			if (*from == '<') {
-				intoken = true;
-				token = "";
-				continue;
-			}
-			if (*from == '>') {	// process tokens
-				intoken = false;
-
-				XMLTag tag(token);
-
-				if (!stricmp(tag.getName(), "div")) { //we only want a div tag
-					//std::cout << tag.toString() << " " << tag.isEndTag() << std::endl;
-
-					if (tag.getAttribute("class") && !stricmp(tag.getAttribute("class"), "sechead")) {
-						hide = true;
-						continue;
-					}
-
-					if (tag.getAttribute("class") && !stricmp(tag.getAttribute("class"), "title")) {
-						hide = true;
-						continue;
-					}
-
-					if (hide && tag.isEndTag()) {
-						hide = false;
-						continue;
-					}
-
-				}
-
-				// if not a heading token, keep token in text
-				if (!hide) {
-					text += '<';
-					text += token;
-					text += '>';
-				}
-				continue;
-			}
-
-			if (intoken) { //copy token
-				token += *from;
-			}
-			else if (!hide) { //copy text which is not inside a token
-				text += *from;
-			}
-		}
-	}
-	return 0;
-}
-
-SWORD_NAMESPACE_END
diff --git a/src/modules/filters/thmlhtml.cpp b/src/modules/filters/thmlhtml.cpp
deleted file mode 100644
index 40b3320..0000000
--- a/src/modules/filters/thmlhtml.cpp
+++ /dev/null
@@ -1,226 +0,0 @@
-/***************************************************************************
-                     thmlhtml.cpp  -  ThML to HTML filter
-                             -------------------
-    begin                : 1999-10-27
-    copyright            : 2001 by CrossWire Bible Society
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include <stdlib.h>
-#include <thmlhtml.h>
-#include <swmodule.h>
-#include <utilxml.h>
-
-SWORD_NAMESPACE_START
-
-ThMLHTML::ThMLHTML() {
-	setTokenStart("<");
-	setTokenEnd(">");
-/*
-	setEscapeStart("&");
-	setEscapeEnd(";");
-
-	setEscapeStringCaseSensitive(true);
-
-	addEscapeStringSubstitute("nbsp", " ");
-	addEscapeStringSubstitute("quot", "\"");
-	addEscapeStringSubstitute("amp", "&");
-	addEscapeStringSubstitute("lt", "<");
-	addEscapeStringSubstitute("gt", ">");
-	addEscapeStringSubstitute("brvbar", "|");
-	addEscapeStringSubstitute("sect", "§");
-	addEscapeStringSubstitute("copy", "©");
-	addEscapeStringSubstitute("laquo", "«");
-	addEscapeStringSubstitute("reg", "®");
-	addEscapeStringSubstitute("acute", "´");
-	addEscapeStringSubstitute("para", "¶");
-	addEscapeStringSubstitute("raquo", "»");
-
-	addEscapeStringSubstitute("Aacute", "Á");
-	addEscapeStringSubstitute("Agrave", "À");
-	addEscapeStringSubstitute("Acirc", "Â");
-	addEscapeStringSubstitute("Auml", "Ä");
-	addEscapeStringSubstitute("Atilde", "Ã");
-	addEscapeStringSubstitute("Aring", "Å");
-	addEscapeStringSubstitute("aacute", "á");
-	addEscapeStringSubstitute("agrave", "à");
-	addEscapeStringSubstitute("acirc", "â");
-	addEscapeStringSubstitute("auml", "ä");
-	addEscapeStringSubstitute("atilde", "ã");
-	addEscapeStringSubstitute("aring", "å");
-	addEscapeStringSubstitute("Eacute", "É");
-	addEscapeStringSubstitute("Egrave", "È");
-	addEscapeStringSubstitute("Ecirc", "Ê");
-	addEscapeStringSubstitute("Euml", "Ë");
-	addEscapeStringSubstitute("eacute", "é");
-	addEscapeStringSubstitute("egrave", "è");
-	addEscapeStringSubstitute("ecirc", "ê");
-	addEscapeStringSubstitute("euml", "ë");
-	addEscapeStringSubstitute("Iacute", "Í");
-	addEscapeStringSubstitute("Igrave", "Ì");
-	addEscapeStringSubstitute("Icirc", "Î");
-	addEscapeStringSubstitute("Iuml", "Ï");
-	addEscapeStringSubstitute("iacute", "í");
-	addEscapeStringSubstitute("igrave", "ì");
-	addEscapeStringSubstitute("icirc", "î");
-	addEscapeStringSubstitute("iuml", "ï");
-	addEscapeStringSubstitute("Oacute", "Ó");
-	addEscapeStringSubstitute("Ograve", "Ò");
-	addEscapeStringSubstitute("Ocirc", "Ô");
-	addEscapeStringSubstitute("Ouml", "Ö");
-	addEscapeStringSubstitute("Otilde", "Õ");
-	addEscapeStringSubstitute("oacute", "ó");
-	addEscapeStringSubstitute("ograve", "ò");
-	addEscapeStringSubstitute("ocirc", "ô");
-	addEscapeStringSubstitute("ouml", "ö");
-	addEscapeStringSubstitute("otilde", "õ");
-	addEscapeStringSubstitute("Uacute", "Ú");
-	addEscapeStringSubstitute("Ugrave", "Ù");
-	addEscapeStringSubstitute("Ucirc", "Û");
-	addEscapeStringSubstitute("Uuml", "Ü");
-	addEscapeStringSubstitute("uacute", "ú");
-	addEscapeStringSubstitute("ugrave", "ù");
-	addEscapeStringSubstitute("ucirc", "û");
-	addEscapeStringSubstitute("uuml", "ü");
-	addEscapeStringSubstitute("Yacute", "Ý");
-	addEscapeStringSubstitute("yacute", "ý");
-	addEscapeStringSubstitute("yuml", "ÿ");
-
-	addEscapeStringSubstitute("deg", "°");
-	addEscapeStringSubstitute("plusmn", "±");
-	addEscapeStringSubstitute("sup2", "²");
-	addEscapeStringSubstitute("sup3", "³");
-	addEscapeStringSubstitute("sup1", "¹");
-	addEscapeStringSubstitute("nbsp", "º");
-	addEscapeStringSubstitute("pound", "£");
-	addEscapeStringSubstitute("cent", "¢");
-	addEscapeStringSubstitute("frac14", "¼");
-	addEscapeStringSubstitute("frac12", "½");
-	addEscapeStringSubstitute("frac34", "¾");
-	addEscapeStringSubstitute("iquest", "¿");
-	addEscapeStringSubstitute("iexcl", "¡");
-	addEscapeStringSubstitute("ETH", "Ð");
-	addEscapeStringSubstitute("eth", "ð");
-	addEscapeStringSubstitute("THORN", "Þ");
-	addEscapeStringSubstitute("thorn", "þ");
-	addEscapeStringSubstitute("AElig", "Æ");
-	addEscapeStringSubstitute("aelig", "æ");
-	addEscapeStringSubstitute("Oslash", "Ø");
-	addEscapeStringSubstitute("curren", "¤");
-	addEscapeStringSubstitute("Ccedil", "Ç");
-	addEscapeStringSubstitute("ccedil", "ç");
-	addEscapeStringSubstitute("szlig", "ß");
-	addEscapeStringSubstitute("Ntilde", "Ñ");
-	addEscapeStringSubstitute("ntilde", "ñ");
-	addEscapeStringSubstitute("yen", "¥");
-	addEscapeStringSubstitute("not", "¬");
-	addEscapeStringSubstitute("ordf", "ª");
-	addEscapeStringSubstitute("uml", "¨");
-	addEscapeStringSubstitute("shy", "­");
-	addEscapeStringSubstitute("macr", "¯");
-*/
-	setTokenCaseSensitive(true);
-
-	addTokenSubstitute("note", " <font color=\"#800000\"><small>(");
-	addTokenSubstitute("/note", ")</small></font> ");
-}
-
-
-bool ThMLHTML::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData) {
-	if (!substituteToken(buf, token)) { // manually process if it wasn't a simple substitution
-		MyUserData *u = (MyUserData *)userData;
-		XMLTag tag(token);
-		if (!strcmp(tag.getName(), "sync")) {
-			if (tag.getAttribute("type") && tag.getAttribute("value") && !strcmp(tag.getAttribute("type"), "Strongs")) {
-				const char* value = tag.getAttribute("value");
-				if (*value == 'H' || *value == 'G' || *value == 'A') {
-					value++;
-					buf += "<small><em>";
-					buf += value;
-					buf += "</em></small>";
-				}
-				else if (*value == 'T') {
-					value += 2;
-
-					buf += "<small><i>";
-					buf += value;
-					buf += "</i></small>";
-				}
-			}
-			else if (tag.getAttribute("type") && tag.getAttribute("value") && !strcmp(tag.getAttribute("type"), "morph")) {
-				buf += "<small><em>";
-				buf += tag.getAttribute("value");
-				buf += "</em></small>";
-			}
-			else if (tag.getAttribute("type") && tag.getAttribute("value") && !strcmp(tag.getAttribute("type"), "lemma")) {
-				buf += "<small><em>(";
-				buf += tag.getAttribute("value");
-				buf += ")</em></small>";
-			}
-		}
-		else if (!strcmp(tag.getName(), "div")) {
-			if (tag.isEndTag() && (u->SecHead)) {
-				buf += "</i></b><br />";
-				u->SecHead = false;
-			}
-			else if (tag.getAttribute("class")) {
-				if (!strcmp(tag.getAttribute("class"), "sechead")) {
-					u->SecHead = true;
-					buf += "<br /><b><i>";
-				}
-				else if (!strcmp(tag.getAttribute("class"), "title")) {
-					u->SecHead = true;
-					buf += "<br /><b><i>";
-				}
-			}
-		}
-		else if (!strcmp(tag.getName(), "img")) {
-			const char *src = strstr(token, "src");
-			if (!src)		// assert we have a src attribute
-				return false;
-
-			buf += '<';
-			for (const char *c = token; *c; c++) {
-				if (c == src) {
-					for (;((*c) && (*c != '"')); c++)
-						buf += *c;
-
-					if (!*c) { c--; continue; }
-
-					buf += '"';
-					if (*(c+1) == '/') {
-						buf += "file:";
-						buf += userData->module->getConfigEntry("AbsoluteDataPath");
-						if (buf[buf.length()-2] == '/')
-							c++;		// skip '/'
-					}
-					continue;
-				}
-				buf += *c;
-			}
-			buf += '>';
-		}
-		else if (!strcmp(tag.getName(), "scripRef")) { //do nothing with scrip refs, we leave them out
-
-		}
-		else {
-			buf += '<';
-			buf += token;
-			buf += '>';
-
-//			return false;  // we still didn't handle token
-		}
-	}
-	return true;
-}
-
-
-SWORD_NAMESPACE_END
diff --git a/src/modules/filters/thmlhtmlhref.cpp b/src/modules/filters/thmlhtmlhref.cpp
deleted file mode 100644
index b94b8ae..0000000
--- a/src/modules/filters/thmlhtmlhref.cpp
+++ /dev/null
@@ -1,209 +0,0 @@
-/***************************************************************************
-                     thmlhtmlhref.cpp  -  ThML to HTML filter with hrefs  
-                             -------------------
-    begin                    : 2001-09-03
-    copyright            : 2001 by CrossWire Bible Society
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include <stdlib.h>
-#include <thmlhtmlhref.h>
-#include <swmodule.h>
-#include <utilxml.h>
-#include <versekey.h>
-
-SWORD_NAMESPACE_START
-
-
-ThMLHTMLHREF::MyUserData::MyUserData(const SWModule *module, const SWKey *key) : BasicFilterUserData(module, key) {
-	if (module) {
-		version = module->Name();
-		BiblicalText = (!strcmp(module->Type(), "Biblical Texts"));
-	}	
-}
-
-
-ThMLHTMLHREF::ThMLHTMLHREF() {
-	setTokenStart("<");
-	setTokenEnd(">");
-
-	setTokenCaseSensitive(true);
-	addTokenSubstitute("scripture", "<i> ");
-	addTokenSubstitute("/scripture", "</i> ");
-}
-
-
-bool ThMLHTMLHREF::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData) {
-	const char *tok;
-	if (!substituteToken(buf, token)) { // manually process if it wasn't a simple substitution
-		MyUserData *u = (MyUserData *)userData;		
-
-		XMLTag tag(token);
-		if ((!tag.isEndTag()) && (!tag.isEmpty()))
-			u->startTag = tag;
-
-		if (tag.getName() && !strcmp(tag.getName(), "sync")) {
-			SWBuf value = tag.getAttribute("value");
-			if (tag.getAttribute("type") && !strcmp(tag.getAttribute("type"), "morph")) { //&gt;
-				buf += "<small><em>(<a href=\"";
-				buf += "type=";
-				buf += tag.getAttribute("type");
-	
-				//const char* value = tag.getAttribute("value");
-				buf += " value=";
-				buf += (value.length()) ? value.c_str() : "";
-				buf += "\">";
-				buf += (value.length()) ? value.c_str() : "";
-				buf += "</a>) </em></small>";
-			}
-			else if (tag.getAttribute("type") && !strcmp(tag.getAttribute("type"), "Strongs")) {
-				buf += "<small><em>&lt;<a href=\"";
-				buf += "type=";
-				buf += tag.getAttribute("type");
-	
-				//const char* value = tag.getAttribute("value");
-				buf += " value=";
-				buf += (value.length()) ? value.c_str() : "";
-				buf += "\">";
-				value<<1;
-				buf += (value.length()) ? value.c_str() : "";
-				buf += "</a>&gt; </em></small>";
-			}
-			else if (tag.getAttribute("type") && !strcmp(tag.getAttribute("type"), "Dict")) {
-				if (!tag.isEndTag())
-					buf += "<b>";
-				else	buf += "</b>";
-			}
-				
-		}
-		// <note> tag
-		else if (!strcmp(tag.getName(), "note")) {
-			if (!tag.isEndTag()) {
-				if (!tag.isEmpty()) {
-					SWBuf type = tag.getAttribute("type");
-					SWBuf footnoteNumber = tag.getAttribute("swordFootnote");
-					VerseKey *vkey;
-					// see if we have a VerseKey * or descendant
-					try {
-						vkey = SWDYNAMIC_CAST(VerseKey, u->key);
-					}
-					catch ( ... ) {	}
-					if (vkey) {
-						// leave this special osis type in for crossReference notes types?  Might thml use this some day? Doesn't hurt.
-						char ch = ((tag.getAttribute("type") && ((!strcmp(tag.getAttribute("type"), "crossReference")) || (!strcmp(tag.getAttribute("type"), "x-cross-ref")))) ? 'x':'n');
-						buf.appendFormatted("<a href=\"noteID=%s.%c.%s\"><small><sup>*%c</sup></small></a> ", vkey->getText(), ch, footnoteNumber.c_str(), ch);
-					}
-					u->suspendTextPassThru = true;
-				}
-			}
-			if (tag.isEndTag()) {
-				u->suspendTextPassThru = false;
-			}
-		}
-		// <scripRef> tag
-		else if (!strcmp(tag.getName(), "scripRef")) {
-			if (!tag.isEndTag()) {
-				if (!tag.isEmpty()) {
-					u->suspendTextPassThru = true;
-				}
-			}
-			if (tag.isEndTag()) {	//	</scripRef>
-				if (!u->BiblicalText) {
-					SWBuf refList = u->startTag.getAttribute("passage");
-					if (!refList.length())
-						refList = u->lastTextNode;
-					SWBuf version = tag.getAttribute("version");
-					buf += "&nbsp<a href=\"";
-					if (version.length()) {
-						buf += "version=";
-						buf += version;
-						buf += " ";
-					}
-					buf += "passage=";
-					buf += refList.c_str();
-					buf += "\">";
-					buf += u->lastTextNode.c_str();
-					buf += "</a>&nbsp";
-				}
-				else {
-					SWBuf footnoteNumber = u->startTag.getAttribute("swordFootnote");
-					VerseKey *vkey;
-					// see if we have a VerseKey * or descendant
-					try {
-						vkey = SWDYNAMIC_CAST(VerseKey, u->key);
-					}
-					catch ( ... ) {}
-					if (vkey) {
-						// leave this special osis type in for crossReference notes types?  Might thml use this some day? Doesn't hurt.
-						buf.appendFormatted("<a href=\"noteID=%s.x.%s\"><small><sup>*x</sup></small></a> ", vkey->getText(), footnoteNumber.c_str());
-					}
-				}
-
-				// let's let text resume to output again
-				u->suspendTextPassThru = false;
-			}
-		}
-		else if (tag.getName() && !strcmp(tag.getName(), "div")) {
-			if (tag.isEndTag() && u->SecHead) {
-				buf += "</i></b><br />";
-				u->SecHead = false;
-			}
-			else if (tag.getAttribute("class")) {
-				if (!stricmp(tag.getAttribute("class"), "sechead")) {
-					u->SecHead = true;
-					buf += "<br /><b><i>";
-				}
-				else if (!stricmp(tag.getAttribute("class"), "title")) {
-					u->SecHead = true;
-					buf += "<br /><b><i>";
-				}
-			}
-		}
-		else if (tag.getName() && (!strcmp(tag.getName(), "img") || !strcmp(tag.getName(), "image"))) {
-			const char *src = strstr(token, "src");
-			if (!src)		// assert we have a src attribute
-				return false;
-
-			buf += '<';
-			for (const char *c = token; *c; c++) {
-				if (c == src) {
-					for (;((*c) && (*c != '"')); c++)
-						buf += *c;
-
-					if (!*c) { c--; continue; }
-
-					buf += '"';
-					if (*(c+1) == '/') {
-						buf += "file:";
-						buf += userData->module->getConfigEntry("AbsoluteDataPath");
-						if (buf[buf.length()-2] == '/')
-							c++;		// skip '/'
-					}
-					continue;
-				}
-				buf += *c;
-			}
-			buf += '>';
-		}
-		else {
-			buf += '<';
-			/*for (const char *tok = token; *tok; tok++)
-				buf += *tok;*/
-			buf += token;
-			buf += '>';
-			//return false;  // we still didn't handle token
-		}
-	}
-	return true;
-}
-
-
-SWORD_NAMESPACE_END
diff --git a/src/modules/filters/thmllemma.cpp b/src/modules/filters/thmllemma.cpp
deleted file mode 100644
index 02939df..0000000
--- a/src/modules/filters/thmllemma.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-/******************************************************************************
- *
- * thmllemma -	SWFilter descendant to hide or show lemmas
- *			in a ThML module.
- */
-
-
-#include <stdlib.h>
-#include <thmllemma.h>
-#ifndef __GNUC__
-#else
-#include <unixstr.h>
-#endif
-
-SWORD_NAMESPACE_START
-
-const char oName[] = "Lemmas";
-const char oTip[] = "Toggles Lemmas On and Off if they exist";
-
-const SWBuf choices[3] = {"On", "Off", ""};
-const StringList oValues(&choices[0], &choices[2]);
-
-ThMLLemma::ThMLLemma() : SWOptionFilter(oName, oTip, &oValues) {
-	setOptionValue("Off");
-}
-
-
-ThMLLemma::~ThMLLemma() {
-}
-
-
-char ThMLLemma::processText(SWBuf &text, const SWKey *key, const SWModule *module) {
-	if (!option) {	// if we don't want lemmas
-		bool intoken = false;
-
-		SWBuf token;
-		SWBuf orig = text;
-		const char *from = orig.c_str();
-		for (text = ""; *from; from++) {
-			if (*from == '<') {
-				intoken = true;
-                                token = "";
-				continue;
-			}
-			else if (*from == '>') {	// process tokens
-				intoken = false;
-				if (!strnicmp(token.c_str(), "sync", 4) && strstr(token.c_str(), " type=\"lemma\"")) {	// Lemma
-					continue;
-				}
-				
-				// if not a lemma token, keep token in text
-				text += '<';
-                                text.append(token);
-      				text += '>';
-				continue;
-			}
-			
-			if (intoken) {
-				token += *from;
-			}
-			else {
-                                text += *from;
-       			}
-		}
-	}
-	return 0;
-}
-
-SWORD_NAMESPACE_END
diff --git a/src/modules/filters/thmlmorph.cpp b/src/modules/filters/thmlmorph.cpp
deleted file mode 100644
index 606ae7e..0000000
--- a/src/modules/filters/thmlmorph.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-/******************************************************************************
- *
- * thmlmorph -	SWFilter descendant to hide or show morph tags
- *			in a ThML module.
- */
-
-
-#include <stdlib.h>
-#include <thmlmorph.h>
-#ifndef __GNUC__
-#else
-#include <unixstr.h>
-#endif
-
-SWORD_NAMESPACE_START
-
-const char oName[] = "Morphological Tags";
-const char oTip[] = "Toggles Morphological Tags On and Off if they exist";
-
-const SWBuf choices[3] = {"On", "Off", ""};
-const StringList oValues(&choices[0], &choices[2]);
-
-ThMLMorph::ThMLMorph() : SWOptionFilter(oName, oTip, &oValues) {
-	setOptionValue("Off");
-}
-
-
-ThMLMorph::~ThMLMorph() {
-}
-
-
-char ThMLMorph::processText(SWBuf &text, const SWKey *key, const SWModule *module) {
-	if (!option) {	// if we don't want morph tags
-		bool intoken = false;
-
-		SWBuf token;
-		SWBuf orig = text;
-		const char *from = orig.c_str();
-		for (text = ""; *from; from++) {
-			if (*from == '<') {
-				intoken = true;
-				token = "";
-				continue;
-			}
-			if (*from == '>') {	// process tokens
-				intoken = false;
-				if (!strncmp(token.c_str(), "sync ", 5) && strstr(token.c_str(), "type=\"morph\"")) {	// Morph
-				  continue;
-				}
-
-				// if not a morph tag token, keep token in text
-				text += '<';
-				text += token;
-				text += '>';
-				continue;
-			}
-
-			if (intoken) {
-				token += *from;
-			}
-			else	{
-				text += *from;
-			}
-		}
-	}
-	return 0;
-}
-
-SWORD_NAMESPACE_END
diff --git a/src/modules/filters/thmlosis.cpp b/src/modules/filters/thmlosis.cpp
deleted file mode 100644
index 7208610..0000000
--- a/src/modules/filters/thmlosis.cpp
+++ /dev/null
@@ -1,385 +0,0 @@
-/******************************************************************************
- *
- * thmlstrongs -	SWFilter descendant to hide or show strongs number
- *			in a ThML module.
- */
-
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <thmlosis.h>
-#include <swmodule.h>
-#include <swlog.h>
-#include <versekey.h>
-#include <stdarg.h>
-#ifndef __GNUC__
-#else
-#include <unixstr.h>
-#endif
-
-SWORD_NAMESPACE_START
-
-ThMLOSIS::ThMLOSIS() {
-}
-
-
-ThMLOSIS::~ThMLOSIS() {
-}
-
-
-char ThMLOSIS::processText(SWBuf &text, const SWKey *key, const SWModule *module) {
-	/*
-
-	const char *from;
-	char token[2048]; // cheese.  Fix.
-	int tokpos = 0;
-	bool intoken = false;
-	int len;
-	bool lastspace = false;
-	int word = 1;
-	char val[128];
-	char buf[128];
-	char wordstr[5];
-	char *valto;
-	char *ch;
-	char *textStart, *textEnd;
-	char *wordStart, *wordEnd;
-	bool newText = false;
-	bool newWord = false;
-	SWBuf tmp;
-	bool suspendTextPassThru = false;
-	bool keepToken = false;
-	bool handled = false;
-	SWBuf divEnd = "";
-
-
-	wordStart = text;
-
-	SWBuf orig = text;
-	from = orig.c_str();
-
-	for (text = ""; *from; from++) {
-
-		if (*from == '<') {
-			intoken = true;
-			tokpos = 0;
-			token[0] = 0;
-			token[1] = 0;
-			token[2] = 0;
-			textEnd = from-1;
-			wordEnd = to;
-			continue;
-		}
-		if (*from == '>') {	// process tokens
-			intoken = false;
-			keepToken = false;
-			suspendTextPassThru = false;
-			newWord = true;
-			handled = false;
-
-			while (wordStart < (text+maxlen)) {
-//				if (strchr(" ,;.?!()'\"", *wordStart))
-				if (strchr(";,: .?!()'\"", *wordStart))
-					wordStart++;
-				else break;
-			}
-			while (wordEnd > wordStart) {
-				if (strchr(" ,;:.?!()'\"", *wordEnd))
-					wordEnd--;
-				else break;
-			}
-
-			// section titles
-			if (!strcmp(token, "div class=\"sechead\"")) {
-				pushString(&to, "<title>");
-				divEnd = "</title>";
-				newText = true;
-				lastspace = false;
-				handled = true;
-			}
-			else	if (!strcmp(token, "/div")) {
-				pushString(&to, divEnd.c_str());
-				lastspace = false;
-				handled = true;
-			}
-			// Scripture Reference
-			if (!strncmp(token, "scripRef", 8)) {
-	//			pushString(buf, "<reference osisRef=\"");
-				suspendTextPassThru = true;
-				newText = true;
-				handled = true;
-			}
-			else	if (!strncmp(token, "/scripRef", 9)) {
-				tmp = "";
-				tmp.append(textStart, (int)(textEnd - textStart)+1);
-				pushString(&to, convertToOSIS(tmp.c_str(), key));
-				suspendTextPassThru = false;
-				handled = true;
-			}
-//      Usage of italics to represent transChange isn't domaninant;
-//        solution: mark in OSIS instead, assume no semantics other than emphasis
-//                of italicized text
-//                        if (!strcmp(module->Type(), "Biblical Texts")) {
-//        			// Italics assume transchange for Biblical texts
-//	        		if (!stricmp(token, "i")) {
-//		        		pushString(&to, "<transChange type=\"added\">");
-//			        	newText = true;
-//				        lastspace = false;
-//        				handled = true;
-//	        		}
-//		        	else	if (!stricmp(token, "/i")) {
-//			        	pushString(&to, "</transChange>");
-//        				lastspace = false;
-//	        			handled = true;
-//		        	}
-//                        }
-//                        else {
-//                        	// otherwise, italics are just italics
-//-- end italics for transchange
-	        		if (!stricmp(token, "i")) {
-		        		pushString(&to, "<hi type=\"i\">");
-			        	newText = true;
-				        lastspace = false;
-        				handled = true;
-	        		}
-		        	else	if (!stricmp(token, "/i")) {
-			        	pushString(&to, "</hi>");
-        				lastspace = false;
-	        			handled = true;
-		        	}
-//                        }
-
-	        	if (!strcmp(token, "b")) {
-		        	pushString(&to, "<hi type=\"b\">");
-			       	newText = true;
-			        lastspace = false;
-        			handled = true;
-	        	}
-		        else	if (!strcmp(token, "/b")) {
-			       	pushString(&to, "</hi>");
-        			lastspace = false;
-	        		handled = true;
-                        }
-
-			// Footnote
-			if (!strcmp(token, "note")) {
-		        	pushString(&to, "<note>");
-				newText = true;
-                                lastspace = false;
-				handled = true;
-			}
-			else	if (!strcmp(token, "/note")) {
-				pushString(&to, "</note>");
-                                lastspace = false;
-				handled = true;
-			}
-
-			// Figure
-			else	if (!strncmp(token, "img ", 4)) {
-				const char *src = strstr(token, "src");
-				if (!src)		// assert we have a src attribute
-					continue;
-//					return false;
-
-				pushString(&to, "<figure src=\"");
-				const char *c;
-				for (c = src;((*c) && (*c != '"')); c++);
-
-// uncomment for SWORD absolute path logic
-//				if (*(c+1) == '/') {
-//					pushString(buf, "file:");
-//					pushString(buf, module->getConfigEntry("AbsoluteDataPath"));
-//					if (*((*buf)-1) == '/')
-//						c++;		// skip '/'
-//				}
-//				end of uncomment for asolute path logic 
-
-				for (c++;((*c) && (*c != '"')); c++)
-					*to++ = *c;
-
-				pushString(&to, "\" />");
-				handled = true;
-			}
-
-			// Strongs numbers
-			else	if (!strnicmp(token, "sync type=\"Strongs\" ", 20)) {	// Strongs
-				if (module->isProcessEntryAttributes()) {
-					valto = val;
-					for (unsigned int i = 27; token[i] != '\"' && i < 150; i++)
-						*valto++ = token[i];
-					*valto = 0;
-					if (atoi((!isdigit(*val))?val+1:val) < 5627) {
-						// normal strongs number
-						strstrip(val);
-						sprintf(buf, "<w lemma=\"x-Strong:%s\">", val);
-						memmove(wordStart+strlen(buf), wordStart, (to-wordStart)+1);
-						memcpy(wordStart, buf, strlen(buf));
-						to+=strlen(buf);
-						pushString(&to, "</w>");
-						module->getEntryAttributes()["Word"][wordstr]["Strongs"] = val;
-//						tmp = "";
-//						tmp.append(textStart, (int)(wordEnd - wordStart));
-//						module->getEntryAttributes()["Word"][wordstr]["Text"] = tmp;
-					}
-					else {
-						// verb morph
-						sprintf(wordstr, "%03d", word-1);
-						module->getEntryAttributes()["Word"][wordstr]["Morph"] = val;
-					}
-				}
-				handled = true;
-			}
-
-			// Morphology
-			else	if (!strncmp(token, "sync type=\"morph\"", 17)) {
-				for (ch = token+17; *ch; ch++) {
-					if (!strncmp(ch, "class=\"", 7)) {
-						valto = val;
-						for (unsigned int i = 7; ch[i] != '\"' && i < 127; i++)
-							*valto++ = ch[i];
-						*valto = 0;
-						sprintf(wordstr, "%03d", word-1);
-						strstrip(val);
-						module->getEntryAttributes()["Word"][wordstr]["MorphClass"] = val;
-					}
-					if (!strncmp(ch, "value=\"", 7)) {
-						valto = val;
-						for (unsigned int i = 7; ch[i] != '\"' && i < 127; i++)
-							*valto++ = ch[i];
-						*valto = 0;
-						sprintf(wordstr, "%03d", word-1);
-						strstrip(val);
-						module->getEntryAttributes()["Word"][wordstr]["Morph"] = val;
-					}
-				}
-				if (!strncmp(wordStart, "<w ", 3)) {
-
-					const char *cls = "Unknown", *morph;
-
-					if (module->getEntryAttributes()["Word"][wordstr]["Morph"].size() > 0) {
-						if (module->getEntryAttributes()["Word"][wordstr]["MorphClass"].size() > 0)
-							cls = module->getEntryAttributes()["Word"][wordstr]["MorphClass"].c_str();
-						morph = module->getEntryAttributes()["Word"][wordstr]["Morph"].c_str();
-					
-						sprintf(buf, "morph=\"x-%s:%s\" ", cls, morph);
-						memmove(wordStart+3+strlen(buf), wordStart+3, (to-wordStart)+1);
-						memcpy(wordStart+3, buf, strlen(buf));
-						to+=strlen(buf);
-					}
-				}
-				handled = true;
-			}
-
-			if (!keepToken) {	// if we don't want strongs
-				if (!handled) {
-					SWLog::systemlog->LogError("Unprocessed Token: <%s>", token);
-//					exit(-1);
-				}
-				if (strchr(" ,:;.?!()'\"", from[1])) {
-					if (lastspace)
-						to--;
-				}
-				if (newText) {textStart = from+1; newText = false; }
-//				if (newWord) {wordStart = to; newWord = false; }
-				continue;
-			}
-			// if not a strongs token, keep token in text
-			*to++ = '<';
-			for (char *tok = token; *tok; tok++)
-				*to++ = *tok;
-			*to++ = '>';
-			if (newText) {textStart = to; newWord = false; }
-//			if (newWord) {wordStart = to; newWord = false; }
-			continue;
-		}
-		if (intoken) {
-			if ((tokpos < 2045) && ((*from != 10)&&(*from != 13))) {
-				token[tokpos++] = *from;
-				token[tokpos+2] = 0;
-			}
-		}
-		else	{
-			if (newWord && (*from != ' ')) {wordStart = to; newWord = false; memset(to, 0, 10); }
-			if (!suspendTextPassThru) {
-				*to++ = *from;
-				lastspace = (*from == ' ');
-			}
-		}
-	}
-
-	VerseKey *vkey = SWDYNAMIC_CAST(VerseKey, key);
-	if (vkey) {
-		char ref[254];
-		if (vkey->Verse())
-			sprintf(ref, "<verse osisID=\"%s\">", vkey->getOSISRef());
-		else *ref = 0;
-		if (*ref) {
-			memmove(text+strlen(ref), text, maxlen-strlen(ref)-1);
-			memcpy(text, ref, strlen(ref));
-			to+=strlen(ref);
-			if (vkey->Verse()) {
-				VerseKey tmp;
-				tmp = *vkey;
-				tmp.AutoNormalize(0);
-				tmp.Headings(1);
-				sprintf(ref, "</verse>");
-				pushString(&to, ref);
-				tmp = MAXVERSE;
-				if (*vkey == tmp) {
-					tmp.Verse(0);
-//					sprintf(ref, "\t</div>");
-//					pushString(&to, ref);
-					tmp = MAXCHAPTER;
-					tmp = MAXVERSE;
-					if (*vkey == tmp) {
-						tmp.Chapter(0);
-						tmp.Verse(0);
-//						sprintf(ref, "\t</div>");
-//						pushString(&to, ref);
-					}
-				}
-			}
-
-//			else if (vkey->Chapter())
-//				sprintf(ref, "\t<div type=\"chapter\" osisID=\"%s\">", vkey->getOSISRef());
-//			else sprintf(ref, "\t<div type=\"book\" osisID=\"%s\">", vkey->getOSISRef());
-		}
-	}
-	*to++ = 0;
-	*to = 0;
-*/
-	return 0;
-}
-
-
-const char *ThMLOSIS::convertToOSIS(const char *inRef, const SWKey *key) {
-	static SWBuf outRef;
-
-	outRef = "";
-
-	VerseKey defLanguage;
-	ListKey verses = defLanguage.ParseVerseList(inRef, (*key), true);
-	const char *startFrag = inRef;
-	for (int i = 0; i < verses.Count(); i++) {
-		VerseKey *element = SWDYNAMIC_CAST(VerseKey, verses.GetElement(i));
-		char buf[5120];
-		char frag[5120];
-		if (element) {
-			memmove(frag, startFrag, ((const char *)element->userData - startFrag) + 1);
-			frag[((const char *)element->userData - startFrag) + 1] = 0;
-			startFrag = (const char *)element->userData + 1;
-			sprintf(buf, "<reference osisRef=\"%s-%s\">%s</reference>", element->LowerBound().getOSISRef(), element->UpperBound().getOSISRef(), frag);
-		}
-		else {
-			memmove(frag, startFrag, ((const char *)verses.GetElement(i)->userData - startFrag) + 1);
-			frag[((const char *)verses.GetElement(i)->userData - startFrag) + 1] = 0;
-			startFrag = (const char *)verses.GetElement(i)->userData + 1;
-			sprintf(buf, "<reference osisRef=\"%s\">%s</reference>", VerseKey(*verses.GetElement(i)).getOSISRef(), frag);
-		}
-		outRef+=buf;
-	}
-	return outRef.c_str();
-}
-
-SWORD_NAMESPACE_END
diff --git a/src/modules/filters/thmlplain.cpp b/src/modules/filters/thmlplain.cpp
deleted file mode 100644
index a04d6c3..0000000
--- a/src/modules/filters/thmlplain.cpp
+++ /dev/null
@@ -1,210 +0,0 @@
-/******************************************************************************
- *
- * thmlplain -	SWFilter descendant to strip out all ThML tags or convert to
- *		ASCII rendered symbols.
- */
-
-
-#include <stdlib.h>
-#include <thmlplain.h>
-
-SWORD_NAMESPACE_START
-
-ThMLPlain::ThMLPlain() {
-}
-
-char ThMLPlain::processText(SWBuf &text, const SWKey *key, const SWModule *module)
-{
-	char token[2048];
-	int tokpos = 0;
-	bool intoken = false;
-	bool ampersand = false;
-
-	const char *from;
-	SWBuf orig = text;
-	from = orig.c_str();
-	for (text = ""; *from; from++)
-	{
-		if (*from == 10 || *from == 13)
-			from++;
-		if (*from == '<') {
-			intoken = true;
-			tokpos = 0;
-			token[0] = 0;
-			token[1] = 0;
-			token[2] = 0;
-			ampersand = false;
-			continue;
-		}
-		else if (*from == '&') {
-			intoken = true;
-			tokpos = 0;
-			token[0] = 0;
-			token[1] = 0;
-			token[2] = 0;
-			ampersand = true;
-			continue;
-		}
-		if (*from == ';' && ampersand) {
-			intoken = false;
-
-			if (!strncmp("nbsp", token, 4)) text += ' ';
-			else if (!strncmp("quot", token, 4)) text += '"';
-			else if (!strncmp("amp", token, 3)) text += '&';
-			else if (!strncmp("lt", token, 2)) text += '<';
-			else if (!strncmp("gt", token, 2)) text += '>';
-			else if (!strncmp("brvbar", token, 6)) text += '|';
-			else if (!strncmp("sect", token, 4)) text += '§';
-			else if (!strncmp("copy", token, 4)) text += '©';
-			else if (!strncmp("laquo", token, 5)) text += '«';
-			else if (!strncmp("reg", token, 3)) text += '®';
-			else if (!strncmp("acute", token, 5)) text += '´';
-			else if (!strncmp("para", token, 4)) text += '¶';
-			else if (!strncmp("raquo", token, 5)) text += '»';
-
-			else if (!strncmp("Aacute", token, 6)) text += 'Á';
-			else if (!strncmp("Agrave", token, 6)) text += 'À';
-			else if (!strncmp("Acirc", token, 5)) text += 'Â';
-			else if (!strncmp("Auml", token, 4)) text += 'Ä';
-			else if (!strncmp("Atilde", token, 6)) text += 'Ã';
-			else if (!strncmp("Aring", token, 5)) text += 'Å';
-			else if (!strncmp("aacute", token, 6)) text += 'á';
-			else if (!strncmp("agrave", token, 6)) text += 'à';
-			else if (!strncmp("acirc", token, 5)) text += 'â';
-			else if (!strncmp("auml", token, 4)) text += 'ä';
-			else if (!strncmp("atilde", token, 6)) text += 'ã';
-			else if (!strncmp("aring", token, 5)) text += 'å';
-			else if (!strncmp("Eacute", token, 6)) text += 'É';
-			else if (!strncmp("Egrave", token, 6)) text += 'È';
-			else if (!strncmp("Ecirc", token, 5)) text += 'Ê';
-			else if (!strncmp("Euml", token, 4)) text += 'Ë';
-			else if (!strncmp("eacute", token, 6)) text += 'é';
-			else if (!strncmp("egrave", token, 6)) text += 'è';
-			else if (!strncmp("ecirc", token, 5)) text += 'ê';
-			else if (!strncmp("euml", token, 4)) text += 'ë';
-			else if (!strncmp("Iacute", token, 6)) text += 'Í';
-			else if (!strncmp("Igrave", token, 6)) text += 'Ì';
-			else if (!strncmp("Icirc", token, 5)) text += 'Î';
-			else if (!strncmp("Iuml", token, 4)) text += 'Ï';
-			else if (!strncmp("iacute", token, 6)) text += 'í';
-			else if (!strncmp("igrave", token, 6)) text += 'ì';
-			else if (!strncmp("icirc", token, 5)) text += 'î';
-			else if (!strncmp("iuml", token, 4)) text += 'ï';
-			else if (!strncmp("Oacute", token, 6)) text += 'Ó';
-			else if (!strncmp("Ograve", token, 6)) text += 'Ò';
-			else if (!strncmp("Ocirc", token, 5)) text += 'Ô';
-			else if (!strncmp("Ouml", token, 4)) text += 'Ö';
-			else if (!strncmp("Otilde", token, 6)) text += 'Õ';
-			else if (!strncmp("oacute", token, 6)) text += 'ó';
-			else if (!strncmp("ograve", token, 6)) text += 'ò';
-			else if (!strncmp("ocirc", token, 5)) text += 'ô';
-			else if (!strncmp("ouml", token, 4)) text += 'ö';
-			else if (!strncmp("otilde", token, 6)) text += 'õ';
-			else if (!strncmp("Uacute", token, 6)) text += 'Ú';
-			else if (!strncmp("Ugrave", token, 6)) text += 'Ù';
-			else if (!strncmp("Ucirc", token, 5)) text += 'Û';
-			else if (!strncmp("Uuml", token, 4)) text += 'Ü';
-			else if (!strncmp("uacute", token, 6)) text += 'ú';
-			else if (!strncmp("ugrave", token, 6)) text += 'ù';
-			else if (!strncmp("ucirc", token, 5)) text += 'û';
-			else if (!strncmp("uuml", token, 4)) text += 'ü';
-			else if (!strncmp("Yacute", token, 6)) text += 'Ý';
-			else if (!strncmp("yacute", token, 6)) text += 'ý';
-			else if (!strncmp("yuml", token, 4)) text += 'ÿ';
-
-			else if (!strncmp("deg", token, 3)) text += '°';
-			else if (!strncmp("plusmn", token, 6)) text += '±';
-			else if (!strncmp("sup2", token, 4)) text += '²';
-			else if (!strncmp("sup3", token, 4)) text += '³';
-			else if (!strncmp("sup1", token, 4)) text += '¹';
-			else if (!strncmp("nbsp", token, 4)) text += 'º';
-			else if (!strncmp("pound", token, 5)) text += '£';
-			else if (!strncmp("cent", token, 4)) text += '¢';
-			else if (!strncmp("frac14", token, 6)) text += '¼';
-			else if (!strncmp("frac12", token, 6)) text += '½';
-			else if (!strncmp("frac34", token, 6)) text += '¾';
-			else if (!strncmp("iquest", token, 6)) text += '¿';
-			else if (!strncmp("iexcl", token, 5)) text += '¡';
-			else if (!strncmp("ETH", token, 3)) text += 'Ð';
-			else if (!strncmp("eth", token, 3)) text += 'ð';
-			else if (!strncmp("THORN", token, 5)) text += 'Þ';
-			else if (!strncmp("thorn", token, 5)) text += 'þ';
-			else if (!strncmp("AElig", token, 5)) text += 'Æ';
-			else if (!strncmp("aelig", token, 5)) text += 'æ';
-			else if (!strncmp("Oslash", token, 6)) text += 'Ø';
-			else if (!strncmp("curren", token, 6)) text += '¤';
-			else if (!strncmp("Ccedil", token, 6)) text += 'Ç';
-			else if (!strncmp("ccedil", token, 6)) text += 'ç';
-			else if (!strncmp("szlig", token, 5)) text += 'ß';
-			else if (!strncmp("Ntilde", token, 6)) text += 'Ñ';
-			else if (!strncmp("ntilde", token, 6)) text += 'ñ';
-			else if (!strncmp("yen", token, 3)) text += '¥';
-			else if (!strncmp("not", token, 3)) text += '¬';
-			else if (!strncmp("ordf", token, 4)) text += 'ª';
-			else if (!strncmp("uml", token, 3)) text += '¨';
-			else if (!strncmp("shy", token, 3)) text += '­';
-			else if (!strncmp("macr", token, 4)) text += '¯';
-			continue;
-
-		}
-		else if (*from == '>' && !ampersand) {
-			intoken = false;
-			// process desired tokens
-			if (!strncmp(token, "sync type=\"Strongs\" value=\"", 27)) {
-				text += ' ';
-				text += '<';
-				for (unsigned int i = 27; token[i] != '\"'; i++)
-					text += token[i];
-				text += '>';
-				continue;
-			}
-			if (!strncmp(token, "sync type=\"morph\" value=\"", 25)) {
-				text += ' ';
-				text += '(';
-				for (unsigned int i = 25; token[i] != '\"'; i++)
-					text += token[i];
-				text += ')';
-				continue;
-			}
-			if (!strncmp("note", token, 4)) {
-				text += ' ';
-				text += '(';
-			}
-			else if (!strncmp("br", token, 2))
-				text += '\n';
-			else if (!strncmp("/p", token, 2))
-				text += '\n';
-			else if (!strncmp("/note", token, 5)) {
-				text += ')';
-				text += ' ';
-			}
-			continue;
-		}
-		if (intoken) {
-			if (tokpos < 2045)
-				token[tokpos++] = *from;
-				token[tokpos+2] = 0;
-		}
-		else	text += *from;
-	}
-
-	orig = text;
-	from = orig.c_str();
-	for (text = ""; *from; from++) {  //loop to remove extra spaces
-                if ((strchr(" \t\n\r", *from))) {
-                        while (*(from+1) && (strchr(" \t\n\r", *(from+1)))) {
-                                from++;
-                        }
-                        text += " ";
-                }
-                else {
-                        text += *from;
-                }
-        }
-        text += (char)0;
-
-	return 0;
-}
-
-
-SWORD_NAMESPACE_END
diff --git a/src/modules/filters/thmlrtf.cpp b/src/modules/filters/thmlrtf.cpp
deleted file mode 100644
index 4487921..0000000
--- a/src/modules/filters/thmlrtf.cpp
+++ /dev/null
@@ -1,314 +0,0 @@
-/***************************************************************************
-                     thmlrtf.cpp  -  ThML to RTF filter
-                             -------------------
-    begin                : 1999-10-27
-    copyright            : 2001 by CrossWire Bible Society
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include <stdlib.h>
-#include <thmlrtf.h>
-#include <swmodule.h>
-#include <utilxml.h>
-#include <versekey.h>
-
-SWORD_NAMESPACE_START
-
-ThMLRTF::ThMLRTF() {
-	setTokenStart("<");
-	setTokenEnd(">");
-
-	setEscapeStart("&");
-	setEscapeEnd(";");
-
-	setEscapeStringCaseSensitive(true);
-
-	addEscapeStringSubstitute("nbsp", " ");
-	addEscapeStringSubstitute("apos", "'");
-	addEscapeStringSubstitute("quot", "\"");
-	addEscapeStringSubstitute("amp", "&");
-	addEscapeStringSubstitute("lt", "<");
-	addEscapeStringSubstitute("gt", ">");
-	addEscapeStringSubstitute("brvbar", "|");
-	addEscapeStringSubstitute("sect", "§");
-	addEscapeStringSubstitute("copy", "©");
-	addEscapeStringSubstitute("laquo", "«");
-	addEscapeStringSubstitute("reg", "®");
-	addEscapeStringSubstitute("acute", "´");
-	addEscapeStringSubstitute("para", "¶");
-	addEscapeStringSubstitute("raquo", "»");
-
-	addEscapeStringSubstitute("Aacute", "Á");
-	addEscapeStringSubstitute("Agrave", "À");
-	addEscapeStringSubstitute("Acirc", "Â");
-	addEscapeStringSubstitute("Auml", "Ä");
-	addEscapeStringSubstitute("Atilde", "Ã");
-	addEscapeStringSubstitute("Aring", "Å");
-	addEscapeStringSubstitute("aacute", "á");
-	addEscapeStringSubstitute("agrave", "à");
-	addEscapeStringSubstitute("acirc", "â");
-	addEscapeStringSubstitute("auml", "ä");
-	addEscapeStringSubstitute("atilde", "ã");
-	addEscapeStringSubstitute("aring", "å");
-	addEscapeStringSubstitute("Eacute", "É");
-	addEscapeStringSubstitute("Egrave", "È");
-	addEscapeStringSubstitute("Ecirc", "Ê");
-	addEscapeStringSubstitute("Euml", "Ë");
-	addEscapeStringSubstitute("eacute", "é");
-	addEscapeStringSubstitute("egrave", "è");
-	addEscapeStringSubstitute("ecirc", "ê");
-	addEscapeStringSubstitute("euml", "ë");
-	addEscapeStringSubstitute("Iacute", "Í");
-	addEscapeStringSubstitute("Igrave", "Ì");
-	addEscapeStringSubstitute("Icirc", "Î");
-	addEscapeStringSubstitute("Iuml", "Ï");
-	addEscapeStringSubstitute("iacute", "í");
-	addEscapeStringSubstitute("igrave", "ì");
-	addEscapeStringSubstitute("icirc", "î");
-	addEscapeStringSubstitute("iuml", "ï");
-	addEscapeStringSubstitute("Oacute", "Ó");
-	addEscapeStringSubstitute("Ograve", "Ò");
-	addEscapeStringSubstitute("Ocirc", "Ô");
-	addEscapeStringSubstitute("Ouml", "Ö");
-	addEscapeStringSubstitute("Otilde", "Õ");
-	addEscapeStringSubstitute("oacute", "ó");
-	addEscapeStringSubstitute("ograve", "ò");
-	addEscapeStringSubstitute("ocirc", "ô");
-	addEscapeStringSubstitute("ouml", "ö");
-	addEscapeStringSubstitute("otilde", "õ");
-	addEscapeStringSubstitute("Uacute", "Ú");
-	addEscapeStringSubstitute("Ugrave", "Ù");
-	addEscapeStringSubstitute("Ucirc", "Û");
-	addEscapeStringSubstitute("Uuml", "Ü");
-	addEscapeStringSubstitute("uacute", "ú");
-	addEscapeStringSubstitute("ugrave", "ù");
-	addEscapeStringSubstitute("ucirc", "û");
-	addEscapeStringSubstitute("uuml", "ü");
-	addEscapeStringSubstitute("Yacute", "Ý");
-	addEscapeStringSubstitute("yacute", "ý");
-	addEscapeStringSubstitute("yuml", "ÿ");
-
-	addEscapeStringSubstitute("deg", "°");
-	addEscapeStringSubstitute("plusmn", "±");
-	addEscapeStringSubstitute("sup2", "²");
-	addEscapeStringSubstitute("sup3", "³");
-	addEscapeStringSubstitute("sup1", "¹");
-	addEscapeStringSubstitute("nbsp", "º");
-	addEscapeStringSubstitute("pound", "£");
-	addEscapeStringSubstitute("cent", "¢");
-	addEscapeStringSubstitute("frac14", "¼");
-	addEscapeStringSubstitute("frac12", "½");
-	addEscapeStringSubstitute("frac34", "¾");
-	addEscapeStringSubstitute("iquest", "¿");
-	addEscapeStringSubstitute("iexcl", "¡");
-	addEscapeStringSubstitute("ETH", "Ð");
-	addEscapeStringSubstitute("eth", "ð");
-	addEscapeStringSubstitute("THORN", "Þ");
-	addEscapeStringSubstitute("thorn", "þ");
-	addEscapeStringSubstitute("AElig", "Æ");
-	addEscapeStringSubstitute("aelig", "æ");
-	addEscapeStringSubstitute("Oslash", "Ø");
-	addEscapeStringSubstitute("curren", "¤");
-	addEscapeStringSubstitute("Ccedil", "Ç");
-	addEscapeStringSubstitute("ccedil", "ç");
-	addEscapeStringSubstitute("szlig", "ß");
-	addEscapeStringSubstitute("Ntilde", "Ñ");
-	addEscapeStringSubstitute("ntilde", "ñ");
-	addEscapeStringSubstitute("yen", "¥");
-	addEscapeStringSubstitute("not", "¬");
-	addEscapeStringSubstitute("ordf", "ª");
-	addEscapeStringSubstitute("uml", "¨");
-	addEscapeStringSubstitute("shy", "­");
-	addEscapeStringSubstitute("macr", "¯");
-
-	setTokenCaseSensitive(true);
-
-
-	addTokenSubstitute("br", "\\line ");
-	addTokenSubstitute("br /", "\\line ");
-	addTokenSubstitute("i", "{\\i1 ");
-	addTokenSubstitute("/i", "}");
-	addTokenSubstitute("b", "{\\b1 ");
-	addTokenSubstitute("/b", "}");
-	addTokenSubstitute("p", "\\par ");
-
-	//we need uppercase forms for the moment to support a few early ThML modules that aren't XHTML compliant
-	addTokenSubstitute("BR", "\\line ");
-	addTokenSubstitute("I", "{\\i1 ");
-	addTokenSubstitute("/I", "}");
-	addTokenSubstitute("B", "{\\b1 ");
-	addTokenSubstitute("/B", "}");
-	addTokenSubstitute("P", "\\par ");
-	addTokenSubstitute("scripture", "{\\i1 ");
-	addTokenSubstitute("/scripture", "}");
-}
-
-
-char ThMLRTF::processText(SWBuf &text, const SWKey *key, const SWModule *module) {
-	SWBasicFilter::processText(text, key, module);  //handle tokens as usual
-	const char *from;
-	SWBuf orig = text;
-	from = orig.c_str();
-	for (text = ""; *from; from++) {  //loop to remove extra spaces
-                if ((strchr(" \t\n\r", *from))) {
-                        while (*(from+1) && (strchr(" \t\n\r", *(from+1)))) {
-                                from++;
-                        }
-                        text += " ";
-                }
-			 else {
-                        text += *from;
-                }
-        }
-        text += (char)0;
-        return 0;
-}
-
-
-ThMLRTF::MyUserData::MyUserData(const SWModule *module, const SWKey *key) : BasicFilterUserData(module, key) {
-	if (module) {
-		version = module->Name();
-		BiblicalText = (!strcmp(module->Type(), "Biblical Texts"));
-	}	
-}
-
-
-bool ThMLRTF::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData) {
-	const char *tok;
-	if (!substituteToken(buf, token)) { // manually process if it wasn't a simple substitution
-		MyUserData *u = (MyUserData *)userData;		
-		XMLTag tag(token);
-		if ((!tag.isEndTag()) && (!tag.isEmpty()))
-			u->startTag = tag;
-		if (tag.getName() && !strcmp(tag.getName(), "sync")) {
-			SWBuf value = tag.getAttribute("value");
-			if (tag.getAttribute("type") && !strcmp(tag.getAttribute("type"), "morph")) { //&gt;
-				buf.appendFormatted(" {\\cf4 \\sub (%s)}", value.c_str());
-			}
-			else if( tag.getAttribute("type") && !strcmp(tag.getAttribute("type"), "Strongs")) {
-				if (value[0] == 'H' || value[0] == 'G' || value[0] == 'A') {
-					value<<1;
-					buf.appendFormatted(" {\\cf3 \\sub <%s>}", value.c_str());
-				}
-				else if (value[0] == 'T') {
-					value<<1;
-					buf.appendFormatted(" {\\cf4 \\sub (%s)}", value.c_str());
-				}
-			}
-			else if (tag.getAttribute("type") && !strcmp(tag.getAttribute("type"), "Dict")) {
-				if (!tag.isEndTag())
-					buf += "{\\b ";
-				else	buf += "}";
-			}
-		}
-		// <note> tag
-		else if (!strcmp(tag.getName(), "note")) {
-			if (!tag.isEndTag()) {
-				if (!tag.isEmpty()) {
-					SWBuf type = tag.getAttribute("type");
-					SWBuf footnoteNumber = tag.getAttribute("swordFootnote");
-					VerseKey *vkey;
-					// see if we have a VerseKey * or descendant
-					try {
-						vkey = SWDYNAMIC_CAST(VerseKey, u->key);
-					}
-					catch ( ... ) {	}
-					if (vkey) {
-						// leave this special osis type in for crossReference notes types?  Might thml use this some day? Doesn't hurt.
-						char ch = ((tag.getAttribute("type") && ((!strcmp(tag.getAttribute("type"), "crossReference")) || (!strcmp(tag.getAttribute("type"), "x-cross-ref")))) ? 'x':'n');
-						buf.appendFormatted("{\\super <a href=\"\">*%c%i.%s</a>} ", ch, vkey->Verse(), footnoteNumber.c_str());
-					}
-					u->suspendTextPassThru = true;
-				}
-			}
-			if (tag.isEndTag()) {
-				u->suspendTextPassThru = false;
-			}
-		}
-
-
-		else if (!strcmp(tag.getName(), "scripRef")) {
-			if (!tag.isEndTag()) {
-				if (!tag.isEmpty()) {
-					u->suspendTextPassThru = true;
-				}
-			}
-			if (tag.isEndTag()) {	//	</scripRef>
-				if (!u->BiblicalText) {
-					SWBuf refList = u->startTag.getAttribute("passage");
-					if (!refList.length())
-						refList = u->lastTextNode;
-					SWBuf version = tag.getAttribute("version");
-					buf += "<a href=\"\">";
-					buf += refList.c_str();
-//					buf += u->lastTextNode.c_str();
-					buf += "</a>";
-				}
-				else {
-					SWBuf footnoteNumber = u->startTag.getAttribute("swordFootnote");
-					VerseKey *vkey;
-					// see if we have a VerseKey * or descendant
-					try {
-						vkey = SWDYNAMIC_CAST(VerseKey, u->key);
-					}
-					catch ( ... ) {}
-					if (vkey) {
-						// leave this special osis type in for crossReference notes types?  Might thml use this some day? Doesn't hurt.
-						buf.appendFormatted("{\\super <a href=\"\">*x%i.%s</a>} ", vkey->Verse(), footnoteNumber.c_str());
-					}
-				}
-
-				// let's let text resume to output again
-				u->suspendTextPassThru = false;
-			}
-		}
-
-		else if (tag.getName() && !strcmp(tag.getName(), "div")) {
-			if (tag.isEndTag() && u->SecHead) {
-				buf += "\\par}";
-				u->SecHead = false;
-			}
-			else if (tag.getAttribute("class")) {
-				if (!stricmp(tag.getAttribute("class"), "sechead")) {
-					u->SecHead = true;
-					buf += "{\\par\\i1\\b1 ";
-				}
-				else if (!stricmp(tag.getAttribute("class"), "title")) {
-					u->SecHead = true;
-					buf += "{\\par\\i1\\b1 ";
-				}
-			}
-		}
-		else if (tag.getName() && (!strcmp(tag.getName(), "img") || !strcmp(tag.getName(), "image"))) {
-			const char *src = tag.getAttribute("src");
-			if (!src)		// assert we have a src attribute
-				return false;
-
-			char* filepath = new char[strlen(u->module->getConfigEntry("AbsoluteDataPath")) + strlen(token)];
-			*filepath = 0;
-			strcpy(filepath, userData->module->getConfigEntry("AbsoluteDataPath"));
-			strcat(filepath, src);
-
-// we do this because BibleCS looks for this EXACT format for an image tag
-			buf+="<img src=\"";
-			buf+=filepath;
-			buf+="\" />";
-			delete [] filepath;
-		}
-		else {
-			return false;  // we still didn't handle token
-		}
-	}
-	return true;
-}
-
-
-SWORD_NAMESPACE_END
diff --git a/src/modules/filters/thmlscripref.cpp b/src/modules/filters/thmlscripref.cpp
deleted file mode 100644
index 7b93f90..0000000
--- a/src/modules/filters/thmlscripref.cpp
+++ /dev/null
@@ -1,126 +0,0 @@
-/******************************************************************************
- *
- * thmlscripref -	SWFilter descendant to hide or show scripture
- *			referebces in a ThML module.
- */
-
-
-#include <stdlib.h>
-#include <thmlscripref.h>
-#include <utilxml.h>
-#include <versekey.h>
-#include <swmodule.h>
-#ifndef __GNUC__
-#else
-#include <unixstr.h>
-#endif
-
-SWORD_NAMESPACE_START
-
-const char oName[] = "Cross-references";
-const char oTip[] = "Toggles Scripture Cross-references On and Off if they exist";
-
-const SWBuf choices[3] = {"On", "Off", ""};
-const StringList oValues(&choices[0], &choices[2]);
-
-ThMLScripref::ThMLScripref() : SWOptionFilter(oName, oTip, &oValues) {
-	setOptionValue("On");
-}
-
-
-ThMLScripref::~ThMLScripref() {
-}
-
-
-char ThMLScripref::processText(SWBuf &text, const SWKey *key, const SWModule *module) {
-	SWBuf token;
-	bool intoken    = false;
-	bool hide       = false;
-	SWBuf tagText;
-	XMLTag startTag;
-	SWBuf refs = "";
-	int footnoteNum = 1;
-	char buf[254];
-	VerseKey parser = key->getText();
-
-	SWBuf orig = text;
-	const char *from = orig.c_str();
-
-	for (text = ""; *from; from++) {
-		if (*from == '<') {
-			intoken = true;
-			token = "";
-			continue;
-		}
-		if (*from == '>') {	// process tokens
-			intoken = false;
-
-			XMLTag tag(token);
-			if (!strcmp(tag.getName(), "scripRef")) {
-				if (!tag.isEndTag()) {
-					if (!tag.isEmpty()) {
-						refs = "";
-						startTag = tag;
-						hide = true;
-						tagText = "";
-						continue;
-					}
-				}
-				if (hide && tag.isEndTag()) {
-					if (module->isProcessEntryAttributes()) {
-						SWBuf fc = module->getEntryAttributes()["Footnote"]["count"]["value"];
-						footnoteNum = (fc.length()) ? atoi(fc.c_str()) : 0;
-						sprintf(buf, "%i", ++footnoteNum);
-						module->getEntryAttributes()["Footnote"]["count"]["value"] = buf;
-						StringList attributes = startTag.getAttributeNames();
-						for (StringList::iterator it = attributes.begin(); it != attributes.end(); it++) {
-							module->getEntryAttributes()["Footnote"][buf][it->c_str()] = startTag.getAttribute(it->c_str());
-						}
-						module->getEntryAttributes()["Footnote"][buf]["body"] = tagText;
-						startTag.setAttribute("swordFootnote", buf);
-						SWBuf passage = startTag.getAttribute("passage");
-						if (passage.length())
-							refs = parser.ParseVerseList(passage.c_str(), parser, true).getRangeText();
-						else	refs = parser.ParseVerseList(tagText.c_str(), parser, true).getRangeText();
-						module->getEntryAttributes()["Footnote"][buf]["refList"] = refs.c_str();
-					}
-					hide = false;
-					if (option) {	// we want the tag in the text
-						text += startTag;
-						text.append(tagText);
-					}
-					else	continue;
-				}
-			}
-
-			// if not a scripRef token, keep token in text
-			if ((!strcmp(tag.getName(), "scripRef")) && (!tag.isEndTag())) {
-				SWBuf osisRef = tag.getAttribute("passage");
-				if (refs.length())
-					refs += "; ";
-				refs += osisRef;
-			}
-			if (!hide) {
-				text += '<';
-				text.append(token);
-				text += '>';
-			}
-			else {
-				tagText += '<';
-				tagText.append(token);
-				tagText += '>';
-			}
-			continue;
-		}
-		if (intoken) { //copy token
-			token += *from;
-		}
-		else if (!hide) { //copy text which is not inside a token
-			text += *from;
-		}
-		else tagText += *from;
-	}
-	return 0;
-}
-
-SWORD_NAMESPACE_END
diff --git a/src/modules/filters/thmlstrongs.cpp b/src/modules/filters/thmlstrongs.cpp
deleted file mode 100644
index 4a53e25..0000000
--- a/src/modules/filters/thmlstrongs.cpp
+++ /dev/null
@@ -1,139 +0,0 @@
-/******************************************************************************
- *
- * thmlstrongs -	SWFilter descendant to hide or show strongs number
- *			in a ThML module.
- */
-
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <thmlstrongs.h>
-#include <swmodule.h>
-#ifndef __GNUC__
-#else
-#include <unixstr.h>
-#endif
-#include <ctype.h>
-
-SWORD_NAMESPACE_START
-
-const char oName[] = "Strong's Numbers";
-const char oTip[] = "Toggles Strong's Numbers On and Off if they exist";
-
-const SWBuf choices[3] = {"On", "Off", ""};
-const StringList oValues(&choices[0], &choices[2]);
-
-ThMLStrongs::ThMLStrongs() : SWOptionFilter(oName, oTip, &oValues) {
-	setOptionValue("Off");
-}
-
-
-ThMLStrongs::~ThMLStrongs() {
-}
-
-
-char ThMLStrongs::processText(SWBuf &text, const SWKey *key, const SWModule *module) {
-	char token[2048]; // cheese.  Fix.
-	const char *from;
-	int tokpos = 0;
-	bool intoken = false;
-	int len;
-	bool lastspace = false;
-	int word = 1;
-	char val[128];
-	char wordstr[5];
-	char *valto;
-	char *ch;
-	unsigned int textStart = 0, textEnd = 0;
-	SWBuf tmp;
-	bool newText = false;
-
-		SWBuf orig = text;
-		from = orig.c_str();
-
-		for (text = ""; *from; from++) {
-		if (*from == '<') {
-			intoken = true;
-			tokpos = 0;
-			token[0] = 0;
-			token[1] = 0;
-			token[2] = 0;
-			textEnd = text.length();
-			continue;
-		}
-		if (*from == '>') {	// process tokens
-			intoken = false;
-			if (!strnicmp(token, "sync type=\"Strongs\" ", 20)) {	// Strongs
-				if (module->isProcessEntryAttributes()) {
-					valto = val;
-					for (unsigned int i = 27; token[i] != '\"' && i < 150; i++)
-						*valto++ = token[i];
-					*valto = 0;
-					if (atoi((!isdigit(*val))?val+1:val) < 5627) {
-						// normal strongs number
-						sprintf(wordstr, "%03d", word++);
-						module->getEntryAttributes()["Word"][wordstr]["Strongs"] = val;
-						tmp = "";
-						tmp.append(text.c_str()+textStart, (int)(textEnd - textStart));
-						module->getEntryAttributes()["Word"][wordstr]["Text"] = tmp;
-						newText = true;
-					}
-					else {
-						// verb morph
-						sprintf(wordstr, "%03d", word-1);
-						module->getEntryAttributes()["Word"][wordstr]["Morph"] = val;
-					}
-				}
-
-				if (!option) {	// if we don't want strongs
-					if ((from[1] == ' ') || (from[1] == ',') || (from[1] == ';') || (from[1] == '.') || (from[1] == '?') || (from[1] == '!') || (from[1] == ')') || (from[1] == '\'') || (from[1] == '\"')) {
-						if (lastspace)
-							text--;
-					}
-					if (newText) {textStart = text.length(); newText = false; }
-					continue;
-				}
-			}
-			if (module->isProcessEntryAttributes()) {
-				if (!strncmp(token, "sync type=\"morph\"", 17)) {
-					for (ch = token+17; *ch; ch++) {
-						if (!strncmp(ch, "class=\"", 7)) {
-							valto = val;
-							for (unsigned int i = 7; ch[i] != '\"' && i < 127; i++)
-								*valto++ = ch[i];
-							*valto = 0;
-							sprintf(wordstr, "%03d", word-1);
-							module->getEntryAttributes()["Word"][wordstr]["MorphClass"] = val;
-						}
-						if (!strncmp(ch, "value=\"", 7)) {
-							valto = val;
-							for (unsigned int i = 7; ch[i] != '\"' && i < 127; i++)
-								*valto++ = ch[i];
-							*valto = 0;
-							sprintf(wordstr, "%03d", word-1);
-							module->getEntryAttributes()["Word"][wordstr]["Morph"] = val;
-						}
-					}
-				}
-			}
-			// if not a strongs token, keep token in text
-			text += '<';
-			text += token;
-			text += '>';
-			if (newText) {textStart = text.length(); newText = false; }
-			continue;
-		}
-		if (intoken) {
-			if (tokpos < 2045)
-				token[tokpos++] = *from;
-				token[tokpos+2] = 0;
-		}
-		else	{
-			text += *from;
-			lastspace = (*from == ' ');
-		}
-	}
-	return 0;
-}
-
-SWORD_NAMESPACE_END
diff --git a/src/modules/filters/thmlvariants.cpp b/src/modules/filters/thmlvariants.cpp
deleted file mode 100644
index b8ab653..0000000
--- a/src/modules/filters/thmlvariants.cpp
+++ /dev/null
@@ -1,112 +0,0 @@
-/******************************************************************************
- *
- * thmlvariants -	SWFilter descendant to hide or show textual variants
- *			in a ThML module.
- */
-
-
-#include <stdlib.h>
-#include <thmlvariants.h>
-#ifndef __GNUC__
-#else
-#include <unixstr.h>
-#endif
-
-SWORD_NAMESPACE_START
-
-const char ThMLVariants::primary[] = "Primary Reading";
-const char ThMLVariants::secondary[] = "Secondary Reading";
-const char ThMLVariants::all[] = "All Readings";
-
-const char ThMLVariants::optName[] = "Textual Variants";
-const char ThMLVariants::optTip[] = "Switch between Textual Variants modes";
-
-
-ThMLVariants::ThMLVariants() {
-	option = false;
-	options.push_back(primary);
-	options.push_back(secondary);
-	options.push_back(all);
-}
-
-
-ThMLVariants::~ThMLVariants() {
-}
-
-void ThMLVariants::setOptionValue(const char *ival)
-{
-	if (!stricmp(ival, primary)) option = 0;
-        else if (!stricmp(ival, secondary)) option = 1;
-        else option = 2;
-}
-
-const char *ThMLVariants::getOptionValue()
-{
-        if (option == 0) {
-	        return primary;
-	}
-	else if (option == 1) {
-	        return secondary;
-	}
-	else {
-	        return all;
-	}
-}
-
-char ThMLVariants::processText(SWBuf &text, const SWKey *key, const SWModule *module)
-{
-        if ( option == 0 || option == 1) { //we want primary or variant only
-		bool intoken = false;
-		bool hide = false;
-		
-		SWBuf token;
-		SWBuf orig = text;
-		const char *from = orig.c_str();
-
-		//we use a fixed comparision string to make sure the loop is as fast as the original two blocks with almost the same code
-		const char* variantCompareString = (option == 0) ? "div type=\"variant\" class=\"1\"" : "div type=\"variant\" class=\"2\"";
-		
-		for (text = ""; *from; from++) {
-			if (*from == '<') {
-				intoken = true;
-				token = "";
-				continue;
-			}
-			else if (*from == '>') {	// process tokens
-				intoken = false;
-				
-				if ( !strncmp(token.c_str(), variantCompareString, 28)) { //only one of the variants, length of the two strings is 28 in both cases 
-					hide = true;
-                                  	continue;
-				}
-				if (!hide) {
-					text += '<';
-					text.append(token);
-					text += '>';
-				}
-                                if (!strncmp(token.c_str(), "/div", 4)) {
-					hide = false;
-                                	continue;
-				}
-
-				continue;
-			}
-			if (intoken) {
-				token += *from;
-			}
-			else if (!hide) {
-				text += *from;
-			}
-		}
-
-	}
-
-	return 0;
-}
-
-
-
-
-
-
-SWORD_NAMESPACE_END
diff --git a/src/modules/filters/thmlwebif.cpp b/src/modules/filters/thmlwebif.cpp
deleted file mode 100644
index f082e1e..0000000
--- a/src/modules/filters/thmlwebif.cpp
+++ /dev/null
@@ -1,104 +0,0 @@
-/***************************************************************************
-                     ThMLWEBIF.cpp  -  ThML to HTML filter with hrefs
-                             -------------------
-    begin                    : 2001-09-03
-    copyright            : 2001 by CrossWire Bible Society
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include <stdlib.h>
-#include <thmlwebif.h>
-#include <swmodule.h>
-#include <utilweb.h>
-#include <utilxml.h>
-#include <ctype.h>
-
-SWORD_NAMESPACE_START
-
-ThMLWEBIF::ThMLWEBIF() : baseURL(""), passageStudyURL(baseURL + "passagestudy.jsp") {
-  //all's done in ThMLHTMLHREF
-}
-
-bool ThMLWEBIF::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData) {
-	const char *tok;
-
-	if (!substituteToken(buf, token)) { // manually process if it wasn't a simple substitution
-		MyUserData *u = (MyUserData *)userData;
-		XMLTag tag(token);
-		SWBuf url;
-		if (!strcmp(tag.getName(), "sync")) {
-			const char* value = tag.getAttribute("value");
-			url = value;
-			if ((url.length() > 1) && strchr("GH", url[0])) {
-				if (isdigit(url[1]))
-					url = url.c_str()+1;
-			}
-
-			if(tag.getAttribute("type") && !strcmp(tag.getAttribute("type"), "morph")){
-				buf += "<small><em> (";
-				buf.appendFormatted("<a href=\"%s?showMorph=%s#cv\">", passageStudyURL.c_str(), encodeURL(url).c_str() );
-			}
-			else {
-				if (value) {
-					value++; //skip leading G, H or T
-					//url = value;
-				}
-
-				buf += "<small><em> &lt;";
-				buf.appendFormatted("<a href=\"%s?showStrong=%s#cv\">", passageStudyURL.c_str(), encodeURL(url).c_str() );
-			}
-
-			buf += value;
-			buf += "</a>";
-
-			if (tag.getAttribute("type") && !strcmp(tag.getAttribute("type"), "morph")) {
-				buf += ") </em></small>";
-			}
-			else {
-				buf += "&gt; </em></small>";
-			}
-		}
-		else if (!strcmp(tag.getName(), "scripRef")) {
-			if (tag.isEndTag()) {
-				if (u->inscriptRef) { // like  "<scripRef passage="John 3:16">John 3:16</scripRef>"
-					u->inscriptRef = false;
-					buf += "</a>";
-				}
-				else { // end of scripRef like "<scripRef>John 3:16</scripRef>"
-					url = u->lastTextNode;
-					buf.appendFormatted("<a href=\"%s?key=%s#cv\">", passageStudyURL.c_str(), encodeURL(url).c_str());
-					buf += u->lastTextNode.c_str();
-					buf += "</a>";
-
-					// let's let text resume to output again
-					u->suspendTextPassThru = false;
-				}
-			}
-			else if (tag.getAttribute("passage")) { //passage given
-				u->inscriptRef = true;
-
-				buf.appendFormatted("<a href=\"%s?key=%s#cv\">", passageStudyURL.c_str(), encodeURL(tag.getAttribute("passage")).c_str());
-			}
-			else { //no passage given
-				u->inscriptRef = false;
-				// let's stop text from going to output
-				u->suspendTextPassThru = true;
-			}
-		}
-		else {
-			return ThMLHTMLHREF::handleToken(buf,token,userData);
-		}
-	}
-	return true;
-}
-
-
-SWORD_NAMESPACE_END
diff --git a/src/modules/filters/unicodertf.cpp b/src/modules/filters/unicodertf.cpp
deleted file mode 100644
index 0a2bca8..0000000
--- a/src/modules/filters/unicodertf.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-/******************************************************************************
- *
- * unicodertf -	SWFilter descendant to convert a double byte unicode file
- *				 to RTF tags
- */
-
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <unicodertf.h>
-
-SWORD_NAMESPACE_START
-
-UnicodeRTF::UnicodeRTF() {
-}
-
-
-char UnicodeRTF::processText(SWBuf &text, const SWKey *key, const SWModule *module)
-{
-	const unsigned char *from;
-	char digit[10];
-	unsigned long ch;
-        signed short utf16;
-	unsigned char from2[7];
-
-	SWBuf orig = text;
-
-	from = (const unsigned char *)orig.c_str();
-
-	// -------------------------------
-	for (text = ""; *from; from++) {
-		ch = 0;
-                //case: ANSI
-		if ((*from & 128) != 128) {
-			text += *from;
-			continue;
-		}
-                //case: Invalid UTF-8 (illegal continuing byte in initial position)
-		if ((*from & 128) && ((*from & 64) != 64)) {
-			continue;
-		}
-                //case: 2+ byte codepoint
-		from2[0] = *from;
-		from2[0] <<= 1;
-		int subsequent;
-		for (subsequent = 1; (from2[0] & 128) && (subsequent < 7); subsequent++) {
-			from2[0] <<= 1;
-			from2[subsequent] = from[subsequent];
-			from2[subsequent] &= 63;
-			ch <<= 6;
-			ch |= from2[subsequent];
-		}
-		subsequent--;
-		from2[0] <<= 1;
-		char significantFirstBits = 8 - (2+subsequent);
-		
-		ch |= (((short)from2[0]) << (((6*subsequent)+significantFirstBits)-8));
-		from += subsequent;
-                if (ch < 0x10000) {
-				utf16 = (signed short)ch;
-				text += '\\';
-				text += 'u';
-				sprintf(digit, "%d", utf16);
-				text += digit;
-				text += '?';
-			 }
-			else {
-				utf16 = (signed short)((ch - 0x10000) / 0x400 + 0xD800);
-				text += '\\';
-				text += 'u';
-				sprintf(digit, "%d", utf16);
-				text += digit;
-				text += '?';
-				utf16 = (signed short)((ch - 0x10000) % 0x400 + 0xDC00);
-				text += '\\';
-				text += 'u';
-				sprintf(digit, "%d", utf16);
-				text += digit;
-				text += '?';
-			}
-	}
-	   
-	return 0;
-}
-
-SWORD_NAMESPACE_END
diff --git a/src/modules/filters/utf16utf8.cpp b/src/modules/filters/utf16utf8.cpp
deleted file mode 100644
index ef1593b..0000000
--- a/src/modules/filters/utf16utf8.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-/******************************************************************************
- *
- * UTF16UTF8 -	SWFilter descendant to convert UTF-16 to UTF-8
- *
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-
-#include <utf16utf8.h>
-
-SWORD_NAMESPACE_START
-
-UTF16UTF8::UTF16UTF8() {
-}
-
-
-char UTF16UTF8::processText(SWBuf &text, const SWKey *key, const SWModule *module)
-{
-  unsigned short *from;
-
-  int len;
-  unsigned long uchar;
-  unsigned short schar;
-	 if ((unsigned long)key < 2)	// hack, we're en(1)/de(0)ciphering
-		return -1;
-
-  len = 0;
-  from = (unsigned short*) text.c_str();
-  while (*from) {
-        len += 2;
-        from++;
-  }
-
-	SWBuf orig = text;
-	from = (unsigned short*)orig.c_str();
-
-
-  // -------------------------------
-
-  for (text = ""; *from; from++) {
-    uchar = 0;
-
-    if (*from < 0xD800 || *from > 0xDFFF) {
-      uchar = *from;
-    }
-    else if (*from >= 0xD800 && *from <= 0xDBFF) {
-      uchar = *from;
-      schar = *(from+1);
-      if (uchar < 0xDC00 || uchar > 0xDFFF) {
-	//error, do nothing
-	continue;
-      }
-      uchar &= 0x03ff;
-      schar &= 0x03ff;
-      uchar <<= 10;
-      uchar |= schar;
-      uchar += 0x10000;
-      from++;
-    }
-    else {
-      //error, do nothing
-      continue;
-    }
-    
-    if (uchar < 0x80) { 
-      text += uchar;
-    }
-    else if (uchar < 0x800) { 
-      text += 0xc0 | (uchar >> 6); 
-      text += 0x80 | (uchar & 0x3f);
-    }
-    else if (uchar < 0x10000) {
-      text += 0xe0 | (uchar >> 12); 
-      text += 0x80 | (uchar >> 6) & 0x3f; 
-      text += 0x80 | uchar & 0x3f;
-    }
-    else if (uchar < 0x200000) {
-      text += 0xF0 | (uchar >> 18);
-      text += 0x80 | (uchar >> 12) & 0x3F; 
-      text += 0x80 | (uchar >> 6) & 0x3F; 
-      text += 0x80 | uchar & 0x3F;
-    }
-  }
-  
-  return 0;
-}
-
-
-
-
-SWORD_NAMESPACE_END
diff --git a/src/modules/filters/utf8arshaping.cpp b/src/modules/filters/utf8arshaping.cpp
deleted file mode 100644
index 3246adc..0000000
--- a/src/modules/filters/utf8arshaping.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/******************************************************************************
-*
-* utf8arshaping - SWFilter descendant to perform Arabic shaping on
-*                   UTF-8 text
-*/
-
-#ifdef _ICU_
-
-#include <stdlib.h>
-
-#ifdef __GNUC__
-#include <unixstr.h>
-#endif
-
-#include <utf8arshaping.h>
-
-SWORD_NAMESPACE_START
-
-UTF8arShaping::UTF8arShaping() {
-	conv = ucnv_open("UTF-8", &err);
-}
-
-UTF8arShaping::~UTF8arShaping() {
-        ucnv_close(conv);
-}
-
-char UTF8arShaping::processText(SWBuf &text, const SWKey *key, const SWModule *module)
-{
-        UChar *ustr, *ustr2;
-	 if ((unsigned long)key < 2)	// hack, we're en(1)/de(0)ciphering
-		return -1;
-
-        int32_t len = text.length();
-        ustr = new UChar[len];
-        ustr2 = new UChar[len];
-
-	// Convert UTF-8 string to UTF-16 (UChars)
-        len = ucnv_toUChars(conv, ustr, len, text.c_str(), -1, &err);
-
-        len = u_shapeArabic(ustr, len, ustr2, len, U_SHAPE_LETTERS_SHAPE | U_SHAPE_DIGITS_EN2AN, &err);
-
-	   text.setSize(text.size()*2);
-	   len = ucnv_fromUChars(conv, text.getRawData(), text.size(), ustr2, len, &err);
-	   text.setSize(len);
-
-        delete [] ustr2;
-        delete [] ustr;
-	return 0;
-}
-
-SWORD_NAMESPACE_END
-#endif
diff --git a/src/modules/filters/utf8bidireorder.cpp b/src/modules/filters/utf8bidireorder.cpp
deleted file mode 100644
index 902047a..0000000
--- a/src/modules/filters/utf8bidireorder.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-/******************************************************************************
-*
-* utf8cnormalizer - SWFilter descendant to perform reordering of UTF-8
-*                   text to visual order according to Unicode BiDi
-*/
-
-#ifdef _ICU_
-
-#include <stdlib.h>
-
-#ifdef __GNUC__
-#include <unixstr.h>
-#endif
-
-#include <utf8bidireorder.h>
-
-SWORD_NAMESPACE_START
-
-UTF8BiDiReorder::UTF8BiDiReorder() {
-
-        conv = ucnv_open("UTF-8", &err);
-
-}
-
-UTF8BiDiReorder::~UTF8BiDiReorder() {
-        ucnv_close(conv);
-}
-
-char UTF8BiDiReorder::processText(SWBuf &text, const SWKey *key, const SWModule *module)
-{
-        UChar *ustr, *ustr2;
-	if ((unsigned long)key < 2)	// hack, we're en(1)/de(0)ciphering
-		return -1;
-        
-        int32_t len = text.length();
-        ustr = new UChar[len]; //each char could become a surrogate pair
-
-	// Convert UTF-8 string to UTF-16 (UChars)
-        len = ucnv_toUChars(conv, ustr, len, text.c_str(), -1, &err);
-        ustr2 = new UChar[len];
-
-        UBiDi* bidi = ubidi_openSized(len + 1, 0, &err);
-        ubidi_setPara(bidi, ustr, len, UBIDI_DEFAULT_RTL, NULL, &err);
-        len = ubidi_writeReordered(bidi, ustr2, len,
-                UBIDI_DO_MIRRORING | UBIDI_REMOVE_BIDI_CONTROLS, &err);
-        ubidi_close(bidi);
-
-//        len = ubidi_writeReverse(ustr, len, ustr2, len,
-//                UBIDI_DO_MIRRORING | UBIDI_REMOVE_BIDI_CONTROLS, &err);
-
-	   text.setSize(text.size()*2);
-	   len = ucnv_fromUChars(conv, text.getRawData(), text.size(), ustr2, len, &err);
-	   text.setSize(len);
-
-        delete [] ustr2;
-        delete [] ustr;
-	return 0;
-}
-
-SWORD_NAMESPACE_END
-#endif
diff --git a/src/modules/filters/utf8cantillation.cpp b/src/modules/filters/utf8cantillation.cpp
deleted file mode 100644
index 6213620..0000000
--- a/src/modules/filters/utf8cantillation.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-/******************************************************************************
- *
- * UTF8Cantillation - SWFilter descendant to remove UTF-8 Hebrew cantillation
- *
- */
-
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <utf8cantillation.h>
-
-SWORD_NAMESPACE_START
-
-const char oName[] = "Hebrew Cantillation";
-const char oTip[] = "Toggles Hebrew Cantillation Marks";
-
-const SWBuf choices[3] = {"On", "Off", ""};
-const StringList oValues(&choices[0], &choices[2]);
-
-UTF8Cantillation::UTF8Cantillation() : SWOptionFilter(oName, oTip, &oValues) {
-	setOptionValue("Off");
-}
-
-
-UTF8Cantillation::~UTF8Cantillation(){};
-
-
-char UTF8Cantillation::processText(SWBuf &text, const SWKey *key, const SWModule *module) {
-	if (!option) {
-		//The UTF-8 range 0xD6 0x90 to 0xD6 0xAF and 0xD7 0x84 consist of Hebrew cantillation marks so block those out.
-		SWBuf orig = text;
-		const unsigned char* from = (unsigned char*)orig.c_str();
-		for (text = ""; *from; from++) {
-			if (*from != 0xD6) {
-				if (*from == 0xD7 && *(from + 1) == 0x84) {
-					from++;
-				}
-				else {
-					text += *from;
-				}
-			}
-			else if (*(from + 1) < 0x90 || *(from + 1) > 0xAF) {
-				text += *from;
-				from++;
-				text += *from;
-			}
-			else {
-				from++;
-			}
-		}
-	}
-	return 0;
-}
-
-SWORD_NAMESPACE_END
diff --git a/src/modules/filters/utf8greekaccents.cpp b/src/modules/filters/utf8greekaccents.cpp
deleted file mode 100644
index 05ef59b..0000000
--- a/src/modules/filters/utf8greekaccents.cpp
+++ /dev/null
@@ -1,249 +0,0 @@
-/******************************************************************************
- *
- * UTF8GreekAccents - SWFilter descendant to remove UTF-8 Greek accents
- *
- */
-
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <utf8greekaccents.h>
-
-SWORD_NAMESPACE_START
-
-const char oName[] = "Greek Accents";
-const char oTip[] = "Toggles Greek Accents";
-
-const SWBuf choices[3] = {"On", "Off", ""};
-const StringList oValues(&choices[0], &choices[2]);
-
-UTF8GreekAccents::UTF8GreekAccents() : SWOptionFilter(oName, oTip, &oValues) {
-	setOptionValue("On");
-}
-
-UTF8GreekAccents::~UTF8GreekAccents(){};
-
-
-char UTF8GreekAccents::processText(SWBuf &text, const SWKey *key, const SWModule *module) {
-
-	if (!option) { //we don't want greek accents
-    		//unsigned char *to, *from;
-		//to = (unsigned char*)text;
-		//for (from = (unsigned char*)text; *from; from++) {
-		
-		SWBuf orig = text;
-		const unsigned char* from = (unsigned char*)orig.c_str();
-		for (text = ""; *from; from++) {		
-			//first just remove combining characters
-			if (*from == 0xE2 && *(from + 1) == 0x80 && *(from + 2) == 0x99) {
-				from += 2;
-			}
-			else if (*from == 0xCC && *(from + 1)) {
-				if (*(from + 1) == 0x80 || *(from + 1) == 0x81 || *(from + 1) == 0x82 || *(from + 1) == 0x88 || *(from + 1) == 0x93 || *(from + 1) == 0x94) {
-					from++;
-				}
-			}
-			else if (*from == 0xCD && *(from + 1) == 0xBA) {
-				from++;
-			}
-			//now converted pre-composed characters to their alphabetic bases, discarding the accents
-
-			//Greek
-			//capital alpha
-			else if ((*from == 0xCE && *(from + 1) == 0x86)) {
-				text += 0xCE;
-				text += 0x91;
-				from++;
-			}
-			//capital epsilon
-			else if ((*from == 0xCE && *(from + 1) == 0x88)) {
-				text += 0xCE;
-				text += 0x95;
-				from++;
-			}
-			//capital eta
-			else if ((*from == 0xCE && *(from + 1) == 0x89)) {
-				text += 0xCE;
-				text += 0x97;
-				from++;
-			}
-			//capital iota
-			else if ((*from == 0xCE && (*(from + 1) == 0x8A || *(from + 1) == 0xAA))) {
-				text += 0xCE;
-				text += 0x99;
-				from++;
-			}
-			//capital omicron
-			else if ((*from == 0xCE && *(from + 1) == 0x8C)) {
-				text += 0xCE;
-				text += 0x9F;
-				from++;
-			}
-			//capital upsilon
-			else if ((*from == 0xCE && (*(from + 1) == 0x8E || *(from + 1) == 0xAB))) {
-				text += 0xCE;
-				text += 0xA5;
-				from++;
-			}
-			//capital omega
-			else if ((*from == 0xCE && *(from + 1) == 0x8F)) {
-				text += 0xCE;
-				text += 0xA9;
-				from++;
-			}
-
-			//alpha
-			else if ((*from == 0xCE && *(from + 1) == 0xAC)) {
-				text += 0xCE;
-				text += 0xB1;
-				from++;
-			}
-			//epsilon
-			else if ((*from == 0xCE && *(from + 1) == 0xAD)) {
-				text += 0xCE;
-				text += 0xB5;
-				from++;
-			}
-			//eta
-			else if ((*from == 0xCE && *(from + 1) == 0xAE)) {
-				text += 0xCE;
-				text += 0xB7;
-				from++;
-			}
-			//iota
-			else if ((*from == 0xCE && *(from + 1) == 0xAF) || (*from == 0xCF && *(from + 1) == 0x8A)) {
-				text += 0xCE;
-				text += 0xB9;
-				from++;
-			}
-			//omicron
-			else if ((*from == 0xCF && *(from + 1) == 0x8C)) {
-				text += 0xCE;
-				text += 0xBF;
-				from++;
-			}
-			//upsilon
-			else if ((*from == 0xCE && *(from + 1) == 0x88) || (*from == 0xCF && (*(from + 1) == 0x8B || *(from + 1) == 0x8D))) {
-				text += 0xCF;
-				text += 0x85;
-				from++;
-			}
-			//omega
-			else if ((*from == 0xCF && *(from + 1) == 0x8E)) {
-				text += 0xCF;
-				text += 0x89;
-				from++;
-			}
-
-			//Extended Greek
-			//capital alpha
-			else if (*from == 0xE1 && ((*(from + 1) == 0xBC || *(from + 1) == 0xBE) && *(from + 2) >= 0x88 && *(from + 2) <= 0x8F) || (*(from + 1) == 0xBE && *(from + 2) >= 0xB8 && *(from + 2) <= 0xBC)) {
-				text += 0xCE;
-				text += 0x91;
-				from+=2;
-			}
-			//capital epsilon
-			else if (*from == 0xE1 && ((*(from + 1) == 0xBC && *(from + 2) >= 0x98 && *(from + 2) <= 0x9D) || (*(from + 1) == 0xBF && (*(from + 2) == 0x88 || *(from + 2) == 0x89)))) {
-				text += 0xCE;
-				text += 0x95;
-				from+=2;
-			}
-			//capital eta
-			else if (*from == 0xE1 && ((*(from + 1) == 0xBC && *(from + 2) >= 0xA8 && *(from + 2) <= 0xAF) || (*(from + 1) == 0xBE && *(from + 2) >= 0x98 && *(from + 2) <= 0x9F) || (*(from + 1) == 0xBF && *(from + 2) >= 0x8A && *(from + 2) <= 0x8C))) {
-				text += 0xCE;
-				text += 0x97;
-				from+=2;
-			}
-			//capital iota
-			else if (*from == 0xE1 && ((*(from + 1) == 0xBC && *(from + 2) >= 0xB8 && *(from + 2) <= 0xBF) || (*(from + 1) == 0xBF && *(from + 2) >= 0x98 && *(from + 2) <= 0x9B))) {
-				text += 0xCE;
-				text += 0x99;
-				from+=2;
-			}
-			//capital omicron
-			else if (*from == 0xE1 && ((*(from + 1) == 0xBD && *(from + 2) >= 0x88 && *(from + 2) <= 0x8D) || (*(from + 1) == 0xBF && *(from + 2) == 0xB8 || *(from + 2) == 0xB9))) {
-				text += 0xCE;
-				text += 0x9F;
-				from+=2;
-			}
-			//capital upsilon
-			else if (*from == 0xE1 && ((*(from + 1) == 0xBD && *(from + 2) >= 0x99 && *(from + 2) <= 0x9F) || (*(from + 1) == 0xBF && *(from + 2) >= 0xA8 && *(from + 2) <= 0xAB))) {
-				text += 0xCE;
-				text += 0xA5;
-				from+=2;
-			}
-			//capital omega
-			else if (*from == 0xE1 && (((*(from + 1) == 0xBD || *(from + 1) == 0xBE) && *(from + 2) >= 0xA8 && *(from + 2) <= 0xAF) || (*(from + 1) == 0xBF && *(from + 2) >= 0xBA && *(from + 2) <= 0xBC))) {
-				text += 0xCE;
-				text += 0xA9;
-				from+=2;
-			}
-			//capital rho
-			else if (*from == 0xE1 && *(from + 1) == 0xBF && *(from + 2) == 0xAC) {
-				text += 0xCE;
-				text += 0xA1;
-				from+=2;
-			}
-
-			//alpha
-			else if (*from == 0xE1 && ((*(from + 1) == 0xBC || *(from + 1) == 0xBE) && *(from + 2) >= 0x80 && *(from + 2) <= 0x87) || (*(from + 1) == 0xBD && (*(from + 2) == 0xB0 || *(from + 2) == 0xB1)) || (*(from + 1) == 0xBE && *(from + 2) >= 0xB0 && *(from + 2) <= 0xB7)) {
-				text += 0xCE;
-				text += 0xB1;
-				from+=2;
-			}
-			//epsilon
-			else if (*from == 0xE1 && ((*(from + 1) == 0xBC && *(from + 2) >= 0x90 && *(from + 2) <= 0x95) || (*(from + 1) == 0xBD && (*(from + 2) == 0xB2 || *(from + 2) == 0xB3)))) {
-				text += 0xCE;
-				text += 0xB5;
-				from+=2;
-			}
-			//eta
-			else if (*from == 0xE1 && ((*(from + 1) == 0xBE && *(from + 2) >= 0x90 && *(from + 2) <= 0x97) || (*(from + 1) == 0xBC && *(from + 2) >= 0xA0 && *(from + 2) <= 0xA7) || (*(from + 1) == 0xBF && *(from + 2) >= 0x82 && *(from + 2) <= 0x87) || (*(from + 1) == 0xBD && (*(from + 2) == 0xB4 || *(from + 2) == 0xB5)))) {
-				text += 0xCE;
-				text += 0xB7;
-				from+=2;
-			}
-			//iota
-			else if (*from == 0xE1 && ((*(from + 1) == 0xBC && *(from + 2) >= 0xB0 && *(from + 2) <= 0xB7) || (*(from + 1) == 0xBD && (*(from + 2) == 0xB6 || *(from + 2) == 0xB7)) || (*(from + 1) == 0xBF && *(from + 2) >= 0x90 && *(from + 2) <= 0x97))) {
-				text += 0xCE;
-				text += 0xB9;
-				from+=2;
-			}
-			//omicron
-			else if (*from == 0xE1 && (*(from + 1) == 0xBD && ((*(from + 2) >= 0x80 && *(from + 2) <= 0x85) || (*(from + 2) == 0xB8 || *(from + 2) == 0xB9)))) {
-				text += 0xCE;
-				text += 0xBF;
-				from+=2;
-			}
-			//upsilon
-			else if (*from == 0xE1 && ((*(from + 1) == 0xBD && ((*(from + 2) >= 0x90 && *(from + 2) <= 0x97) || *(from + 2) == 0xBA || *(from + 2) == 0xBB)) || (*(from + 1) == 0xBF && ((*(from + 2) >= 0xA0 && *(from + 2) <= 0xA3) || *(from + 2) == 0xA6 || *(from + 2) == 0xA7)))) {
-				text += 0xCF;
-				text += 0x85;
-				from+=2;
-			}
-			//omega
-			else if (*from == 0xE1 && ((*(from + 1) == 0xBD && ((*(from + 2) >= 0xA0 && *(from + 2) <= 0xA7) || (*(from + 2) == 0xBC || *(from + 2) == 0xBD))) || (*(from + 1) == 0xBE && (*(from + 2) >= 0xA0 && *(from + 2) <= 0xA7)) || (*(from + 1) == 0xBF && *(from + 2) >= 0xB2 && *(from + 2) <= 0xB7))) {
-				text += 0xCF;
-				text += 0x89;
-				from+=2;
-			}
-			//rho
-			else if (*from == 0xE1 && *(from + 1) == 0xBF && (*(from + 2) == 0xA4 && *(from + 2) == 0xA5)) {
-				text += 0xCF;
-				text += 0x81;
-				from+=2;
-			}
-			else { //no characters we filter
-				text += *from;
-			}
-		}
-	}
-	return 0;
-}
-
-
-
-
-
-
-SWORD_NAMESPACE_END
diff --git a/src/modules/filters/utf8hebrewpoints.cpp b/src/modules/filters/utf8hebrewpoints.cpp
deleted file mode 100644
index 0476db8..0000000
--- a/src/modules/filters/utf8hebrewpoints.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-/******************************************************************************
- *
- * UTF8HebrewPoints - SWFilter descendant to remove UTF-8 Hebrew vowel points
- *
- */
-
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <utf8hebrewpoints.h>
-
-SWORD_NAMESPACE_START
-
-const char oName[] = "Hebrew Vowel Points";
-const char oTip[] = "Toggles Hebrew Vowel Points";
-
-const SWBuf choices[3] = {"On", "Off", ""};
-const StringList oValues(&choices[0], &choices[2]);
-
-UTF8HebrewPoints::UTF8HebrewPoints() : SWOptionFilter(oName, oTip, &oValues) {
-	setOptionValue("On");
-}
-
-UTF8HebrewPoints::~UTF8HebrewPoints(){};
-
-
-char UTF8HebrewPoints::processText(SWBuf &text, const SWKey *key, const SWModule *module) {
-	if (!option) {
-		//The UTF-8 range 0xD6 0xB0 to 0xD6 0xBF excluding 0xD6 0x consist of Hebrew cantillation marks so block those out.
-		SWBuf orig = text;
-		const unsigned char* from = (unsigned char*)orig.c_str();
-		for (text = ""; *from; from++) {
-			if ((*from == 0xD6) && (*(from + 1) >= 0xB0 && *(from + 1) <= 0xBF) && (*(from + 1) != 0xBE)) {
-				from++;
-			}
-			else {
-     			        text += *from;
-                        }
-		}
-     	}
-	return 0;
-}
-
-SWORD_NAMESPACE_END
diff --git a/src/modules/filters/utf8html.cpp b/src/modules/filters/utf8html.cpp
deleted file mode 100644
index 94fbdc1..0000000
--- a/src/modules/filters/utf8html.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-/******************************************************************************
- *
- * utf8html -	SWFilter descendant to convert a UTF-8 stream to HTML escapes
- *
- */
-
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <utf8html.h>
-
-SWORD_NAMESPACE_START
-
-UTF8HTML::UTF8HTML() {
-}
-
-
-char UTF8HTML::processText(SWBuf &text, const SWKey *key, const SWModule *module)
-{
-	unsigned char *from;
-	int len;
-        char digit[10];
-        unsigned long ch;
-	 if ((unsigned long)key < 2)	// hack, we're en(1)/de(0)ciphering
-		return -1;
-
-	len = strlenw(text.c_str()) + 2;						// shift string to right of buffer
-
-	SWBuf orig = text;
-  	from = (unsigned char *)orig.c_str();
-
-	// -------------------------------
-	for (text = ""; *from; from++) {
-	  ch = 0;
-          if ((*from & 128) != 128) {
-//          	if (*from != ' ')
-	       text += *from;
-               continue;
-          }
-          if ((*from & 128) && ((*from & 64) != 64)) {
-	    // error
-               *from = 'x';
-               continue;
-          }
-          *from <<= 1;
-          int subsequent;
-          for (subsequent = 1; (*from & 128); subsequent++) {
-          	*from <<= 1;
-               from[subsequent] &= 63;
-               ch <<= 6;
-               ch |= from[subsequent];
-          }
-          subsequent--;
-          *from <<=1;
-          char significantFirstBits = 8 - (2+subsequent);
-          
-          ch |= (((short)*from) << (((6*subsequent)+significantFirstBits)-8));
-          from += subsequent;
-          text += '&';
-          text += '#';
-	  sprintf(digit, "%d", ch);
-		for (char *dig = digit; *dig; dig++)
-			text += *dig;
-		text += ';';
-	}
-	return 0;
-}
-
-SWORD_NAMESPACE_END
diff --git a/src/modules/filters/utf8latin1.cpp b/src/modules/filters/utf8latin1.cpp
deleted file mode 100644
index 6ab4c9c..0000000
--- a/src/modules/filters/utf8latin1.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-/******************************************************************************
- *
- * UTF8Latin1 -	SWFilter descendant to convert UTF-8 to Latin-1
- *
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-
-#include <utf8latin1.h>
-
-SWORD_NAMESPACE_START
-
-UTF8Latin1::UTF8Latin1(char rchar) : replacementChar(rchar) {
-}
-
-
-char UTF8Latin1::processText(SWBuf &text, const SWKey *key, const SWModule *module)
-{
-  unsigned char *from;
-
-  int len;
-  unsigned long uchar;
-  unsigned char significantFirstBits, subsequent;
-  
-  if ((unsigned long)key < 2) {// hack, we're en(1)/de(0)ciphering
-	return -1;
-  }
-  len = strlen(text.c_str()) + 1;						// shift string to right of buffer
-
-  SWBuf orig = text;
-  from = (unsigned char*)orig.c_str();
-
-  
-  // -------------------------------
-  
-  for (text = ""; *from; from++) {
-    uchar = 0;
-    if ((*from & 128) != 128) {
-      //          	if (*from != ' ')
-      uchar = *from;
-    }
-    else if ((*from & 128) && ((*from & 64) != 64)) {
-      // error, do nothing
-      continue;
-    }
-    else {
-      *from <<= 1;
-      for (subsequent = 1; (*from & 128); subsequent++) {
-	*from <<= 1;
-	from[subsequent] &= 63;
-	uchar <<= 6;
-	uchar |= from[subsequent];
-      }
-      subsequent--;
-      *from <<=1;
-      significantFirstBits = 8 - (2+subsequent);
-      
-      uchar |= (((short)*from) << (((6*subsequent)+significantFirstBits)-8));
-      from += subsequent;
-    }
-
-    if (uchar < 0xff) {
-        text += (unsigned char)uchar;
-    }
-    else {
-        text += replacementChar;
-    }
-  }
-  return 0;
-}
-
-SWORD_NAMESPACE_END
-
diff --git a/src/modules/filters/utf8nfc.cpp b/src/modules/filters/utf8nfc.cpp
deleted file mode 100644
index 5500224..0000000
--- a/src/modules/filters/utf8nfc.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-/******************************************************************************
-*
-* utf8nfc - SWFilter descendant to perform NFC (canonical composition
-*                   normalization) on UTF-8 text
-*/
-
-#ifdef _ICU_
-
-#include <stdlib.h>
-
-#ifdef __GNUC__
-#include <unixstr.h>
-#endif
-
-#include <utf8nfc.h>
-
-SWORD_NAMESPACE_START
-
-UTF8NFC::UTF8NFC() {
-        conv = ucnv_open("UTF-8", &err);
-}
-
-UTF8NFC::~UTF8NFC() {
-         ucnv_close(conv);
-}
-
-char UTF8NFC::processText(SWBuf &text, const SWKey *key, const SWModule *module)
-{
-	 if ((unsigned long)key < 2)	// hack, we're en(1)/de(0)ciphering
-		return -1;
-        
-	int32_t len = text.length() * 2;
-        source = new UChar[len + 1]; //each char could become a surrogate pair
-
-	// Convert UTF-8 string to UTF-16 (UChars)
-        len = ucnv_toUChars(conv, source, len, text.c_str(), -1, &err);
-        target = new UChar[len + 1];
-
-        //canonical composition
-        unorm_normalize(source, len, UNORM_NFC, 0, target, len, &err);
-
-	   text.setSize(text.size()*2);
-	   len = ucnv_fromUChars(conv, text.getRawData(), text.size(), target, -1, &err);
-	   text.setSize(len);
-
-        delete [] source;
-        delete [] target;
-
-	return 0;
-}
-
-SWORD_NAMESPACE_END
-#endif
diff --git a/src/modules/filters/utf8nfkd.cpp b/src/modules/filters/utf8nfkd.cpp
deleted file mode 100644
index 6da24f8..0000000
--- a/src/modules/filters/utf8nfkd.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-/******************************************************************************
-*
-* utf8nfkd - SWFilter descendant to perform NFKD (compatability decomposition
-*                   normalization) on UTF-8 text
-*/
-
-#ifdef _ICU_
-
-#include <stdlib.h>
-
-#ifdef __GNUC__
-#include <unixstr.h>
-#endif
-
-#include <utf8nfkd.h>
-
-SWORD_NAMESPACE_START
-
-UTF8NFKD::UTF8NFKD() {
-        conv = ucnv_open("UTF-8", &err);
-}
-
-UTF8NFKD::~UTF8NFKD() {
-         ucnv_close(conv);
-}
-
-char UTF8NFKD::processText(SWBuf &text, const SWKey *key, const SWModule *module)
-{
-	if ((unsigned long)key < 2)	// hack, we're en(1)/de(0)ciphering
-		return -1;
-        
-	int32_t len = text.length() * 2;
-        source = new UChar[len + 1]; //each char could become a surrogate pair
-
-	// Convert UTF-8 string to UTF-16 (UChars)
-        len = ucnv_toUChars(conv, source, len, text.c_str(), -1, &err);
-        target = new UChar[len + 1];
-
-        //compatability decomposition
-        unorm_normalize(source, len, UNORM_NFKD, 0, target, len, &err);
-
-	   text.setSize(text.size()*2);
-	   len = ucnv_fromUChars(conv, text.getRawData(), text.size(), target, -1, &err);
-	   text.setSize(len);
-
-	   delete [] source;
-	   delete [] target;
-
-	return 0;
-}
-
-SWORD_NAMESPACE_END
-#endif
diff --git a/src/modules/filters/utf8transliterator.cpp b/src/modules/filters/utf8transliterator.cpp
deleted file mode 100644
index b753c0c..0000000
--- a/src/modules/filters/utf8transliterator.cpp
+++ /dev/null
@@ -1,889 +0,0 @@
-/******************************************************************************
-*
-* utf8transliterators - SWFilter descendant to transliterate between
-*			 ICU-supported scripts.
-*/
-
-#ifdef _ICU_
-
-#include <stdlib.h>
-
-#ifdef __GNUC__
-#include <unixstr.h>
-#endif
-
-#include <unicode/ucnv.h>
-#include <unicode/uchar.h>
-#include <utf8transliterator.h>
-
-#ifndef _ICUSWORD_
-#include "unicode/resbund.h"
-#endif
-#include <swlog.h>
-
-SWORD_NAMESPACE_START
-
-const char UTF8Transliterator::optionstring[NUMTARGETSCRIPTS][16] = {
-        "Off",
-        "Latin",
-        "IPA",
-        "Basic Latin",
-        "SBL",
-        "TC",
-        "Beta",
-        "BGreek",
-        "SERA",
-        "Hugoye",
-        "UNGEGN",
-        "ISO",
-        "ALA-LC",
-        "BGN-PCGN",
-        "Greek",
-        "Hebrew",
-        "Cyrillic",
-        "Arabic",
-        "Syriac",
-        "Katakana",
-        "Hiragana",
-        "Hangul",
-        "Devanagari",
-        "Tamil",
-        "Bengali",
-        "Gurmukhi",
-        "Gujarati",
-        "Oriya",
-        "Telugu",
-        "Kannada",
-        "Malayalam",
-        "Thai",
-        "Georgian",
-        "Armenian",
-        "Ethiopic",
-        "Gothic",
-        "Ugaritic",
-        "Coptic",
-        "Meroitic",
-        "Linear B",
-        "Cypriot",
-        "Runic",
-        "Ogham",
-        "Thaana",
-	"Glagolitic",
-        "Tengwar",
-        "Cirth"
-};
-
-const char UTF8Transliterator::optName[] = "Transliteration";
-const char UTF8Transliterator::optTip[] = "Transliterates between scripts";
-
-SWTransMap UTF8Transliterator::transMap;
-
-#ifndef _ICUSWORD_
-
-const char UTF8Transliterator::SW_RB_RULE_BASED_IDS[] = "RuleBasedTransliteratorIDs";
-const char UTF8Transliterator::SW_RB_RULE[] = "Rule";
-#ifdef SWICU_DATA
-const char UTF8Transliterator::SW_RESDATA[] = SWICU_DATA;
-#else
-const char UTF8Transliterator::SW_RESDATA[] = "/usr/local/lib/sword/";
-#endif
-
-class SWCharString {
- public:
-    inline SWCharString(const UnicodeString& str);
-    inline ~SWCharString();
-    inline operator const char*() { return ptr; }
- private:
-    char buf[128];
-    char* ptr;
-};
-SWCharString::SWCharString(const UnicodeString& str) {
-    // TODO This isn't quite right -- we should probably do
-    // preflighting here to determine the real length.
-    if (str.length() >= (int32_t)sizeof(buf)) {
-        ptr = new char[str.length() + 8];
-    } else {
-        ptr = buf;
-    }
-    str.extract(0, 0x7FFFFFFF, ptr, "");
-}
-
-SWCharString::~SWCharString() {
-    if (ptr != buf) {
-        delete[] ptr;
-    }
-}
-
-#endif // _ICUSWORD_
-
-
-UTF8Transliterator::UTF8Transliterator() {
-	option = 0;
-        unsigned long i;
-	for (i = 0; i < NUMTARGETSCRIPTS; i++) {
-		options.push_back(optionstring[i]);
-	}
-#ifndef _ICUSWORD_
-	utf8status = U_ZERO_ERROR;
-	Load(utf8status);
-#endif
-}
-
-void UTF8Transliterator::Load(UErrorCode &status)
-{
-#ifndef _ICUSWORD_
-	static const char translit_swordindex[] = "translit_swordindex";
-	
-	UResourceBundle *bundle, *transIDs, *colBund;
-	bundle = ures_openDirect(SW_RESDATA, translit_swordindex, &status);
-	if (U_FAILURE(status)) {
-		SWLog::systemlog->LogError("no resource index to load");
-		SWLog::systemlog->LogError("status %s", u_errorName(status));
-		return;
-	}
-
-	transIDs = ures_getByKey(bundle, SW_RB_RULE_BASED_IDS, 0, &status);
-	UParseError parseError;
-
-	int32_t row, maxRows;
-	if (U_SUCCESS(status)) {
-		maxRows = ures_getSize(transIDs);
-        	for (row = 0; row < maxRows; row++) {
-			colBund = ures_getByIndex(transIDs, row, 0, &status);
-
-			if (U_SUCCESS(status) && ures_getSize(colBund) == 4) {
-				UnicodeString id = ures_getUnicodeStringByIndex(colBund, 0, &status);
-                        	UChar type = ures_getUnicodeStringByIndex(colBund, 1, &status).charAt(0);
-				UnicodeString resString = ures_getUnicodeStringByIndex(colBund, 2, &status);
-                        	SWLog::systemlog->LogInformation("ok so far");
-
-				 if (U_SUCCESS(status)) {
-					switch (type) {
-					case 0x66: // 'f'
-					case 0x69: // 'i'
-						// 'file' or 'internal';
-						// row[2]=resource, row[3]=direction
-						{
-							UBool visible = (type == 0x0066 /*f*/);
-							UTransDirection dir =
-								(ures_getUnicodeStringByIndex(colBund, 3, &status).charAt(0) ==
-								0x0046 /*F*/) ?
-								UTRANS_FORWARD : UTRANS_REVERSE;
-		                                        //registry->put(id, resString, dir, visible);
-							SWLog::systemlog->LogInformation("instantiating %s ...", resString.getBuffer());
-					    		registerTrans(id, resString, dir, status);
-							SWLog::systemlog->LogInformation("done.");
-	                                	}
-						break;
-					case 0x61: // 'a'
-                	                	// 'alias'; row[2]=createInstance argument
-                        	        	//registry->put(id, resString, TRUE);
-                                		break;
-					}
-        	                 }
-                	         else SWLog::systemlog->LogError("Failed to get resString");
-	                }
-			else SWLog::systemlog->LogError("Failed to get row");
-			ures_close(colBund);
-		}
-	}
-	else
-	{
-		SWLog::systemlog->LogError("no resource index to load");
-		SWLog::systemlog->LogError("status %s", u_errorName(status));
-	}
-
-	ures_close(transIDs);
-	ures_close(bundle);
-
-#endif // _ICUSWORD_
-}
-
-void  UTF8Transliterator::registerTrans(const UnicodeString& ID, const UnicodeString& resource,
-		UTransDirection dir, UErrorCode &status )
-{
-#ifndef _ICUSWORD_
-		SWLog::systemlog->LogInformation("registering ID locally %s", ID.getBuffer());
-		SWTransData swstuff;
-		swstuff.resource = resource;
-		swstuff.dir = dir;
-		SWTransPair swpair;
-		swpair.first = ID;
-		swpair.second = swstuff;
-		transMap.insert(swpair);
-#endif
-}
-
-bool UTF8Transliterator::checkTrans(const UnicodeString& ID, UErrorCode &status )
-{
-#ifndef _ICUSWORD_
-		Transliterator *trans = Transliterator::createInstance(ID, UTRANS_FORWARD, status);
-		if (!U_FAILURE(status))
-		{
-			// already have it, clean up and return true
-			SWLog::systemlog->LogInformation("already have it %s", ID.getBuffer());
-			delete trans;
-			return true;
-		}
-		status = U_ZERO_ERROR;
-	
-	SWTransMap::iterator swelement;
-	if ((swelement = transMap.find(ID)) != transMap.end())
-	{
-		SWLog::systemlog->LogInformation("found element in map");
-		SWTransData swstuff = (*swelement).second;
-		UParseError parseError;
-		//UErrorCode status;
-		//std::cout << "unregistering " << ID << std::endl;
-		//Transliterator::unregister(ID);
-		SWLog::systemlog->LogInformation("resource is %s", swstuff.resource.getBuffer());
-
-		// Get the rules
-		//std::cout << "importing: " << ID << ", " << resource << std::endl;
-		SWCharString ch(swstuff.resource);
-		UResourceBundle *bundle = ures_openDirect(SW_RESDATA, ch, &status);
-		const UnicodeString rules = ures_getUnicodeStringByKey(bundle, SW_RB_RULE, &status);
-		ures_close(bundle);
-		//parser.parse(rules, isReverse ? UTRANS_REVERSE : UTRANS_FORWARD,
-		//        parseError, status);
-		if (U_FAILURE(status)) {
-			SWLog::systemlog->LogError("Failed to get rules");
-			SWLog::systemlog->LogError("status %s", u_errorName(status));
-			return false;
-		}
-
-		
-		Transliterator *trans = Transliterator::createFromRules(ID, rules, swstuff.dir,
-			parseError,status);
-		if (U_FAILURE(status)) {
-			SWLog::systemlog->LogError("Failed to create transliterator");
-			SWLog::systemlog->LogError("status %s", u_errorName(status));
-			SWLog::systemlog->LogError("Parse error: line %s", parseError.line);
-			SWLog::systemlog->LogError("Parse error: offset %d", parseError.offset);
-			SWLog::systemlog->LogError("Parse error: preContext %s", *parseError.preContext);
-			SWLog::systemlog->LogError("Parse error: postContext %s", *parseError.postContext);
-			SWLog::systemlog->LogError("rules were");
-//			SWLog::systemlog->LogError((const char *)rules);
-			return false;
-		}
-
-		Transliterator::registerInstance(trans);
-		return true;
-		
-		//Transliterator *trans = instantiateTrans(ID, swstuff.resource, swstuff.dir, parseError, status);
-		//return trans;
-	}
-	else
-	{
-		return false;
-	}
-#else
-return true;
-#endif // _ICUSWORD_
-}
-
-bool UTF8Transliterator::addTrans(const char* newTrans, SWBuf* transList) {
-#ifdef _ICUSWORD_
-        UErrorCode status;
-	if (checkTrans(UnicodeString(newTrans), status)) {
-#endif
-		*transList += newTrans;
-                *transList += ";";
-                return true;
-#ifdef _ICUSWORD_
-        }
-        else {
-        	return false;
-        }
-#endif
-}
-
-Transliterator * UTF8Transliterator::createTrans(const UnicodeString& ID, UTransDirection dir, UErrorCode &status )
-{
-	Transliterator *trans = Transliterator::createInstance(ID,UTRANS_FORWARD,status);
-	if (U_FAILURE(status)) {
-		delete trans;
-		return NULL;
-	}
-	else {
-		return trans;
-	}
-}
-
-void UTF8Transliterator::setOptionValue(const char *ival)
-{
-	unsigned char i = option = NUMTARGETSCRIPTS;
-	while (i && stricmp(ival, optionstring[i])) {
-		i--;
-		option = i;
-	}
-}
-
-const char *UTF8Transliterator::getOptionValue()
-{
-	return (NUMTARGETSCRIPTS > option) ? optionstring[option] : 0;
-}
-
-char UTF8Transliterator::processText(SWBuf &text, const SWKey *key, const SWModule *module)
-{
-	if (option) {	// if we want transliteration
-		unsigned long i, j;
-                UErrorCode err = U_ZERO_ERROR;
-                UConverter * conv = NULL;
-                conv = ucnv_open("UTF-8", &err);
-                SWBuf ID;
-
-                bool compat = false;
-
-		// Convert UTF-8 string to UTF-16 (UChars)
-                j = strlen(text);
-                int32_t len = (j * 2) + 1;
-                UChar *source = new UChar[len];
-                err = U_ZERO_ERROR;
-                len = ucnv_toUChars(conv, source, len, text, j, &err);
-                source[len] = 0;
-
-		// Figure out which scripts are used in the string
-		unsigned char scripts[NUMSCRIPTS];
-
-                for (i = 0; i < NUMSCRIPTS; i++) {
-                        scripts[i] = false;
-                }
-
-                for (i = 0; i < len; i++) {
-                        j = ublock_getCode(source[i]);
-			scripts[SE_LATIN] = true;
-			switch (j) {
-			//case UBLOCK_BASIC_LATIN: scripts[SE_LATIN] = true; break;
-			case UBLOCK_GREEK: scripts[SE_GREEK] = true; break;
-			case UBLOCK_HEBREW: scripts[SE_HEBREW] = true; break;
-			case UBLOCK_CYRILLIC: scripts[SE_CYRILLIC] = true; break;
-			case UBLOCK_ARABIC: scripts[SE_ARABIC] = true; break;
-			case UBLOCK_SYRIAC: scripts[SE_SYRIAC] = true; break;
-			case UBLOCK_KATAKANA: scripts[SE_KATAKANA] = true; break;
-			case UBLOCK_HIRAGANA: scripts[SE_HIRAGANA] = true; break;
-			case UBLOCK_HANGUL_SYLLABLES: scripts[SE_HANGUL] = true; break;
-			case UBLOCK_HANGUL_JAMO: scripts[SE_JAMO] = true; break;
-			case UBLOCK_DEVANAGARI: scripts[SE_DEVANAGARI] = true; break;
-			case UBLOCK_TAMIL: scripts[SE_TAMIL] = true; break;
-			case UBLOCK_BENGALI: scripts[SE_BENGALI] = true; break;
-			case UBLOCK_GURMUKHI: scripts[SE_GURMUKHI] = true; break;
-			case UBLOCK_GUJARATI: scripts[SE_GUJARATI] = true; break;
-			case UBLOCK_ORIYA: scripts[SE_ORIYA] = true; break;
-			case UBLOCK_TELUGU: scripts[SE_TELUGU] = true; break;
-			case UBLOCK_KANNADA: scripts[SE_KANNADA] = true; break;
-			case UBLOCK_MALAYALAM: scripts[SE_MALAYALAM] = true; break;
-			case UBLOCK_THAI: scripts[SE_THAI] = true; break;
-			case UBLOCK_GEORGIAN: scripts[SE_GEORGIAN] = true; break;
-      			case UBLOCK_ARMENIAN: scripts[SE_ARMENIAN] = true; break;
-                        case UBLOCK_ETHIOPIC: scripts[SE_ETHIOPIC] = true; break;
-                        case UBLOCK_GOTHIC: scripts[SE_GOTHIC] = true; break;
-                        case UBLOCK_UGARITIC: scripts[SE_UGARITIC] = true; break;
-//                        case UBLOCK_MEROITIC: scripts[SE_MEROITIC] = true; break;
-//                        case UBLOCK_LINEARB: scripts[SE_LINEARB] = true; break;
-//                        case UBLOCK_CYPRIOT: scripts[SE_CYPRIOT] = true; break;
-                        case UBLOCK_RUNIC: scripts[SE_RUNIC] = true; break;
-                        case UBLOCK_OGHAM: scripts[SE_OGHAM] = true; break;
-                        case UBLOCK_THAANA: scripts[SE_THAANA] = true; break;
-//                        case UBLOCK_GLAGOLITIC: scripts[SE_GLAGOLITIC] = true; break;
-//                        case UBLOCK_TENGWAR: scripts[SE_TENGWAR] = true; break;
-//                        case UBLOCK_CIRTH: scripts[SE_CIRTH] = true; break;
-			case UBLOCK_CJK_RADICALS_SUPPLEMENT:
-			case UBLOCK_KANGXI_RADICALS:
-			case UBLOCK_IDEOGRAPHIC_DESCRIPTION_CHARACTERS:
-			case UBLOCK_CJK_SYMBOLS_AND_PUNCTUATION:
-			case UBLOCK_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_A:
-			case UBLOCK_CJK_UNIFIED_IDEOGRAPHS:
-                                scripts[SE_HAN] = true;
-                                break;
-			case UBLOCK_CJK_COMPATIBILITY:
-			case UBLOCK_CJK_COMPATIBILITY_IDEOGRAPHS:
-			case UBLOCK_CJK_COMPATIBILITY_FORMS:
-                                scripts[SE_HAN] = true;
-                                compat = true;
-        			break;
-			case UBLOCK_HANGUL_COMPATIBILITY_JAMO:
-                                scripts[SE_HANGUL] = true;
-                                compat = true;
-                                break;
-
-                        //default: scripts[SE_LATIN] = true;
-			}
-		}
-		scripts[option] = false; //turn off the reflexive transliteration
-
-		//return if we have no transliteration to do for this text
-                j = 0;
-               	for (i = 0; !j && i < NUMSCRIPTS; i++) {
-	        	if (scripts[i]) j++;
-        	}
-	       	if (!j) {
-                        ucnv_close(conv);
-                        return 0;
-                }
-
-                if (compat) {
-                        addTrans("NFKD", &ID);
-                }
-                else {
-                        addTrans("NFD", &ID);
-                }
-
-		//Simple X to Latin transliterators
-		if (scripts[SE_GREEK]) {
-			if (strnicmp (((SWModule*)module)->Lang(), "cop", 3)) {
-				if (option == SE_SBL)
-					addTrans("Greek-Latin/SBL", &ID);
-				else if (option == SE_TC)
-					addTrans("Greek-Latin/TC", &ID);
-				else if (option == SE_BETA)
-					addTrans("Greek-Latin/Beta", &ID);
-				else if (option == SE_BGREEK)
-					addTrans("Greek-Latin/BGreek", &ID);
-	                        else if (option == SE_UNGEGN)
-        	                	addTrans("Greek-Latin/UNGEGN", &ID);
-				else if (option == SE_ISO)
-        	                	addTrans("Greek-Latin/ISO", &ID);
-                                else if (option == SE_ALALC)
-        	                	addTrans("Greek-Latin/ALALC", &ID);
-                                else if (option == SE_BGNPCGN)
-        	                	addTrans("Greek-Latin/BGNPCGN", &ID);
-                                else if (option == SE_IPA)
-        	                	addTrans("Greek-IPA/Ancient", &ID);
-                                else {
-        	                	addTrans("Greek-Latin", &ID);
-					scripts[SE_LATIN] = true;
-                                }
-			}
-			else {
-				if (option == SE_SBL)
-					addTrans("Coptic-Latin/SBL", &ID);
-				else if (option == SE_TC)
-					addTrans("Coptic-Latin/TC", &ID);
-				else if (option == SE_BETA)
-					addTrans("Coptic-Latin/Beta", &ID);
-                                else if (option == SE_IPA)
-        	                	addTrans("Coptic-IPA", &ID);
-                                else {
-        	                	addTrans("Coptic-Latin", &ID);
-					scripts[SE_LATIN] = true;
-                                }
-			}
-		}
-		if (scripts[SE_HEBREW]) {
-                        if (option == SE_SBL)
-                                addTrans("Hebrew-Latin/SBL", &ID);
-                        else if (option == SE_TC)
-                                addTrans("Hebrew-Latin/TC", &ID);
-			else if (option == SE_BETA)
-				addTrans("Hebrew-Latin/Beta", &ID);
-                        else if (option == SE_UNGEGN)
-                                addTrans("Hebrew-Latin/UNGEGN", &ID);
-                        else if (option == SE_ALALC)
-                                addTrans("Hebrew-Latin/ALALC", &ID);
-                        else if (option == SE_SYRIAC)
-                                addTrans("Hebrew-Syriac", &ID);
-			else {
-				addTrans("Hebrew-Latin", &ID);
-                                scripts[SE_LATIN] = true;
-			}
-		}
-		if (scripts[SE_CYRILLIC]) {
-                	if (option == SE_GLAGOLITIC)
-                        	addTrans("Cyrillic-Glagolitic", &ID);
-                	else {
-				addTrans("Cyrillic-Latin", &ID);
-				scripts[SE_LATIN] = true;
-                        }
-		}
-		if (scripts[SE_ARABIC]) {
-			addTrans("Arabic-Latin", &ID);
-			scripts[SE_LATIN] = true;
-		}
-		if (scripts[SE_SYRIAC]) {
-                        if (option == SE_TC)
-                                addTrans("Syriac-Latin/TC", &ID);
-                        else if (option == SE_BETA)
-        			addTrans("Syriac-Latin/Beta", &ID);
-                        else if (option == SE_HUGOYE)
-        			addTrans("Syriac-Latin/Hugoye", &ID);
-                        else if (option == SE_HEBREW)
-                                addTrans("Syriac-Hebrew", &ID);
-                        else {
-        			addTrans("Syriac-Latin", &ID);
-        			scripts[SE_LATIN] = true;
-                        }
-		}
-		if (scripts[SE_THAI]) {
-			addTrans("Thai-Latin", &ID);
-			scripts[SE_LATIN] = true;
-		}
-		if (scripts[SE_GEORGIAN]) {
-                        if (option == SE_ISO)
-        			addTrans("Georgian-Latin/ISO", &ID);
-                        else if (option == SE_ALALC)
-        			addTrans("Georgian-Latin/ALALC", &ID);
-                        else if (option == SE_BGNPCGN)
-        			addTrans("Georgian-Latin/BGNPCGN", &ID);
-                        else if (option == SE_IPA)
-        			addTrans("Georgian-IPA", &ID);
-                        else {
-				addTrans("Georgian-Latin", &ID);
-				scripts[SE_LATIN] = true;
-                        }
-		}
-		if (scripts[SE_ARMENIAN]) {
-                        if (option == SE_ISO)
-        			addTrans("Armenian-Latin/ISO", &ID);
-                        else if (option == SE_ALALC)
-        			addTrans("Armenian-Latin/ALALC", &ID);
-                        else if (option == SE_BGNPCGN)
-        			addTrans("Armenian-Latin/BGNPCGN", &ID);
-                        else if (option == SE_IPA)
-        			addTrans("Armenian-IPA", &ID);
-                        else {
-				addTrans("Armenian-Latin", &ID);
-				scripts[SE_LATIN] = true;
-                	}
-		}
-		if (scripts[SE_ETHIOPIC]) {
-                        if (option == SE_UNGEGN)
-        			addTrans("Ethiopic-Latin/UNGEGN", &ID);
-                        else if (option == SE_ISO)
-        			addTrans("Ethiopic-Latin/ISO", &ID);
-                        else if (option == SE_ALALC)
-        			addTrans("Ethiopic-Latin/ALALC", &ID);
-                        else if (option == SE_SERA)
-        			addTrans("Ethiopic-Latin/SERA", &ID);
-                	else {
-				addTrans("Ethiopic-Latin", &ID);
-				scripts[SE_LATIN] = true;
-                        }
-		}
-		if (scripts[SE_GOTHIC]) {
-                        if (option == SE_BASICLATIN)
-        			addTrans("Gothic-Latin/Basic", &ID);
-                        else if (option == SE_IPA)
-        			addTrans("Gothic-IPA", &ID);
-                	else {
-				addTrans("Gothic-Latin", &ID);
-				scripts[SE_LATIN] = true;
-                        }
-		}
-		if (scripts[SE_UGARITIC]) {
-                	if (option == SE_SBL)
-                        	addTrans("Ugaritic-Latin/SBL", &ID);
-                        else {
-				addTrans("Ugaritic-Latin", &ID);
-				scripts[SE_LATIN] = true;
-                        }
-		}
-		if (scripts[SE_MEROITIC]) {
-			addTrans("Meroitic-Latin", &ID);
-			scripts[SE_LATIN] = true;
-		}
-		if (scripts[SE_LINEARB]) {
-			addTrans("LinearB-Latin", &ID);
-			scripts[SE_LATIN] = true;
-		}
-		if (scripts[SE_CYPRIOT]) {
-			addTrans("Cypriot-Latin", &ID);
-			scripts[SE_LATIN] = true;
-		}
-		if (scripts[SE_RUNIC]) {
-			addTrans("Runic-Latin", &ID);
-			scripts[SE_LATIN] = true;
-		}
-		if (scripts[SE_OGHAM]) {
-			addTrans("Ogham-Latin", &ID);
-			scripts[SE_LATIN] = true;
-		}
-		if (scripts[SE_THAANA]) {
-			if (option == SE_ALALC)
-                        	addTrans("Thaana-Latin/ALALC", &ID);
-			else if (option == SE_BGNPCGN)
-                        	addTrans("Thaana-Latin/BGNPCGN", &ID);
-			else {
-				addTrans("Thaana-Latin", &ID);
-				scripts[SE_LATIN] = true;
-                        }
-		}
-		if (scripts[SE_GLAGOLITIC]) {
-			if (option == SE_ISO)
-                        	addTrans("Glagolitic-Latin/ISO", &ID);
-			else if (option == SE_ALALC)
-                        	addTrans("Glagolitic-Latin/ALALC", &ID);
-			else if (option == SE_ALALC)
-                        	addTrans("Glagolitic-Cyrillic", &ID);
-			else {
-				addTrans("Glagolitic-Latin", &ID);
-				scripts[SE_LATIN] = true;
-                        }
-		}
-		if (scripts[SE_THAI]) {
-			addTrans("Thai-Latin", &ID);
-			scripts[SE_LATIN] = true;
-		}
-		if (scripts[SE_THAI]) {
-			addTrans("Thai-Latin", &ID);
-			scripts[SE_LATIN] = true;
-		}
-
-		if (scripts[SE_HAN]) {
-	        	if (!strnicmp (((SWModule*)module)->Lang(), "ja", 2)) {
-     				addTrans("Kanji-Romaji", &ID);
-			}
-			else {
-       				addTrans("Han-Latin", &ID);
-			}
-			scripts[SE_LATIN] = true;
-		}
-
-       		// Inter-Kana and Kana to Latin transliterators
-		if (option == SE_HIRAGANA && scripts[SE_KATAKANA]) {
-			addTrans("Katakana-Hiragana", &ID);
-			scripts[SE_HIRAGANA] = true;
-		}
-		else if (option == SE_KATAKANA && scripts[SE_HIRAGANA]) {
-			addTrans("Hiragana-Katakana", &ID);
-			scripts[SE_KATAKANA] = true;
-		}
-		else {
-        		if (scripts[SE_KATAKANA]) {
-	        		addTrans("Katakana-Latin", &ID);
-		        	scripts[SE_LATIN] = true;
-        		}
-	        	if (scripts[SE_HIRAGANA]) {
-		        	addTrans("Hiragana-Latin", &ID);
-			        scripts[SE_LATIN] = true;
-        		}
-                }
-
-		// Korean to Latin transliterators
-		if (scripts[SE_HANGUL]) {
-			addTrans("Hangul-Latin", &ID);
-			scripts[SE_LATIN] = true;
-		}
-		if (scripts[SE_JAMO]) {
-			addTrans("Jamo-Latin", &ID);
-			scripts[SE_LATIN] = true;
-		}
-
-		// Indic-Latin
-		if (option < SE_DEVANAGARI || option > SE_MALAYALAM) {
-			// Indic to Latin
-			if (scripts[SE_TAMIL]) {
-				addTrans("Tamil-Latin", &ID);
-				scripts[SE_LATIN] = true;
-			}
-			if (scripts[SE_BENGALI]) {
-				addTrans("Bengali-Latin", &ID);
-				scripts[SE_LATIN] = true;
-			}
-			if (scripts[SE_GURMUKHI]) {
-				addTrans("Gurmukhi-Latin", &ID);
-				scripts[SE_LATIN] = true;
-			}
-			if (scripts[SE_GUJARATI]) {
-				addTrans("Gujarati-Latin", &ID);
-				scripts[SE_LATIN] = true;
-			}
-			if (scripts[SE_ORIYA]) {
-				addTrans("Oriya-Latin", &ID);
-				scripts[SE_LATIN] = true;
-			}
-			if (scripts[SE_TELUGU]) {
-				addTrans("Telugu-Latin", &ID);
-				scripts[SE_LATIN] = true;
-			}
-			if (scripts[SE_KANNADA]) {
-				addTrans("Kannada-Latin", &ID);
-				scripts[SE_LATIN] = true;
-			}
-			if (scripts[SE_MALAYALAM]) {
-				addTrans("Malayalam-Latin", &ID);
-				scripts[SE_LATIN] = true;
-			}
-		}
-		else {
-			if (scripts[SE_LATIN]) {
-				addTrans("Latin-InterIndic", &ID);
-			}
-			if (scripts[SE_DEVANAGARI]) {
-				addTrans("Devanagari-InterIndic", &ID);
-			}
-			if (scripts[SE_TAMIL]) {
-				addTrans("Tamil-InterIndic", &ID);
-			}
-			if (scripts[SE_BENGALI]) {
-				addTrans("Bengali-InterIndic", &ID);
-			}
-			if (scripts[SE_GURMUKHI]) {
-				addTrans("Gurmurkhi-InterIndic", &ID);
-			}
-			if (scripts[SE_GUJARATI]) {
-				addTrans("Gujarati-InterIndic", &ID);
-			}
-			if (scripts[SE_ORIYA]) {
-				addTrans("Oriya-InterIndic", &ID);
-			}
-			if (scripts[SE_TELUGU]) {
-				addTrans("Telugu-InterIndic", &ID);
-			}
-			if (scripts[SE_KANNADA]) {
-				addTrans("Kannada-InterIndic", &ID);
-			}
-			if (scripts[SE_MALAYALAM]) {
-				addTrans("Malayalam-InterIndic", &ID);
-			}
-
-			switch(option) {
-			case SE_DEVANAGARI:
-				addTrans("InterIndic-Devanagari", &ID);
-				break;
-			case SE_TAMIL:
-				addTrans("InterIndic-Tamil", &ID);
-				break;
-			case SE_BENGALI:
-				addTrans("InterIndic-Bengali", &ID);
-				break;
-			case SE_GURMUKHI:
-				addTrans("InterIndic-Gurmukhi", &ID);
-				break;
-			case SE_GUJARATI:
-				addTrans("InterIndic-Gujarati", &ID);
-				break;
-			case SE_ORIYA:
-				addTrans("InterIndic-Oriya", &ID);
-				break;
-			case SE_TELUGU:
-				addTrans("InterIndic-Telugu", &ID);
-				break;
-			case SE_KANNADA:
-				addTrans("InterIndic-Kannada", &ID);
-				break;
-			case SE_MALAYALAM:
-				addTrans("InterIndic-Malayalam", &ID);
-				break;
-			default:
-				addTrans("InterIndic-Latin", &ID);
-				scripts[SE_LATIN] = true;
-				break;
-			}
-		}
-
-		if (scripts[SE_TENGWAR]) {
-			addTrans("Tengwar-Latin", &ID);
-			scripts[SE_LATIN] = true;
-		}
-		if (scripts[SE_CIRTH]) {
-			addTrans("Cirth-Latin", &ID);
-			scripts[SE_LATIN] = true;
-		}
-
-		if (scripts[SE_LATIN]) {
-                switch (option) {
-                        case SE_GREEK:
-				addTrans("Latin-Greek", &ID);
-                                break;
-                        case SE_HEBREW:
-				addTrans("Latin-Hebrew", &ID);
-                                break;
-                        case SE_CYRILLIC:
-				addTrans("Latin-Cyrillic", &ID);
-                                break;
-                        case SE_ARABIC:
-				addTrans("Latin-Arabic", &ID);
-                                break;
-                        case SE_SYRIAC:
-				addTrans("Latin-Syriac", &ID);
-                                break;
-                        case SE_THAI:
-				addTrans("Latin-Thai", &ID);
-                                break;
-                        case SE_GEORGIAN:
-				addTrans("Latin-Georgian", &ID);
-                                break;
-                        case SE_ARMENIAN:
-				addTrans("Latin-Armenian", &ID);
-                                break;
-                        case SE_ETHIOPIC:
-				addTrans("Latin-Ethiopic", &ID);
-                                break;
-                        case SE_GOTHIC:
-				addTrans("Latin-Gothic", &ID);
-                                break;
-                        case SE_UGARITIC:
-				addTrans("Latin-Ugaritic", &ID);
-                                break;
-                        case SE_COPTIC:
-				addTrans("Latin-Coptic", &ID);
-                                break;
-                        case SE_KATAKANA:
-				addTrans("Latin-Katakana", &ID);
-                                break;
-                        case SE_HIRAGANA:
-				addTrans("Latin-Hiragana", &ID);
-                                break;
-                        case SE_JAMO:
-				addTrans("Latin-Jamo", &ID);
-                                break;
-                        case SE_HANGUL:
-				addTrans("Latin-Hangul", &ID);
-                                break;
-                        case SE_MEROITIC:
-				addTrans("Latin-Meroitic", &ID);
-                                break;
-                        case SE_LINEARB:
-				addTrans("Latin-LinearB", &ID);
-                                break;
-                        case SE_CYPRIOT:
-				addTrans("Latin-Cypriot", &ID);
-                                break;
-                        case SE_RUNIC:
-				addTrans("Latin-Runic", &ID);
-                                break;
-                        case SE_OGHAM:
-				addTrans("Latin-Ogham", &ID);
-                                break;
-                        case SE_THAANA:
-				addTrans("Latin-Thaana", &ID);
-                                break;
-                        case SE_GLAGOLITIC:
-				addTrans("Latin-Glagolitic", &ID);
-                                break;
-                        case SE_TENGWAR:
-				addTrans("Latin-Tengwar", &ID);
-                                break;
-                        case SE_CIRTH:
-				addTrans("Latin-Cirth", &ID);
-                                break;
-                        }
-                }
-
-                if (option == SE_BASICLATIN) {
-                        addTrans("Any-Latin1", &ID);
-                }
-
-                addTrans("NFC", &ID);
-
-                err = U_ZERO_ERROR;
-                Transliterator * trans = createTrans(UnicodeString(ID), UTRANS_FORWARD, err);
-                if (trans && !U_FAILURE(err)) {
-                        UnicodeString target = UnicodeString(source);
-			trans->transliterate(target);
-			text.setSize(text.size()*2);
-			len = ucnv_fromUChars(conv, text.getRawData(), text.size(), target.getBuffer(), target.length(), &err);
-			text.setSize(len);
-			delete trans;
-                }
-                ucnv_close(conv);
-        }
-	return 0;
-}
-
-SWORD_NAMESPACE_END
-#endif
-
-
-
diff --git a/src/modules/filters/utf8utf16.cpp b/src/modules/filters/utf8utf16.cpp
deleted file mode 100644
index 2fddf4c..0000000
--- a/src/modules/filters/utf8utf16.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-/******************************************************************************
- *
- * UTF8UTF16 -	SWFilter descendant to convert UTF-8 to UTF-16
- *
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-
-#include <utf8utf16.h>
-
-SWORD_NAMESPACE_START
-
-UTF8UTF16::UTF8UTF16() {
-}
-
-
-char UTF8UTF16::processText(SWBuf &text, const SWKey *key, const SWModule *module) {
-	const unsigned char *from;
-
-	int len;
-	unsigned long uchar, uchars[10];
-	unsigned char significantFirstBits, subsequent;
-	unsigned short schar;
-  
-	 if ((unsigned long)key < 2)	// hack, we're en(1)/de(0)ciphering
-		return -1;
-
-  
-	SWBuf orig = text;
-	from = (const unsigned char *)orig.c_str();
-
-	for (text = ""; *from; from++) {
-		uchar = 0;
-		if ((*from & 128) != 128) {
-			//if (*from != ' ')
-			uchar = *from;
-		}
-		else if ((*from & 128) && ((*from & 64) != 64)) {
-			// error, do nothing
-			continue;
-		}
-		else {
-			uchars[0] = *from;
-			uchars[0] <<= 1;
-			for (subsequent = 1; (uchars[0] & 128) && (subsequent < 10); subsequent++) {
-				uchars[0] <<= 1;
-				uchars[subsequent] = from[subsequent];
-				uchars[subsequent] &= 63;
-				uchar <<= 6;
-				uchar |= uchars[subsequent];
-			}
-			subsequent--;
-			uchars[0] <<=1;
-			significantFirstBits = 8 - (2+subsequent);
-	 
-			uchar |= (((short)uchars[0]) << (((6*subsequent)+significantFirstBits)-8));
-			from += subsequent;
-		}
-
-		if (uchar < 0x1ffff) {
-			text.setSize(text.size()+2);
-			*((unsigned short *)(text.getRawData()+(text.size()-2))) = (unsigned short)uchar;
-		}
-		else {
-			uchar -= 0x10000;
-			schar = 0xD800 | (uchar & 0x03ff);
-			uchar >>= 10;
-			uchar |= 0xDC00;
-			text.setSize(text.size()+4);
-			*((unsigned short *)(text.getRawData()+(text.size()-4))) = (unsigned short)schar;
-			*((unsigned short *)(text.getRawData()+(text.size()-2))) = (unsigned short)uchar;
-		}
-	}
-	return 0;
-}
-
-SWORD_NAMESPACE_END
diff --git a/src/modules/genbook/Makefile b/src/modules/genbook/Makefile
deleted file mode 100644
index 1a2d00d..0000000
--- a/src/modules/genbook/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-
-root := ../../..
-
-all:
-	make -C ${root}
diff --git a/src/modules/genbook/Makefile.am b/src/modules/genbook/Makefile.am
deleted file mode 100644
index 02f6ab1..0000000
--- a/src/modules/genbook/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-genbookdir = $(top_srcdir)/src/modules/genbook
-
-libsword_la_SOURCES += $(genbookdir)/swgenbook.cpp
-
-include ../src/modules/genbook/rawgenbook/Makefile.am
diff --git a/src/modules/genbook/rawgenbook/Makefile b/src/modules/genbook/rawgenbook/Makefile
deleted file mode 100644
index aab8056..0000000
--- a/src/modules/genbook/rawgenbook/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-root := ../../../..
-
-all:
-	make -C ${root}
diff --git a/src/modules/genbook/rawgenbook/Makefile.am b/src/modules/genbook/rawgenbook/Makefile.am
deleted file mode 100644
index a176d75..0000000
--- a/src/modules/genbook/rawgenbook/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-rawgenbookdir = $(top_srcdir)/src/modules/genbook/rawgenbook
-
-libsword_la_SOURCES += $(rawgenbookdir)/rawgenbook.cpp
-
diff --git a/src/modules/genbook/rawgenbook/rawgenbook.cpp b/src/modules/genbook/rawgenbook/rawgenbook.cpp
deleted file mode 100644
index 4850509..0000000
--- a/src/modules/genbook/rawgenbook/rawgenbook.cpp
+++ /dev/null
@@ -1,209 +0,0 @@
-/******************************************************************************
- *  rawtext.cpp - code for class 'RawGenBook'- a module that reads raw text files:
- *		  ot and nt using indexs ??.bks ??.cps ??.vss
- */
-
-
-#include <stdio.h>
-#include <fcntl.h>
-
-#ifndef __GNUC__
-#include <io.h>
-#else
-#include <unistd.h>
-#endif
-
-#include <utilfuns.h>
-#include <rawgenbook.h>
-#include <rawstr.h>
-
-#ifndef O_BINARY
-#define O_BINARY 0
-#endif
-
-SWORD_NAMESPACE_START
-
-/******************************************************************************
- * RawGenBook Constructor - Initializes data for instance of RawGenBook
- *
- * ENT:	iname - Internal name for module
- *	idesc - Name to display to user for module
- *	idisp	 - Display object to use for displaying
- */
-
-RawGenBook::RawGenBook(const char *ipath, const char *iname, const char *idesc, SWDisplay *idisp, SWTextEncoding enc, SWTextDirection dir, SWTextMarkup mark, const char* ilang)
-		: SWGenBook(iname, idesc, idisp, enc, dir, mark, ilang) {
-	int fileMode = O_RDWR;
-	char *buf = new char [ strlen (ipath) + 20 ];
-
-	path = 0;
-	stdstr(&path, ipath);
-
-
-	if ((path[strlen(path)-1] == '/') || (path[strlen(path)-1] == '\\'))
-		path[strlen(path)-1] = 0;
-
-	delete key;
-	key = CreateKey();
-
-
-	sprintf(buf, "%s.bdt", path);
-	bdtfd = FileMgr::systemFileMgr.open(buf, fileMode|O_BINARY, true);
-
-	delete [] buf;
-
-}
-
-
-/******************************************************************************
- * RawGenBook Destructor - Cleans up instance of RawGenBook
- */
-
-RawGenBook::~RawGenBook() {
-
-	FileMgr::systemFileMgr.close(bdtfd);
-
-	if (path)
-		delete [] path;
-
-}
-
-
-/******************************************************************************
- * RawGenBook::getRawEntry	- Returns the correct verse when char * cast
- *					is requested
- *
- * RET: string buffer with verse
- */
-
-SWBuf &RawGenBook::getRawEntryBuf() {
-
-	__u32 offset = 0;
-	__u32 size = 0;
-
-	TreeKeyIdx *key = 0;
-	try {
-		key = SWDYNAMIC_CAST(TreeKeyIdx, (this->key));
-	}
-	catch ( ... ) {}
-
-	if (!key) {
-		key = (TreeKeyIdx *)CreateKey();
-		(*key) = *(this->key);
-	}
-
-	int dsize;
-	key->getUserData(&dsize);
-	entryBuf = "";
-	if (dsize > 7) {
-		memcpy(&offset, key->getUserData(), 4);
-		offset = swordtoarch32(offset);
-
-		memcpy(&size, key->getUserData() + 4, 4);
-		size = swordtoarch32(size);
-
-		entrySize = size;        // support getEntrySize call
-
-		entryBuf.setFillByte(0);
-		entryBuf.setSize(size);
-		lseek(bdtfd->getFd(), offset, SEEK_SET);
-		read(bdtfd->getFd(), entryBuf.getRawData(), size);
-
-		rawFilter(entryBuf, 0);	// hack, decipher
-		rawFilter(entryBuf, key);
-
-//		   if (!isUnicode())
-			RawStr::prepText(entryBuf);
-	}
-
-	if (key != this->key) // free our key if we created a VerseKey
-		delete key;
-
-	return entryBuf;
-}
-
-
-void RawGenBook::setEntry(const char *inbuf, long len) {
-
-	__u32 offset = archtosword32(lseek(bdtfd->getFd(), 0, SEEK_END));
-	__u32 size = 0;
-	TreeKeyIdx *key = ((TreeKeyIdx *)this->key);
-
-	char userData[8];
-
-	if (!len)
-		len = strlen(inbuf);
-
-	write(bdtfd->getFd(), inbuf, len);
-
-	size = archtosword32(len);
-	memcpy(userData, &offset, 4);
-	memcpy(userData+4, &size, 4);
-	key->setUserData(userData, 8);
-	key->save();
-}
-
-
-void RawGenBook::linkEntry(const SWKey *inkey) {
-	TreeKeyIdx *srckey = 0;
-	TreeKeyIdx *key = ((TreeKeyIdx *)this->key);
-	// see if we have a VerseKey * or decendant
-	try {
-		srckey = SWDYNAMIC_CAST(TreeKeyIdx, inkey);
-	}
-	catch ( ... ) {}
-	// if we don't have a VerseKey * decendant, create our own
-	if (!srckey) {
-		srckey = (TreeKeyIdx *)CreateKey();
-		(*srckey) = *inkey;
-	}
-
-	key->setUserData(srckey->getUserData(), 8);
-	key->save();
-
-	if (inkey != srckey) // free our key if we created a VerseKey
-		delete srckey;
-}
-
-
-/******************************************************************************
- * RawGenBook::deleteEntry	- deletes this entry
- *
- * RET: *this
- */
-
-void RawGenBook::deleteEntry() {
-	TreeKeyIdx *key = ((TreeKeyIdx *)this->key);
-	key->remove();
-}
-
-
-char RawGenBook::createModule(const char *ipath) {
-	char *path = 0;
-	char *buf = new char [ strlen (ipath) + 20 ];
-	FileDesc *fd;
-	signed char retval;
-
-	stdstr(&path, ipath);
-
-	if ((path[strlen(path)-1] == '/') || (path[strlen(path)-1] == '\\'))
-		path[strlen(path)-1] = 0;
-
-	sprintf(buf, "%s.bdt", path);
-	unlink(buf);
-	fd = FileMgr::systemFileMgr.open(buf, O_CREAT|O_WRONLY|O_BINARY, S_IREAD|S_IWRITE);
-	fd->getFd();
-	FileMgr::systemFileMgr.close(fd);
-
-	retval = TreeKeyIdx::create(path);
-	delete [] path;
-	return retval;	
-}
-
-
-SWKey *RawGenBook::CreateKey() {
-	TreeKeyIdx *newKey = new TreeKeyIdx(path);
-	return newKey;
-}
-
-SWORD_NAMESPACE_END
diff --git a/src/modules/genbook/swgenbook.cpp b/src/modules/genbook/swgenbook.cpp
deleted file mode 100644
index 3381ef8..0000000
--- a/src/modules/genbook/swgenbook.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-/******************************************************************************
- *  swld.cpp   - code for base class 'SWLD'.  SWLD is the basis for all
- *				types of Lexicon and Dictionary modules (hence the 'LD').
- */
-
-#include <swgenbook.h>
-
-SWORD_NAMESPACE_START
-
-/******************************************************************************
- * SWLD Constructor - Initializes data for instance of SWLD
- *
- * ENT:	imodname - Internal name for module
- *	imoddesc - Name to display to user for module
- *	idisp	 - Display object to use for displaying
- */
-
-SWGenBook::SWGenBook(const char *imodname, const char *imoddesc, SWDisplay *idisp, SWTextEncoding enc, SWTextDirection dir, SWTextMarkup mark, const char* ilang) : SWModule(imodname, imoddesc, idisp, "Generic Books", enc, dir, mark, ilang) {
-}
-
-
-/******************************************************************************
- * SWLD Destructor - Cleans up instance of SWLD
- */
-
-SWGenBook::~SWGenBook() {
-}
-
-SWORD_NAMESPACE_END
diff --git a/src/modules/lexdict/Makefile b/src/modules/lexdict/Makefile
deleted file mode 100644
index 1a2d00d..0000000
--- a/src/modules/lexdict/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-
-root := ../../..
-
-all:
-	make -C ${root}
diff --git a/src/modules/lexdict/Makefile.am b/src/modules/lexdict/Makefile.am
deleted file mode 100644
index 8cfe68b..0000000
--- a/src/modules/lexdict/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-lexdictdir = $(top_srcdir)/src/modules/lexdict
-
-libsword_la_SOURCES += $(lexdictdir)/swld.cpp
-
-include ../src/modules/lexdict/rawld/Makefile.am
-include ../src/modules/lexdict/rawld4/Makefile.am
-include ../src/modules/lexdict/zld/Makefile.am
diff --git a/src/modules/lexdict/rawld/Makefile b/src/modules/lexdict/rawld/Makefile
deleted file mode 100644
index 35d6648..0000000
--- a/src/modules/lexdict/rawld/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-
-root := ../../../..
-
-all:
-	make -C ${root}
diff --git a/src/modules/lexdict/rawld/Makefile.am b/src/modules/lexdict/rawld/Makefile.am
deleted file mode 100644
index 2a2d996..0000000
--- a/src/modules/lexdict/rawld/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-rawlddir = $(top_srcdir)/src/modules/lexdict/rawld
-
-libsword_la_SOURCES += $(rawlddir)/rawld.cpp
-
diff --git a/src/modules/lexdict/rawld/no13.c b/src/modules/lexdict/rawld/no13.c
deleted file mode 100644
index 1e94846..0000000
--- a/src/modules/lexdict/rawld/no13.c
+++ /dev/null
@@ -1,34 +0,0 @@
-#include <fcntl.h>
-#include <stdio.h>
-
-main(int argc, char **argv)
-{
-	int fd, loop;
-	char ch;
-	char breakcnt = 0;
-
-	if (argc != 2) {
-		fprintf(stderr, "This program writes to stdout, so to be useful,\n\tit should be redirected (e.g no13 bla > bla.dat)\nusage: %s <filename>\n", argv[0]);
-		exit(1);
-	}
-	fd = open(argv[1], O_RDONLY);
-	while (read(fd, &ch, 1) == 1) {
-		if (ch == 0x0d) {	// CR
-			breakcnt++;
-			continue;
-		}
-		if (ch == 0x1a)	// Ctrl-Z
-			continue;
-
-		if (ch != 0x0a) {	// LF
-			if (breakcnt > 1) {
-				for (loop = breakcnt; loop > 0; loop--)
-					putchar(0x0d);
-				putchar(0x0a);
-			}
-			breakcnt=0;
-		}
-		putchar(ch);
-	}
-	close(fd);
-}
diff --git a/src/modules/lexdict/rawld/rawld.cpp b/src/modules/lexdict/rawld/rawld.cpp
deleted file mode 100644
index 6fccc68..0000000
--- a/src/modules/lexdict/rawld/rawld.cpp
+++ /dev/null
@@ -1,174 +0,0 @@
-/******************************************************************************
- *  rawld.cpp - code for class 'RawLD'- a module that reads raw lexicon and
- *				dictionary files: *.dat *.idx
- */
-
-
-#include <ctype.h>
-#include <stdio.h>
-#include <fcntl.h>
-
-#ifndef __GNUC__
-#include <io.h>
-#else
-#include <unistd.h>
-#endif
-
-#include <utilfuns.h>
-#include <rawstr.h>
-#include <rawld.h>
-
-SWORD_NAMESPACE_START
-
- /******************************************************************************
- * RawLD Constructor - Initializes data for instance of RawLD
- *
- * ENT:	ipath	- path and filename of files (no extension)
- *		iname	- Internal name for module
- *		idesc	- Name to display to user for module
- *		idisp	- Display object to use for displaying
- */
-
-RawLD::RawLD(const char *ipath, const char *iname, const char *idesc, SWDisplay *idisp, SWTextEncoding enc, SWTextDirection dir, SWTextMarkup mark, const char* ilang) : RawStr(ipath), SWLD(iname, idesc, idisp, enc, dir, mark, ilang)
-{
-}
-
-
-/******************************************************************************
- * RawLD Destructor - Cleans up instance of RawLD
- */
-
-RawLD::~RawLD()
-{
-}
-
-
-/******************************************************************************
- * RawLD::strongsPad	- Pads a key if it is 100% digits to 5 places
- *
- * ENT: buf -	buffer to check and pad
- */
-
-void RawLD::strongsPad(char *buf)
-{
-	const char *check;
-	int size = 0;
-	int len = strlen(buf);
-	if ((len < 5) && (len > 0)) {
-		for (check = buf; *check; check++) {
-			if (!isdigit(*check))
-				break;
-			else size++;
-		}
-
-		if ((size == len) && size) 
-			sprintf(buf, "%.5d", atoi(buf));
-	}
-}
-
-
-/******************************************************************************
- * RawLD::getEntry	- Looks up entry from data file.  'Snaps' to closest
- *				entry and sets 'entrybuf'.
- *
- * ENT: away - number of entries offset from key (default = 0)
- *
- * RET: error status
- */
-
-char RawLD::getEntry(long away)
-{
-	long  start = 0;
-	unsigned short size = 0;
-	char *idxbuf = 0;
-	char retval = 0;
-
-	char *buf = new char [ strlen(*key) + 6 ];
-	strcpy(buf, *key);
-
-	strongsPad(buf);
-
-	if (!(retval = findOffset(buf, &start, &size, away))) {
-		readText(start, &size, &idxbuf, entryBuf);
-		rawFilter(entryBuf, 0);	// hack, decipher
-		rawFilter(entryBuf, key);
-		entrySize = size;        // support getEntrySize call
-		if (!key->Persist())			// If we have our own key
-			*key = idxbuf;				// reset it to entry index buffer
-
-		stdstr(&entkeytxt, idxbuf);	// set entry key text that module 'snapped' to.
-		delete [] idxbuf;
-	}
-	else {
-		entryBuf = "";
-	}
-		
-	delete [] buf;
-	return retval;
-}
-
-
-/******************************************************************************
- * RawLD::getRawEntry	- Returns the correct entry when char * cast
- *							is requested
- *
- * RET: string buffer with entry
- */
-
-SWBuf &RawLD::getRawEntryBuf() {
-
-	char ret = getEntry();
-	if (!ret) {
-//		if (!isUnicode())
-			prepText(entryBuf);
-	}
-	else error = ret;
-
-	return entryBuf;
-}
-
-
-/******************************************************************************
- * RawLD::increment	- Increments module key a number of entries
- *
- * ENT:	increment	- Number of entries to jump forward
- *
- * RET: *this
- */
-
-void RawLD::increment(int steps) {
-	char tmperror;
-
-	if (key->Traversable()) {
-		*key += steps;
-		error = key->Error();
-		steps = 0;
-	}
-	
-	tmperror = (getEntry(steps)) ? KEYERR_OUTOFBOUNDS : 0;
-	error = (error)?error:tmperror;
-	*key = entkeytxt;
-}
-
-
-void RawLD::setEntry(const char *inbuf, long len) {
-	doSetText(*key, inbuf, len);
-}
-
-
-void RawLD::linkEntry(const SWKey *inkey) {
-	doLinkEntry(*key, *inkey);
-}
-
-
-/******************************************************************************
- * RawFiles::deleteEntry	- deletes this entry
- *
- * RET: *this
- */
-
-void RawLD::deleteEntry() {
-	doSetText(*key, "");
-}
-
-SWORD_NAMESPACE_END
diff --git a/src/modules/lexdict/rawld/rawldidx.c b/src/modules/lexdict/rawld/rawldidx.c
deleted file mode 100644
index cc4709c..0000000
--- a/src/modules/lexdict/rawld/rawldidx.c
+++ /dev/null
@@ -1,96 +0,0 @@
-/*****************************************************************************
- * Bible dictionary index utility
- */
-
-
-#ifndef __GNUC__
-#include <io.h>
-#else
-#include <unistd.h>
-#endif
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-
-char findbreak(int fd, long *offset, short *size)
-{
-	char buf[3];
-	char rc = 1;
-	long offset2;
-
-	memset(buf, 0, sizeof(buf));
-
-	while (read(fd, &buf[sizeof(buf)-1], 1) == 1) {
-		if ((buf[0] == 10) && (buf[1] == '$') && (buf[2] == '$')) {
-			while (read(fd, buf, 1) == 1) {
-				if (*buf == 10) {
-					if (read(fd, buf, 1) == 1) {
-						*offset = lseek(fd, 0, SEEK_CUR);
-						rc = 0;
-						if (size) {
-							if (!findbreak(fd, &offset2, 0))
-								*size = offset2 - *offset - 13;
-							else *size = lseek(fd, 0, SEEK_END) - *offset;
-							lseek(fd, *offset, SEEK_SET);
-						}
-						break;
-					}
-				}
-			}
-			break;
-		}
-		memmove(buf, &buf[1], sizeof(buf)-1);
-	}
-	return rc;
-}
-
-
-void main(int argc, char **argv)
-{
-	int   fd, ifd;
-	long  offset;
-	short size;
-	char  *buf;
-
-	if (argc < 2) {
-		fprintf(stderr, "usage: %s <file to process (no .dat)>\n", argv[0]);
-		exit(1);
-	}
-
-	buf = (char *) calloc(strlen(argv[1]) + 5, 1);
-
-#ifndef O_BINARY		// O_BINARY is for Borland to be happy.  If we're in GNU, just define it to a NULL mask
-#define O_BINARY 0
-#endif
-	sprintf(buf, "%s.dat", argv[1]);
-	fd = open(buf, O_RDONLY|O_BINARY);
-
-	sprintf(buf, "%s.idx", argv[1]);
-	ifd = open(buf, O_CREAT|O_WRONLY|O_BINARY);
-
-	offset = 0;				/* write offset for intro */
-	write(ifd, &offset, 4);
-	findbreak(fd, &offset, 0);
-	lseek(fd, 0L, SEEK_SET);
-	size = offset - 12;
-	write(ifd, &size, 2);
-
-	buf[3] = 0;				/* delimit string for read below */
-
-	while(!findbreak(fd, &offset, &size)) {
-		write(ifd, &offset, 4);
-		write(ifd, &size, 2);
-		read(fd, buf, 3);
-		printf("Found: %s...(%ld:%d)\n", buf, offset, size);
-	}
-
-	free(buf);
-
-	close(ifd);
-	close(fd);
-}
diff --git a/src/modules/lexdict/rawld/strongsidx.c b/src/modules/lexdict/rawld/strongsidx.c
deleted file mode 100644
index 61bcda3..0000000
--- a/src/modules/lexdict/rawld/strongsidx.c
+++ /dev/null
@@ -1,90 +0,0 @@
-/*****************************************************************************
- * Bible dictionary index utility
- */
-
-
-#ifndef __GNUC__
-#include <io.h>
-#else
-#include <unistd.h>
-#endif
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-
-char findbreak(int fd, long *offset, short *size)
-{
-	char buf[3];
-	char rc = 1;
-	long offset2;
-
-	memset(buf, 0, sizeof(buf));
-
-	while (read(fd, &buf[sizeof(buf)-1], 1) == 1) {
-		if ((buf[0] == 10) && (isdigit(buf[1])) && (isdigit(buf[2]))) {
-			if (read(fd, buf, 1) == 1) {
-				*offset = lseek(fd, 0, SEEK_CUR) - 3;
-				rc = 0;
-				if (size) {
-					if (!findbreak(fd, &offset2, 0))
-						*size = offset2 - *offset;
-					else *size = lseek(fd, 0, SEEK_END) - *offset;
-					lseek(fd, *offset, SEEK_SET);
-				}
-				break;
-			}
-			break;
-		}
-		memmove(buf, &buf[1], sizeof(buf)-1);
-	}
-	return rc;
-}
-
-
-void main(int argc, char **argv)
-{
-	int   fd, ifd;
-	long  offset;
-	short size;
-	char  *buf;
-	char  entbuf[6];
-
-	if (argc < 2) {
-		fprintf(stderr, "usage: %s <file to process (no .dat)>\n", argv[0]);
-		exit(1);
-	}
-
-	buf = (char *) calloc(strlen(argv[1]) + 5, 1);
-
-	sprintf(buf, "%s.dat", argv[1]);
-	fd = open(buf, O_RDONLY);
-
-	sprintf(buf, "%s.idx", argv[1]);
-	ifd = open(buf, O_CREAT|O_WRONLY);
-
-	offset = 0;				/* write offset for intro */
-	write(ifd, &offset, 4);
-	findbreak(fd, &offset, 0);
-	lseek(fd, 0L, SEEK_SET);
-	size = offset - 12;
-	write(ifd, &size, 2);
-
-	entbuf[5] = 0;				/* delimit string for read below */
-
-	while(!findbreak(fd, &offset, &size)) {
-		write(ifd, &offset, 4);
-		write(ifd, &size, 2);
-		read(fd, entbuf, 5);
-		printf("Found: %s...(%ld:%d)\n", entbuf, offset, size);
-	}
-
-	free(buf);
-
-	close(ifd);
-	close(fd);
-}
diff --git a/src/modules/lexdict/rawld4/Makefile b/src/modules/lexdict/rawld4/Makefile
deleted file mode 100644
index 35d6648..0000000
--- a/src/modules/lexdict/rawld4/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-
-root := ../../../..
-
-all:
-	make -C ${root}
diff --git a/src/modules/lexdict/rawld4/Makefile.am b/src/modules/lexdict/rawld4/Makefile.am
deleted file mode 100644
index 697e2e5..0000000
--- a/src/modules/lexdict/rawld4/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-rawld4dir = $(top_srcdir)/src/modules/lexdict/rawld4
-
-libsword_la_SOURCES += $(rawld4dir)/rawld4.cpp
-
diff --git a/src/modules/lexdict/rawld4/rawld4.cpp b/src/modules/lexdict/rawld4/rawld4.cpp
deleted file mode 100644
index a32ce25..0000000
--- a/src/modules/lexdict/rawld4/rawld4.cpp
+++ /dev/null
@@ -1,172 +0,0 @@
-/******************************************************************************
- *  rawld.cpp - code for class 'RawLD'- a module that reads raw lexicon and
- *				dictionary files: *.dat *.idx
- */
-
-
-#include <ctype.h>
-#include <stdio.h>
-#include <fcntl.h>
-
-#ifndef __GNUC__
-#include <io.h>
-#else
-#include <unistd.h>
-#endif
-
-#include <utilfuns.h>
-#include <rawstr4.h>
-#include <rawld4.h>
-
-SWORD_NAMESPACE_START
-
- /******************************************************************************
- * RawLD Constructor - Initializes data for instance of RawLD
- *
- * ENT:	ipath	- path and filename of files (no extension)
- *		iname	- Internal name for module
- *		idesc	- Name to display to user for module
- *		idisp	- Display object to use for displaying
- */
-
-RawLD4::RawLD4(const char *ipath, const char *iname, const char *idesc, SWDisplay *idisp, SWTextEncoding enc, SWTextDirection dir, SWTextMarkup mark, const char* ilang) : RawStr4(ipath), SWLD(iname, idesc, idisp, enc, dir, mark, ilang)
-{
-}
-
-
-/******************************************************************************
- * RawLD Destructor - Cleans up instance of RawLD
- */
-
-RawLD4::~RawLD4()
-{
-}
-
-
-/******************************************************************************
- * RawLD4::strongsPad	- Pads a key if it is 100% digits to 5 places
- *
- * ENT: buf -	buffer to check and pad
- */
-
-void RawLD4::strongsPad(char *buf)
-{
-	const char *check;
-	long size = 0;
-	int len = strlen(buf);
-	if ((len < 5) && (len > 0)) {
-		for (check = buf; *check; check++) {
-			if (!isdigit(*check))
-				break;
-			else size++;
-		}
-
-		if ((size == len) && size) 
-			sprintf(buf, "%.5d", atoi(buf));
-	}
-}
-
-
-/******************************************************************************
- * RawLD4::getEntry	- Looks up entry from data file.  'Snaps' to closest
- *				entry and sets 'entrybuf'.
- *
- * ENT: away - number of entries offset from key (default = 0)
- *
- * RET: error status
- */
-
-char RawLD4::getEntry(long away)
-{
-	long  start = 0;
-	unsigned long size = 0;
-	char *idxbuf = 0;
-	char retval = 0;
-
-	char *buf = new char [ strlen(*key) + 6 ];
-	strcpy(buf, *key);
-
-	strongsPad(buf);
-
-	entryBuf = "";
-	if (!(retval = findOffset(buf, &start, &size, away))) {
-		readText(start, &size, &idxbuf, entryBuf);
-		rawFilter(entryBuf, 0);	// hack, decipher
-		rawFilter(entryBuf, key);
-		entrySize = size;        // support getEntrySize call
-		if (!key->Persist())			// If we have our own key
-			*key = idxbuf;				// reset it to entry index buffer
-
-		stdstr(&entkeytxt, idxbuf);	// set entry key text that module 'snapped' to.
-		delete [] idxbuf;
-	}
-		
-	delete [] buf;
-	return retval;
-}
-
-
-/******************************************************************************
- * RawLD4::getRawEntry	- Returns the correct entry when char * cast
- *							is requested
- *
- * RET: string buffer with entry
- */
-
-SWBuf &RawLD4::getRawEntryBuf() {
-
-	char ret = getEntry();
-	if (!ret) {
-//		if (!isUnicode())
-			prepText(entryBuf);
-	}
-	else error = ret;
-
-	return entryBuf;
-}
-
-
-/******************************************************************************
- * RawLD4::increment	- Increments module key a number of entries
- *
- * ENT:	increment	- Number of entries to jump forward
- *
- * RET: *this
- */
-
-void RawLD4::increment(int steps) {
-	char tmperror;
-
-	if (key->Traversable()) {
-		*key += steps;
-		error = key->Error();
-		steps = 0;
-	}
-	
-	tmperror = (getEntry(steps)) ? KEYERR_OUTOFBOUNDS : 0;
-	error = (error)?error:tmperror;
-	*key = entkeytxt;
-}
-
-
-void RawLD4::setEntry(const char *inbuf, long len) {
-	doSetText(*key, inbuf, len);
-}
-
-
-void RawLD4::linkEntry(const SWKey *inkey) {
-	doLinkEntry(*key, *inkey);
-}
-
-
-/******************************************************************************
- * RawFiles::deleteEntry	- deletes this entry
- *
- * RET: *this
- */
-
-void RawLD4::deleteEntry() {
-	doSetText(*key, "");
-}
-
-SWORD_NAMESPACE_END
diff --git a/src/modules/lexdict/swld.cpp b/src/modules/lexdict/swld.cpp
deleted file mode 100644
index f8421cc..0000000
--- a/src/modules/lexdict/swld.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-/******************************************************************************
- *  swld.cpp   - code for base class 'SWLD'.  SWLD is the basis for all
- *				types of Lexicon and Dictionary modules (hence the 'LD').
- */
-
-#include <swld.h>
-
-SWORD_NAMESPACE_START
-
-/******************************************************************************
- * SWLD Constructor - Initializes data for instance of SWLD
- *
- * ENT:	imodname - Internal name for module
- *	imoddesc - Name to display to user for module
- *	idisp	 - Display object to use for displaying
- */
-
-SWLD::SWLD(const char *imodname, const char *imoddesc, SWDisplay *idisp, SWTextEncoding enc, SWTextDirection dir, SWTextMarkup mark, const char* ilang) : SWModule(imodname, imoddesc, idisp, "Lexicons / Dictionaries", enc, dir, mark, ilang)
-{
-	delete key;
-	key = CreateKey();
-	entkeytxt = new char [1];
-	*entkeytxt = 0;
-}
-
-
-/******************************************************************************
- * SWLD Destructor - Cleans up instance of SWLD
- */
-
-SWLD::~SWLD()
-{
-	if (entkeytxt)
-		delete [] entkeytxt;
-}
-
-
-/******************************************************************************
- * SWLD::KeyText - Sets/gets module KeyText, getting from saved text if key is
- *				persistent
- *
- * ENT:	ikeytext - value which to set keytext
- *		[0] - only get
- *
- * RET:	pointer to keytext
- */
-
-const char *SWLD::KeyText(const char *ikeytext)
-{
-	if (key->Persist() && !ikeytext) {
-		getRawEntryBuf();	// force module key to snap to entry
-		return entkeytxt;
-	}
-	else return SWModule::KeyText(ikeytext);
-}
-
-
-/******************************************************************************
- * SWLD::setPosition(SW_POSITION)	- Positions this key if applicable
- */
-
-void SWLD::setPosition(SW_POSITION p) {
-	if (!key->Traversable()) {
-		switch (p) {
-		case POS_TOP:
-			*key = "";
-			break;
-		case POS_BOTTOM:
-			*key = "zzzzzzzzz";
-			break;
-		} 
-	}
-	else	*key = p;
-	getRawEntryBuf();
-}
-
-
-SWORD_NAMESPACE_END
diff --git a/src/modules/lexdict/zld/Makefile b/src/modules/lexdict/zld/Makefile
deleted file mode 100644
index 35d6648..0000000
--- a/src/modules/lexdict/zld/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-
-root := ../../../..
-
-all:
-	make -C ${root}
diff --git a/src/modules/lexdict/zld/Makefile.am b/src/modules/lexdict/zld/Makefile.am
deleted file mode 100644
index 81e4d7c..0000000
--- a/src/modules/lexdict/zld/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-zlddir = $(top_srcdir)/src/modules/lexdict/zld
-
-libsword_la_SOURCES += $(zlddir)/zld.cpp
-
diff --git a/src/modules/lexdict/zld/zld.cpp b/src/modules/lexdict/zld/zld.cpp
deleted file mode 100644
index dd3fe8e..0000000
--- a/src/modules/lexdict/zld/zld.cpp
+++ /dev/null
@@ -1,170 +0,0 @@
-/******************************************************************************
- *  rawld.cpp - code for class 'RawLD'- a module that reads raw lexicon and
- *				dictionary files: *.dat *.idx
- */
-
-
-#include <ctype.h>
-#include <stdio.h>
-#include <fcntl.h>
-
-#ifndef __GNUC__
-#include <io.h>
-#else
-#include <unistd.h>
-#endif
-
-#include <utilfuns.h>
-#include <zstr.h>
-#include <zld.h>
-
-SWORD_NAMESPACE_START
-
- /******************************************************************************
- * RawLD Constructor - Initializes data for instance of RawLD
- *
- * ENT:	ipath	- path and filename of files (no extension)
- *		iname	- Internal name for module
- *		idesc	- Name to display to user for module
- *		idisp	- Display object to use for displaying
- */
-
-zLD::zLD(const char *ipath, const char *iname, const char *idesc, long blockCount, SWCompress *icomp, SWDisplay *idisp, SWTextEncoding enc, SWTextDirection dir, SWTextMarkup mark, const char* ilang) : zStr(ipath, -1, blockCount, icomp), SWLD(iname, idesc, idisp, enc, dir, mark, ilang) {
-
-}
-
-
-/******************************************************************************
- * RawLD Destructor - Cleans up instance of RawLD
- */
-
-zLD::~zLD() {
-
-}
-
-
-/******************************************************************************
- * zLD::strongsPad	- Pads a key if it is 100% digits to 5 places
- *
- * ENT: buf -	buffer to check and pad
- */
-
-void zLD::strongsPad(char *buf) {
-	const char *check;
-	long size = 0;
-	int len = strlen(buf);
-	if ((len < 5) && (len > 0)) {
-		for (check = buf; *check; check++) {
-			if (!isdigit(*check))
-				break;
-			else size++;
-		}
-
-		if ((size == len) && size) 
-			sprintf(buf, "%.5d", atoi(buf));
-	}
-}
-
-
-/******************************************************************************
- * zLD::getEntry	- Looks up entry from data file.  'Snaps' to closest
- *				entry and sets 'entrybuf'.
- *
- * ENT: away - number of entries offset from key (default = 0)
- *
- * RET: error status
- */
-
-char zLD::getEntry(long away) {
-	char *idxbuf = 0;
-	char *ebuf = 0;
-	char retval = 0;
-	long index;
-	unsigned long size;
-	char *buf = new char [ strlen(*key) + 6 ];
-	strcpy(buf, *key);
-
-	strongsPad(buf);
-
-	entryBuf = "";
-	if (!(retval = findKeyIndex(buf, &index, away))) {
-		getText(index, &idxbuf, &ebuf);
-		size = strlen(ebuf) + 1;
-		entryBuf = ebuf;
-
-		rawFilter(entryBuf, key);
-
-		entrySize = size;        // support getEntrySize call
-		if (!key->Persist())			// If we have our own key
-			*key = idxbuf;				// reset it to entry index buffer
-
-		stdstr(&entkeytxt, idxbuf);	// set entry key text that module 'snapped' to.
-		free(idxbuf);
-		free(ebuf);
-	}
-		
-	delete [] buf;
-	return retval;
-}
-
-
-/******************************************************************************
- * zLD::getRawEntry	- Returns the correct entry when char * cast
- *							is requested
- *
- * RET: string buffer with entry
- */
-
-SWBuf &zLD::getRawEntryBuf() {
-	if (!getEntry() /*&& !isUnicode()*/) {
-		prepText(entryBuf);
-	}
-
-	return entryBuf;
-}
-
-
-/******************************************************************************
- * zLD::increment	- Increments module key a number of entries
- *
- * ENT:	increment	- Number of entries to jump forward
- *
- * RET: *this
- */
-
-void zLD::increment(int steps) {
-	char tmperror;
-
-	if (key->Traversable()) {
-		*key += steps;
-		error = key->Error();
-		steps = 0;
-	}
-	
-	tmperror = (getEntry(steps)) ? KEYERR_OUTOFBOUNDS : 0;
-	error = (error)?error:tmperror;
-	*key = entkeytxt;
-}
-
-
-void zLD::setEntry(const char *inbuf, long len) {
-	setText(*key, inbuf, len);
-}
-
-
-void zLD::linkEntry(const SWKey *inkey) {
-	zStr::linkEntry(*key, *inkey);
-}
-
-
-/******************************************************************************
- * RawFiles::deleteEntry	- deletes this entry
- *
- * RET: *this
- */
-
-void zLD::deleteEntry() {
-	setText(*key, "");
-}
-
-SWORD_NAMESPACE_END
diff --git a/src/modules/readme b/src/modules/readme
deleted file mode 100644
index 92cc99e..0000000
--- a/src/modules/readme
+++ /dev/null
@@ -1,9 +0,0 @@
-This directory contains all different module types that are usable by the SWORD
-API.
-
-	comments		Commentaries
-	common		common utility objects
-	lexdict		Lexicons/Dictionaries
-	maps			Maps
-	parsers		Language Parsers
-	texts		Scripture Texts
diff --git a/src/modules/swmodule.cpp b/src/modules/swmodule.cpp
deleted file mode 100644
index 08ad2a9..0000000
--- a/src/modules/swmodule.cpp
+++ /dev/null
@@ -1,741 +0,0 @@
-/******************************************************************************
- *  swmodule.cpp -code for base class 'module'.  Module is the basis for all
- *		  types of modules (e.g. texts, commentaries, maps, lexicons,
- *		  etc.)
- */
-
-#include <swmodule.h>
-#include <utilfuns.h>
-#include <regex.h>	// GNU
-#include <swfilter.h>
-#include <versekey.h>	// KLUDGE for Search
-#ifndef _MSC_VER
-#include <iostream>
-#endif
-
-SWORD_NAMESPACE_START
-
-SWDisplay SWModule::rawdisp;
-
-/******************************************************************************
- * SWModule Constructor - Initializes data for instance of SWModule
- *
- * ENT:	imodname - Internal name for module
- *	imoddesc - Name to display to user for module
- *	idisp	 - Display object to use for displaying
- *	imodtype - Type of Module (All modules will be displayed with
- *			others of same type under their modtype heading
- *	unicode  - if this module is unicode
- */
-
-SWModule::SWModule(const char *imodname, const char *imoddesc, SWDisplay *idisp, char *imodtype, SWTextEncoding encoding, SWTextDirection direction, SWTextMarkup markup, const char* imodlang) {
-	key       = CreateKey();
-	entryBuf  = "";
-	config    = &ownConfig;
-	modname   = 0;
-	error     = 0;
-	moddesc   = 0;
-	modtype   = 0;
-	modlang   = 0;
-	this->encoding = encoding;
-	this->direction = direction;
-	this->markup  = markup;
-	entrySize= -1;
-	disp     = (idisp) ? idisp : &rawdisp;
-	stdstr(&modname, imodname);
-	stdstr(&moddesc, imoddesc);
-	stdstr(&modtype, imodtype);
-	stdstr(&modlang, imodlang);
-	stripFilters = new FilterList();
-	rawFilters = new FilterList();
-	renderFilters = new FilterList();
-	optionFilters = new FilterList();
-	encodingFilters = new FilterList();
-	skipConsecutiveLinks = true;
-	procEntAttr = true;
-}
-
-
-/******************************************************************************
- * SWModule Destructor - Cleans up instance of SWModule
- */
-
-SWModule::~SWModule()
-{
-	if (modname)
-		delete [] modname;
-	if (moddesc)
-		delete [] moddesc;
-	if (modtype)
-		delete [] modtype;
-	if (modlang)
-		delete [] modlang;
-
-	if (key) {
-		if (!key->Persist())
-			delete key;
-	}
-
-	stripFilters->clear();
-     rawFilters->clear();
-     renderFilters->clear();
-     optionFilters->clear();
-     encodingFilters->clear();
-	entryAttributes.clear();
-
-     delete stripFilters;
-     delete rawFilters;
-     delete renderFilters;
-     delete optionFilters;
-     delete encodingFilters;
-}
-
-
-/******************************************************************************
- * SWModule::CreateKey - Allocates a key of specific type for module
- *
- * RET:	pointer to allocated key
- */
-
-SWKey *SWModule::CreateKey()
-{
-	return new SWKey();
-}
-
-
-/******************************************************************************
- * SWModule::Error - Gets and clears error status
- *
- * RET:	error status
- */
-
-char SWModule::Error()
-{
-	char retval = error;
-
-	error = 0;
-	return retval;
-}
-
-
-/******************************************************************************
- * SWModule::Name - Sets/gets module name
- *
- * ENT:	imodname - value which to set modname
- *		[0] - only get
- *
- * RET:	pointer to modname
- */
-
-char *SWModule::Name(const char *imodname) {
-	return stdstr(&modname, imodname);
-}
-
-char *SWModule::Name() const {
-	return modname;
-}
-
-
-/******************************************************************************
- * SWModule::Description - Sets/gets module description
- *
- * ENT:	imoddesc - value which to set moddesc
- *		[0] - only get
- *
- * RET:	pointer to moddesc
- */
-
-char *SWModule::Description(const char *imoddesc) {
-	return stdstr(&moddesc, imoddesc);
-}
-
-char *SWModule::Description() const {
-	return moddesc;
-}
-
-
-/******************************************************************************
- * SWModule::Type - Sets/gets module type
- *
- * ENT:	imodtype - value which to set modtype
- *		[0] - only get
- *
- * RET:	pointer to modtype
- */
-
-char *SWModule::Type(const char *imodtype) {
-	return stdstr(&modtype, imodtype);
-}
-
-char *SWModule::Type() const {
-	return modtype;
-}
-
-/******************************************************************************
- * SWModule::Direction - Sets/gets module direction
- *
- * ENT:	newdir - value which to set direction
- *		[-1] - only get
- *
- * RET:	char direction
- */
-char SWModule::Direction(signed char newdir) {
-        if (newdir != -1)
-                direction = newdir;
-        return direction;
-}
-
-/******************************************************************************
- * SWModule::Encoding - Sets/gets module encoding
- *
- * ENT:	newdir - value which to set direction
- *		[-1] - only get
- *
- * RET:	char encoding
- */
-char SWModule::Encoding(signed char newenc) {
-        if (newenc != -1)
-                encoding = newenc;
-        return encoding;
-}
-
-/******************************************************************************
- * SWModule::Markup - Sets/gets module markup
- *
- * ENT:	newdir - value which to set direction
- *		[-1] - only get
- *
- * RET:	char markup
- */
-char SWModule::Markup(signed char newmark) {
-        if (newmark != -1)
-                markup = newmark;
-        return markup;
-}
-
-
-/******************************************************************************
- * SWModule::Lang - Sets/gets module language
- *
- * ENT:	imodlang - value which to set modlang
- *		[0] - only get
- *
- * RET:	pointer to modname
- */
-
-char *SWModule::Lang(const char *imodlang)
-{
-	return stdstr(&modlang, imodlang);
-}
-
-
-/******************************************************************************
- * SWModule::Disp - Sets/gets display driver
- *
- * ENT:	idisp - value which to set disp
- *		[0] - only get
- *
- * RET:	pointer to disp
- */
-
-SWDisplay *SWModule::Disp(SWDisplay *idisp)
-{
-	if (idisp)
-		disp = idisp;
-
-	return disp;
-}
-
-
-/******************************************************************************
- * SWModule::Display - Calls this modules display object and passes itself
- *
- * RET:	error status
- */
-
-char SWModule::Display()
-{
-	disp->Display(*this);
-	return 0;
-}
-
-
-/******************************************************************************
- * SWModule::getKey - Gets the key from this module that points to the position
- *			record
- *
- * RET:	key object
- */
-
-SWKey *SWModule::getKey() const {
-	return key;
-}
-
-
-/******************************************************************************
- * SWModule::setKey - Sets a key to this module for position to a particular
- *			record
- *
- * ENT:	ikey - key with which to set this module
- *
- * RET:	error status
- */
-
-char SWModule::setKey(const SWKey *ikey) {
-	SWKey *oldKey = 0;
-
-	if (key) {
-		if (!key->Persist())	// if we have our own copy
-			oldKey = key;
-	}
-
-	if (!ikey->Persist()) {		// if we are to keep our own copy
-		 key = CreateKey();
-		*key = *ikey;
-	}
-	else	 key = (SWKey *)ikey;		// if we are to just point to an external key
-
-	if (oldKey)
-		delete oldKey;
-
-	return 0;
-}
-
-
-/******************************************************************************
- * SWModule::setPosition(SW_POSITION)	- Positions this modules to an entry
- *
- * ENT:	p	- position (e.g. TOP, BOTTOM)
- *
- * RET: *this
- */
-
-void SWModule::setPosition(SW_POSITION p) {
-	*key = p;
-	char saveError = key->Error();
-
-	switch (p) {
-	case POS_TOP:
-		(*this)++;
-		(*this)--;
-		break;
-
-	case POS_BOTTOM:
-		(*this)--;
-		(*this)++;
-		break;
-	}
-
-	error = saveError;
-}
-
-
-/******************************************************************************
- * SWModule::increment	- Increments module key a number of entries
- *
- * ENT:	increment	- Number of entries to jump forward
- *
- * RET: *this
- */
-
-void SWModule::increment(int steps) {
-	(*key) += steps;
-	error = key->Error();
-}
-
-
-/******************************************************************************
- * SWModule::decrement	- Decrements module key a number of entries
- *
- * ENT:	decrement	- Number of entries to jump backward
- *
- * RET: *this
- */
-
-void SWModule::decrement(int steps) {
-	(*key) -= steps;
-	error = key->Error();
-}
-
-
-/******************************************************************************
- * SWModule::Search 	- Searches a module for a string
- *
- * ENT:	istr		- string for which to search
- * 	searchType	- type of search to perform
- *				>=0 - regex
- *				-1  - phrase
- *				-2  - multiword
- *				-3  - entryAttrib
- * 	flags		- options flags for search
- *	justCheckIfSupported	- if set, don't search, only tell if this
- *							function supports requested search.
- *
- * RET: listkey set to verses that contain istr
- */
-
-ListKey &SWModule::search(const char *istr, int searchType, int flags, SWKey *scope, bool *justCheckIfSupported, void (*percent)(char, void *), void *percentUserData) {
-	SWKey *savekey = 0;
-	SWKey *searchkey = 0;
-	regex_t preg;
-	SWKey textkey;
-	char **words = 0;
-	char *wordBuf = 0;
-	int wordCount = 0;
-	const char *sres;
-	terminateSearch = false;
-	char perc = 1;
-	bool savePEA = isProcessEntryAttributes();
-
-	processEntryAttributes(searchType == -3);
-	
-	listkey.ClearList();
-
-	if (!key->Persist()) {
-		savekey = CreateKey();
-		*savekey = *key;
-	}
-	else	savekey = key;
-
-	searchkey = (scope)?scope->clone():(key->Persist())?key->clone():0;
-	if (searchkey) {
-		searchkey->Persist(1);
-		setKey(*searchkey);
-	}
-
-	(*percent)(perc, percentUserData);
-	// MAJOR KLUDGE: VerseKey::Index still return index within testament.
-	// 	VerseKey::NewIndex should be moved to Index and Index should be some
-	// 	VerseKey specific name
-	VerseKey *vkcheck = 0;
-#ifndef _WIN32_WCE
-	try {
-#endif
-		vkcheck = SWDYNAMIC_CAST(VerseKey, key);
-#ifndef _WIN32_WCE
-	}
-	catch (...) {}
-#endif
-	// end MAJOR KLUDGE
-
-	*this = BOTTOM;
-	// fix below when we find out the bug
-	long highIndex = (vkcheck)?32300/*vkcheck->NewIndex()*/:key->Index();
-	if (!highIndex)
-		highIndex = 1;		// avoid division by zero errors.
-	*this = TOP;
-	if (searchType >= 0) {
-		flags |=searchType|REG_NOSUB|REG_EXTENDED;
-		regcomp(&preg, istr, flags);
-	}
-
-	(*percent)(++perc, percentUserData);
-	if (searchType == -2) {
-		wordBuf = (char *)calloc(sizeof(char), strlen(istr) + 1);
-		strcpy(wordBuf, istr);
-		words = (char **)calloc(sizeof(char *), 10);
-		int allocWords = 10;
-		words[wordCount] = strtok(wordBuf, " ");
-		while (words[wordCount]) {
-			wordCount++;
-			if (wordCount == allocWords) {
-				allocWords+=10;
-				words = (char **)realloc(words, sizeof(char *)*allocWords);
-			}
-			words[wordCount] = strtok(NULL, " ");
-		}
-	}
-
-	if (searchType == -3) {
-		wordBuf = (char *)calloc(sizeof(char), strlen(istr) + 1);
-		char *checkSlash = wordBuf;
-		strcpy(wordBuf, istr);
-		words = (char **)calloc(sizeof(char *), 10);
-		int allocWords = 10;
-		while (*checkSlash == '/')
-			words[wordCount++] = checkSlash++;
-		words[wordCount] = strtok(wordBuf, "/");
-		while (words[wordCount]) {
-			wordCount++;
-			if (wordCount == allocWords) {
-				allocWords+=10;
-				words = (char **)realloc(words, sizeof(char *)*allocWords);
-			}
-			checkSlash = words[wordCount-1] + (strlen(words[wordCount-1]))+1;
-			while (*checkSlash == '/')
-				words[wordCount++] = checkSlash++;
-			words[wordCount] = strtok(NULL, "/");
-		}
-		for (int i = 0; i < wordCount; i++) {
-			if (words[i][0] == '/')
-				words[i][0] = 0;
-		}
-	}
-
-	perc = 5;
-	(*percent)(perc, percentUserData);
-
-	while (!Error() && !terminateSearch) {
-
-	
-		long mindex = 0;
-		if (vkcheck)
-			mindex = vkcheck->NewIndex();
-		else mindex = key->Index();
-		float per = (float)mindex / highIndex;
-		per *= 93;
-		per += 5;
-		char newperc = (char)per;
-//		char newperc = (char)(5+(93*(((float)((vkcheck)?vkcheck->NewIndex():key->Index()))/highIndex)));
-		if (newperc > perc) {
-			perc = newperc;
-			(*percent)(perc, percentUserData);
-		}
-		else if (newperc < perc) {
-#ifndef _MSC_VER
-			std::cerr << "Serious error: new percentage complete is less than previous value\n";
-			std::cerr << "using vk? " << ((vkcheck)?"yes":"no") << "\n";
-			std::cerr << "index: " << ((vkcheck)?vkcheck->NewIndex():key->Index()) << "\n";
-			std::cerr << "highIndex: " << highIndex << "\n";
-			std::cerr << "newperc ==" << (int)newperc << "%" << "is smaller than\n";
-			std::cerr << "perc == "  << (int )perc << "% \n";
-#endif
-		}
-		if (searchType >= 0) {
-			if (!regexec(&preg,  StripText(), 0, 0, 0)) {
-				textkey = KeyText();
-				listkey << textkey;
-			}
-		}
-		else if (searchType == -1) {
-			sres = ((flags & REG_ICASE) == REG_ICASE) ? stristr(StripText(), istr) : strstr(StripText(), istr);
-			if (sres) {
-					textkey = KeyText();
-					listkey << textkey;
-			}
-		}
-		else if (searchType == -2) {
-			int i;
-			const char *stripBuf = StripText();
-			for (i = 0; i < wordCount; i++) {
-				sres = ((flags & REG_ICASE) == REG_ICASE) ? stristr(stripBuf, words[i]) : strstr(stripBuf, words[i]);
-				if (!sres)
-					break;
-			}
-			if (i == wordCount) {
-				textkey = KeyText();
-				listkey << textkey;
-			}
-		}
-		else if (searchType == -3) {
-			int i;
-			RenderText();	// force parse
-			AttributeTypeList &entryAttribs = getEntryAttributes();
-			AttributeTypeList::iterator i1Start, i1End;
-			AttributeList::iterator i2Start, i2End;
-			AttributeValue::iterator i3Start, i3End;
-
-			if ((words[0]) && (words[0][0])) {
-				i1Start = entryAttribs.find(words[0]);
-				i1End = i1Start;
-				if (i1End != entryAttribs.end())
-				i1End++;
-			}
-			else {
-				i1Start = entryAttribs.begin();
-				i1End   = entryAttribs.end();
-			}
-			for (;i1Start != i1End; i1Start++) {
-				if ((words[1]) && (words[1][0])) {
-					i2Start = i1Start->second.find(words[1]);
-					i2End = i2Start;
-					if (i2End != i1Start->second.end())
-						i2End++;
-				}
-				else {
-					i2Start = i1Start->second.begin();
-					i2End   = i1Start->second.end();
-				}
-				for (;i2Start != i2End; i2Start++) {
-					if ((words[2]) && (words[2][0])) {
-						i3Start = i2Start->second.find(words[2]);
-						i3End = i3Start;
-						if (i3End != i2Start->second.end())
-							i3End++;
-					}
-					else {
-						i3Start = i2Start->second.begin();
-						i3End   = i2Start->second.end();
-					}
-					for (;i3Start != i3End; i3Start++) {
-						sres = ((flags & REG_ICASE) == REG_ICASE) ? stristr(i3Start->second.c_str(), words[3]) : strstr(i3Start->second.c_str(), words[3]);
-						if (sres) {
-							textkey = KeyText();
-							listkey << textkey;
-							break;
-						}
-					}
-					if (i3Start != i3End)
-						break;
-				}
-				if (i2Start != i2End)
-					break;
-			}
-		}
-		(*this)++;
-	}
-	if (searchType >= 0)
-		regfree(&preg);
-
-	if (searchType == -2) {
-		free(words);
-		free(wordBuf);
-	}
-
-	setKey(*savekey);
-
-	if (!savekey->Persist())
-		delete savekey;
-
-	if (searchkey)
-		delete searchkey;
-
-	listkey = TOP;
-	processEntryAttributes(savePEA);
-	(*percent)(100, percentUserData);
-
-	return listkey;
-}
-
-
-/******************************************************************************
- * SWModule::StripText() 	- calls all stripfilters on current text
- *
- * ENT:	buf	- buf to massage instead of this modules current text
- * 	len	- max len of buf
- *
- * RET: this module's text at specified key location massaged by Strip filters
- */
-
-const char *SWModule::StripText(const char *buf, int len)
-{
-	return RenderText(buf, len, false);
-}
-
-
-/******************************************************************************
- * SWModule::RenderText 	- calls all renderfilters on current text
- *
- * ENT:	buf	- buffer to Render instead of current module position
- *
- * RET: listkey set to verses that contain istr
- */
-
- const char *SWModule::RenderText(const char *buf, int len, bool render) {
-	entryAttributes.clear();
-
-	static SWBuf local;
-	if (buf)
-		local = buf;
-
-	SWBuf &tmpbuf = (buf) ? local : getRawEntryBuf();
-	SWKey *key = 0;
-	static char *null = "";
-
-	if (tmpbuf) {
-		unsigned long size = (len < 0) ? ((getEntrySize()<0) ? strlen(tmpbuf) : getEntrySize()) : len;
-		if (size > 0) {
-			key = (SWKey *)*this;
-
-			optionFilter(tmpbuf, key);
-	
-			if (render) {
-				renderFilter(tmpbuf, key);
-				encodingFilter(tmpbuf, key);
-			}
-			else	stripFilter(tmpbuf, key);
-		}
-	}
-	else {
-		tmpbuf = null;
-	}
-
-	return tmpbuf;
-}
-
-
-/******************************************************************************
- * SWModule::RenderText 	- calls all renderfilters on current text
- *
- * ENT:	tmpKey	- key to use to grab text
- *
- * RET: this module's text at specified key location massaged by RenderFilers
- */
-
- const char *SWModule::RenderText(SWKey *tmpKey)
-{
-	SWKey *savekey;
-	const char *retVal;
-
-	if (!key->Persist()) {
-		savekey = CreateKey();
-		*savekey = *key;
-	}
-	else	savekey = key;
-
-	setKey(*tmpKey);
-
-	retVal = RenderText();
-
-	setKey(*savekey);
-
-	if (!savekey->Persist())
-		delete savekey;
-
-	return retVal;
-}
-
-
-/******************************************************************************
- * SWModule::StripText 	- calls all StripTextFilters on current text
- *
- * ENT:	tmpKey	- key to use to grab text
- *
- * RET: this module's text at specified key location massaged by Strip filters
- */
-
-const char *SWModule::StripText(SWKey *tmpKey)
-{
-	SWKey *savekey;
-	const char *retVal;
-
-	if (!key->Persist()) {
-		savekey = CreateKey();
-		*savekey = *key;
-	}
-	else	savekey = key;
-
-	setKey(*tmpKey);
-
-	retVal = StripText();
-
-	setKey(*savekey);
-
-	if (!savekey->Persist())
-		delete savekey;
-
-	return retVal;
-}
-
-
-const char *SWModule::getConfigEntry(const char *key) const {
-	ConfigEntMap::iterator it = config->find(key);
-	return (it != config->end()) ? it->second.c_str() : 0;
-}
-
-
-void SWModule::setConfig(ConfigEntMap *config) {
-	this->config = config;
-}
-
-SWORD_NAMESPACE_END
diff --git a/src/modules/tests/Makefile b/src/modules/tests/Makefile
deleted file mode 100644
index 81f7721..0000000
--- a/src/modules/tests/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-root := ../../..
-
-all:
-	make -C ${root}
diff --git a/src/modules/tests/echomod.cpp b/src/modules/tests/echomod.cpp
deleted file mode 100644
index 65e689b..0000000
--- a/src/modules/tests/echomod.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-/******************************************************************************
- *  echomod.cpp - code for class 'echomod'- a dummy test text module that just
- *		  echos back the key
- */
-
-#include <echomod.h>
-
-
-EchoMod::EchoMod() : SWText("echomod", "Echos back key")
-{
-}
-
-
-EchoMod::~EchoMod() {
-}
-
-
-EchoMod::operator const char*()
-{
-	return *key;
-}
diff --git a/src/modules/texts/Makefile b/src/modules/texts/Makefile
deleted file mode 100644
index 1a2d00d..0000000
--- a/src/modules/texts/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-
-root := ../../..
-
-all:
-	make -C ${root}
diff --git a/src/modules/texts/Makefile.am b/src/modules/texts/Makefile.am
deleted file mode 100644
index 2c4479e..0000000
--- a/src/modules/texts/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-textsdir = $(top_srcdir)/src/modules/texts
-
-libsword_la_SOURCES += $(textsdir)/swtext.cpp
-
-include ../src/modules/texts/rawtext/Makefile.am
-include ../src/modules/texts/ztext/Makefile.am
diff --git a/src/modules/texts/rawgbf/Gbf.c b/src/modules/texts/rawgbf/Gbf.c
deleted file mode 100644
index 2b7f786..0000000
--- a/src/modules/texts/rawgbf/Gbf.c
+++ /dev/null
@@ -1,485 +0,0 @@
-/* Output from p2c, the Pascal-to-C translator */
-/* From input file "Gbf.pas" */
-
-
-#include <p2c/p2c.h>
-
-
-typedef enum {
-  tokNull, tokEOF, tokHeader, tokContent, tokTail, tokStyle, tokWord,
-  tokSpace, tokSync, tokControl, tokChar, tokFont
-} TToken;
-typedef enum {
-  caBold, caSmallCaps, caItalic, caOTQuote, caRed, caSuperscript, caUnderline,
-  caSubscript
-} TCharacterAttribute;
-typedef long TCharAttribs;
-
-
-
-typedef struct TBookNameRec {
-  Char Name[256], Abbr[256];
-  uchar Num;
-} TBookNameRec;
-
-typedef TBookNameRec TBookAbbr[116];
-
-
-typedef struct TReadGBF {
-  /*        private*/
-  FILE *F;
-  Char FName[256], TokenLine[256];
-  long TokenPos;
-  boolean fFileIsOpen, fParagraphEnd, fInTitle, fInPsalmBookTitle,
-	  fInHebrewTitle, fInSectionTitle;
-
-  /*        public*/
-  Char sBook[256], sChapter[256], sVerse[256], sMode[256];
-  Char sContext[256];   /*// Last text type (header, body, or tail)*/
-  Char sTitle[256];   /*// Title of this book of the Bible*/
-  Char sPsalmBookTitle[256];   /*// Title of this Psalm book*/
-  Char sHebrewTitle[256];   /*// Psalm Hebrew title*/
-  Char sSectionTitle[256];   /*// Section headings*/
-  Char sDate[256], sFontName[256];
-  long iTotalWords;
-  Char chJustification, chDirection;
-  boolean fIndent, fPoetry;
-  TCharAttribs CharAttribs;
-  uchar bBk, bChap, bVs, bWd;
-  /*
-          function Init({const*/
-  /*sFileName: string): boolean;
-          procedure Done;
-          function GetToken(var TokenKind: TToken): string;
-  */
-} TReadGBF;
-
-typedef struct TWriteGBF {
-  /*        private*/
-  FILE *F;
-  Char FName[256], LineOut[256];
-  boolean fFileIsOpen;
-  uchar bBk, bChap, bVs, bWd;
-
-  /*        public*/
-  /*
-          function Init({const*/
-  /*sFileName: string): boolean;
-          function Done: boolean;
-          procedure Out({const*/
-  /*s: string);
-*/
-} TWriteGBF;
-
-/*implementation */
-
-
-/*//0*/
-/*//1*/
-/*//2*/
-/*//3*/
-/*//4*/
-/*//5*/
-/*//6*/
-/*//7*/
-/*//8*/
-/*//9*/
-/*//10*/
-/*//11*/
-/*//12*/
-/*//13*/
-/*//14*/
-/*//15*/
-/*//16*/
-/*//17*/
-/*//18*/
-/*//19*/
-/*//20*/
-/*//21*/
-/*//22*/
-/*//0*/
-/*//1*/
-/*//2*/
-/*//3*/
-/*//4*/
-/*//5*/
-/*//6*/
-/*//7*/
-/*//8*/
-/*//9*/
-/*//10*/
-/*//11*/
-/*//12*/
-/*//13*/
-/*//14*/
-/*//15*/
-/*//16*/
-/*//17*/
-/*//18*/
-/*//19*/
-/*//20*/
-/*//21*/
-/*//22*/
-/*//23*/
-/*//24*/
-/*//26*/
-/*//27*/
-/*//28*/
-/*//29*/
-/*//30*/
-/*//31*/
-/*//32*/
-/*//33*/
-/*//34*/
-/*//35*/
-/*//36*/
-/*//37*/
-/*//38*/
-/*//39*/
-/*//40*/
-/*//41*/
-/*//42*/
-/*//43*/
-/*//44*/
-/*//45*/
-/*//46*/
-/*//47*/
-/*//48*/
-/*//49*/
-/*//50*/
-/*//51*/
-/*//52*/
-/*//53*/
-/*//54*/
-/*//55*/
-/*//56*/
-/*//57*/
-/*//58*/
-/*//59*/
-/*//60*/
-/*//61*/
-/*//62*/
-/*//63*/
-/*//64*/
-/*//65*/
-/*//66*/
-/*//67*/
-/*//68*/
-/*//69*/
-/*//70*/
-/*//71*/
-/*//72*/
-/*//73*/
-/*//74*/
-/*//75*/
-/*//76*/
-/*//77*/
-/*//78*/
-/*//79*/
-/*//80*/
-/*//81*/
-/*//82*/
-/*//83*/
-/*//84*/
-/*//85*/
-/*//86*/
-/*//87*/
-/*//88*/
-/*//89*/
-/*//90*/
-/*//91*/
-/*//92*/
-
-Static TBookAbbr BookAbbr = {
-  { "1 Chronicles", "1CH", 13 },
-  { "1 Corinthians", "1CO", 70 },
-  { "1 Esdras", "1E", 52 },
-  { "1 John", "1J", 86 },
-  { "1 Kings", "1K", 11 },
-  { "1 Maccabees", "1M", 50 },
-  { "1 Peter", "1P", 84 },
-  { "1 Samuel", "1S", 9 },
-  { "1 Thessalonians", "1TH", 76 },
-  { "1 Timothy", "1TI", 78 },
-  { "2 Chronicles", "2CH", 14 },
-  { "2 Corinthians", "2CO", 71 },
-  { "2 Esdras", "2E", 56 },
-  { "2 John", "2J", 87 },
-  { "2 Kings", "2K", 12 },
-  { "2 Maccabees", "2M", 51 },
-  { "2 Peter", "2P", 85 },
-  { "2 Samuel", "2S", 10 },
-  { "2 Thessalonians", "2TH", 77 },
-  { "2 Timothy", "2TI", 79 },
-  { "3 John", "3J", 88 },
-  { "3 Maccabees", "3M", 55 },
-  { "4 Maccabees", "4M", 57 },
-  { "1 Chronicles", "1 CH", 13 },
-  { "1 Corinthians", "1 CO", 70 },
-  { "1 Esdras", "1 E", 52 },
-  { "1 John", "1 J", 86 },
-  { "1 Kings", "1 K", 11 },
-  { "1 Maccabees", "1 M", 50 },
-  { "1 Peter", "1 P", 84 },
-  { "1 Samuel", "1 S", 9 },
-  { "1 Thessalonians", "1 TH", 76 },
-  { "1 Timothy", "1 TI", 78 },
-  { "2 Chronicles", "2 CH", 14 },
-  { "2 Corinthians", "2 CO", 71 },
-  { "2 Esdras", "2 E", 56 },
-  { "2 John", "2 J", 87 },
-  { "2 Kings", "2 K", 12 },
-  { "2 Maccabees", "2 M", 51 },
-  { "2 Peter", "2 P", 85 },
-  { "2 Samuel", "2 S", 10 },
-  { "2 Thessalonians", "2 TH", 77 },
-  { "2 Timothy", "2 TI", 79 },
-  { "3 John", "3 J", 88 },
-  { "3 Maccabees", "3 M", 55 },
-  { "4 Maccabees", "4 M", 57 },
-  { "Acts", "AC", 68 },
-  { "Amos", "AM", 30 },
-  { "Prayer of Asariah and the Song of the Three Jews", "AZ", 47 },
-  { "Baruch", "BA", 45 },
-  { "Bel and the Dragon", "BE", 49 },
-  { "Colossians", "CO", 75 },
-  { "Daniel", "DA", 27 },
-  { "Deuteronomy", "DE", 5 },
-  { "Deuteronomy", "DT", 5 },
-  { "Ecclesiasties", "EC", 21 },
-  { "Esther", "ES", 17 },
-  { "Exodus", "EX", 2 },
-  { "Ezekiel", "EZE", 26 },
-  { "Ezra", "EZR", 15 },
-  { "Galatians", "GA", 72 },
-  { "Genesis", "GE", 1 },
-  { "Genesis", "GN", 1 },
-  { "Ephesians", "EP", 73 },
-  { "Esther (Greek)", "GR", 42 },
-  { "Habakkuk", "HAB", 35 },
-  { "Haggai", "HAG", 37 },
-  { "Hebrews", "HE", 82 },
-  { "Hosea", "HO", 28 },
-  { "Isaiah", "IS", 23 },
-  { "James", "JA", 83 },
-  { "Jeremiah", "JE", 24 },
-  { "Job", "JOB", 18 },
-  { "Joel", "JOE", 29 },
-  { "John", "JOH", 67 },
-  { "Jonah", "JON", 32 },
-  { "Joshua", "JOS", 6 },
-  { "Jude", "JUDE", 89 },
-  { "Judges", "JUDG", 7 },
-  { "Judith", "JUDI", 41 },
-  { "Lamentations", "LA", 25 },
-  { "Letter of Jeremiah", "LET", 46 },
-  { "Leviticus", "LEV", 3 },
-  { "Luke", "LK", 66 },
-  { "Leviticus", "LV", 3 },
-  { "Luke", "LU", 66 },
-  { "Malachi", "MAL", 39 },
-  { "Prayer of Manasseh", "MAN", 53 },
-  { "Mark", "MAR", 65 },
-  { "Matthew", "MAT", 64 },
-  { "Micah", "MI", 33 },
-  { "Nahum", "NA", 34 },
-  { "Nehemiah", "NE", 16 },
-  { "Numbers", "NU", 4 },
-  { "Obadiah", "OB", 31 },
-  { "Psalm 151", "P1", 54 },
-  { "Philemon", "PHILE", 81 },
-  { "Philippians", "PHILI", 74 },
-  { "Philemon", "PHM", 81 },
-  { "Philippians", "PHP", 74 },
-  { "Proverbs", "PR", 20 },
-  { "Psalms", "PS", 19 },
-  { "Revelation", "RE", 90 },
-  { "Romans", "RM", 69 },
-  { "Romans", "RO", 69 },
-  { "Ruth", "RU", 8 },
-  { "Sirach", "SI", 44 },
-  { "Song of Solomon", "SOL", 22 },
-  { "Song of Solomon", "SON", 22 },
-  { "Song of Solomon", "SS", 22 },
-  { "Susanna", "SU", 48 },
-  { "Titus", "TI", 80 },
-  { "Tobit", "TO", 40 },
-  { "Wisdom", "WI", 43 },
-  { "Zechariah", "ZEC", 38 },
-  { "Zephaniah", "ZEP", 36 }
-};
-
-/*// 0 - 7*/
-/*// 8 - 14*/
-/*// 15-20*/
-/*// 21-26*/
-/*// 27-33*/
-/*// 34-39*/
-/*// 40-45*/
-/*// 46-52*/
-/*// 53-63*/
-/*// 64-70*/
-/*// 71-78*/
-/*// 79-84*/
-
-Static Char BookFileName[91][256] = {
-  "", "Genesis", "Exodus", "Lev", "Num", "Deut", "Joshua", "Judges", "Ruth",
-  "1Sam", "2Sam", "1Kings", "2Kings", "1Chron", "2Chron", "Ezra", "Nehemiah",
-  "Esther", "Job", "Psalms", "Proverbs", "Eccl", "Song", "Isaiah", "Jeremiah",
-  "Lament", "Ezekiel", "Daniel", "Hosea", "Joel", "Amos", "Obadiah", "Jonah",
-  "Micah", "Nahum", "Habakkuk", "Zeph", "Haggai", "Zech", "Malachi", "Tobit",
-  "Judith", "Esther", "Wisdom", "Sirach", "Baruch", "Let", "Azar", "Susanna",
-  "Bel", "1Mac", "2Mac", "1Esdras", "Man", "P1", "3Mac", "2Esdras", "4Mac",
-  "", "", "", "", "", "", "Matthew", "Mark", "Luke", "John", "Acts", "Romans",
-  "1Cor", "2Cor", "Gal", "Eph", "Philip", "Col", "1Thes", "2Thes", "1Tim",
-  "2Tim", "Titus", "Philemon", "Hebrews", "James", "1Peter", "2Peter",
-  "1John", "2John", "3John", "Jude", "Rev"
-/* p2c: Gbf.pas, line 200: 
- * Note: Line breaker spent 0.0 seconds, 5000 tries on line 336 [251] */
-};   /*// 85-90*/
-
-
-Static boolean isletter(ch)
-Char ch;
-{
-  /*const*/
-  boolean Result;
-
-  if (isupper(ch)) {
-    Result = true;
-    return Result;
-  }
-  if (islower(ch))
-    Result = true;
-  else
-    Result = false;
-  return Result;
-}
-
-
-Static boolean isinword(ch)
-Char ch;
-{
-  /*const*/
-  boolean Result;
-
-  switch (ch) {
-
-  case '-':
-    Result = true;
-    break;
-
-  default:
-    if (isupper(ch))
-      Result = true;
-    else if (islower(ch))
-      Result = true;
-    else
-      Result = false;
-    break;
-  }
-  return Result;
-}
-
-
-Static boolean IsUpper(ch)
-Char ch;
-{
-  /*const*/
-  boolean Result;
-
-  if (isupper(ch))
-    Result = true;
-  else
-    Result = false;
-  return Result;
-}
-
-
-Static boolean IsDigit(ch)
-Char ch;
-{
-  /*const*/
-  boolean Result;
-
-  if (isdigit(ch))
-    Result = true;
-  else
-    Result = false;
-  return Result;
-}
-
-
-Static boolean MatchAbbrev(sName, sAbbrev)
-Char *sName, *sAbbrev;
-{
-  /*const*/
-  long i;
-  boolean Result;
-
-  if (strlen(sName) < strlen(sAbbrev)) {
-    Result = false;
-/* p2c: Gbf.pas, line 245: Warning: Symbol 'RESULT' is not defined [221] */
-  } else
-    Result = true;
-  i = 1;
-  while (i <= strlen(sAbbrev) && Result) {
-    if (toupper(sName[i - 1]) != sAbbrev[i - 1])
-      Result = false;
-    i++;
-  }
-}
-
-
-Static uchar BookNameToNumber(sBookName)
-Char *sBookName;
-{
-  /*const*/
-  long Result;
-
-  Result = 0;
-/* p2c: Gbf.pas, line 259: Warning: Symbol 'RESULT' is not defined [221] */
-  TRY(try1);
-    if (IsDigit(sBookName[strlen(sBookName) - 1]) & IsDigit(sBookName[0])) {
-      Result = StrToInt(sBookName);
-/* p2c: Gbf.pas, line 262:
- * Warning: Symbol 'STRTOINT' is not defined [221] */
-    }
-    except();
-/* p2c: Gbf.pas, line 264: Warning: Symbol 'EXCEPT' is not defined [221] */
-/* p2c: Gbf.pas, line 264:
- * Warning: Expected RECOVER, found 'Result' [227] */
-  RECOVER(try1);
-    ;
-  ENDTRY(try1);
-}
-
-
-main(argc, argv)
-int argc;
-Char *argv[];
-{   /*// Yuk! Linear search.*/
-  Char STR1[256];
-  uchar Result;
-
-/* p2c: Gbf.pas, line 266: Warning: Expected BEGIN, found 'i' [227] */
-  PASCAL_MAIN(argc, argv);
-  if (MatchAbbrev(sBookName, BookAbbr[i].Abbr)) {
-/* p2c: Gbf.pas, line 269:
- * Warning: Symbol 'SBOOKNAME' is not defined [221] */
-/* p2c: Gbf.pas, line 269: Warning: Mixing non-strings with strings [170] */
-/* p2c: Gbf.pas, line 269: Warning: Symbol 'I' is not defined [221] */
-    Result = BookAbbr[i].Num;
-/* p2c: Gbf.pas, line 271: Warning: Symbol 'I' is not defined [221] */
-/* p2c: Gbf.pas, line 271: Warning: Symbol 'RESULT' is not defined [221] */
-  }
-/* p2c: Gbf.pas, line 273: Warning: Symbol 'I' is not defined [221] */
-  i++;
-  exit(EXIT_SUCCESS);
-}
-/* p2c: Gbf.pas, line 275: 
- * Warning: Junk at end of input file ignored [277] */
-
-
-
-/* End. */
diff --git a/src/modules/texts/rawgbf/Gbf.pas b/src/modules/texts/rawgbf/Gbf.pas
deleted file mode 100644
index 13826e3..0000000
--- a/src/modules/texts/rawgbf/Gbf.pas
+++ /dev/null
@@ -1,735 +0,0 @@
-type
-    TToken = (tokNull, tokEOF, tokHeader, tokContent, tokTail, tokStyle,
-              tokWord, tokSpace, tokSync, tokControl, tokChar, tokFont);
-    TCharacterAttribute = (caBold, caSmallCaps, caItalic, caOTQuote, caRed,
-                            caSuperscript, caUnderline, caSubscript);
-    TCharAttribs = set of TCharacterAttribute;
-
-
-    TBookNameRec = record
-        Name,
-        Abbr: string;
-        Num: byte
-    end;
-
-    TBookAbbr = array[0..115] of TBookNameRec;
-
-const
-    BookAbbr: TBookAbbr = (
-        (Name: '1 Chronicles';    Abbr: '1CH'; Num: 13),   {//0}
-        (Name: '1 Corinthians';   Abbr: '1CO'; Num: 70),   {//1}
-        (Name: '1 Esdras';        Abbr: '1E'; Num: 52),    {//2}
-        (Name: '1 John';          Abbr: '1J'; Num: 86),    {//3}
-        (Name: '1 Kings';         Abbr: '1K'; Num: 11),    {//4}
-        (Name: '1 Maccabees';     Abbr: '1M'; Num: 50),    {//5}
-        (Name: '1 Peter';         Abbr: '1P'; Num: 84),    {//6}
-        (Name: '1 Samuel';        Abbr: '1S'; Num: 9),     {//7}
-        (Name: '1 Thessalonians'; Abbr: '1TH'; Num: 76),   {//8}
-        (Name: '1 Timothy';       Abbr: '1TI'; Num: 78),   {//9}
-        (Name: '2 Chronicles';    Abbr: '2CH'; Num: 14),   {//10}
-        (Name: '2 Corinthians';   Abbr: '2CO'; Num: 71),   {//11}
-        (Name: '2 Esdras';        Abbr: '2E'; Num: 56),    {//12}
-        (Name: '2 John';          Abbr: '2J'; Num: 87),    {//13}
-        (Name: '2 Kings';         Abbr: '2K'; Num: 12),    {//14}
-        (Name: '2 Maccabees';     Abbr: '2M'; Num: 51),    {//15}
-        (Name: '2 Peter';         Abbr: '2P'; Num: 85),    {//16}
-        (Name: '2 Samuel';        Abbr: '2S'; Num: 10),    {//17}
-        (Name: '2 Thessalonians'; Abbr: '2TH'; Num: 77),   {//18}
-        (Name: '2 Timothy';       Abbr: '2TI'; Num: 79),   {//19}
-        (Name: '3 John';          Abbr: '3J'; Num: 88),    {//20}
-        (Name: '3 Maccabees';     Abbr: '3M'; Num: 55),    {//21}
-        (Name: '4 Maccabees';     Abbr: '4M'; Num: 57),    {//22}
-        (Name: '1 Chronicles';    Abbr: '1 CH'; Num: 13),   {//0}
-        (Name: '1 Corinthians';   Abbr: '1 CO'; Num: 70),   {//1}
-        (Name: '1 Esdras';        Abbr: '1 E'; Num: 52),    {//2}
-        (Name: '1 John';          Abbr: '1 J'; Num: 86),    {//3}
-        (Name: '1 Kings';         Abbr: '1 K'; Num: 11),    {//4}
-        (Name: '1 Maccabees';     Abbr: '1 M'; Num: 50),    {//5}
-        (Name: '1 Peter';         Abbr: '1 P'; Num: 84),    {//6}
-        (Name: '1 Samuel';        Abbr: '1 S'; Num: 9),     {//7}
-        (Name: '1 Thessalonians'; Abbr: '1 TH'; Num: 76),   {//8}
-        (Name: '1 Timothy';       Abbr: '1 TI'; Num: 78),   {//9}
-        (Name: '2 Chronicles';    Abbr: '2 CH'; Num: 14),   {//10}
-        (Name: '2 Corinthians';   Abbr: '2 CO'; Num: 71),   {//11}
-        (Name: '2 Esdras';        Abbr: '2 E'; Num: 56),    {//12}
-        (Name: '2 John';          Abbr: '2 J'; Num: 87),    {//13}
-        (Name: '2 Kings';         Abbr: '2 K'; Num: 12),    {//14}
-        (Name: '2 Maccabees';     Abbr: '2 M'; Num: 51),    {//15}
-        (Name: '2 Peter';         Abbr: '2 P'; Num: 85),    {//16}
-        (Name: '2 Samuel';        Abbr: '2 S'; Num: 10),    {//17}
-        (Name: '2 Thessalonians'; Abbr: '2 TH'; Num: 77),   {//18}
-        (Name: '2 Timothy';       Abbr: '2 TI'; Num: 79),   {//19}
-        (Name: '3 John';          Abbr: '3 J'; Num: 88),    {//20}
-        (Name: '3 Maccabees';     Abbr: '3 M'; Num: 55),    {//21}
-        (Name: '4 Maccabees';     Abbr: '4 M'; Num: 57),    {//22}
-        (Name: 'Acts';            Abbr: 'AC'; Num: 68),    {//23}
-        (Name: 'Amos';            Abbr: 'AM'; Num: 30),    {//24}
-        (Name: 'Prayer of Asariah and the Song of the Three Jews'; Abbr: 'AZ'; Num: 47),
-        (Name: 'Baruch';          Abbr: 'BA'; Num: 45),    {//26}
-        (Name: 'Bel and the Dragon';Abbr: 'BE'; Num: 49),  {//27}
-        (Name: 'Colossians';      Abbr: 'CO'; Num: 75),    {//28}
-        (Name: 'Daniel';          Abbr: 'DA'; Num: 27),    {//29}
-        (Name: 'Deuteronomy';     Abbr: 'DE'; Num: 5),     {//30}
-        (Name: 'Deuteronomy';     Abbr: 'DT'; Num: 5),     {//31}
-        (Name: 'Ecclesiasties';   Abbr: 'EC'; Num: 21),    {//32}
-        (Name: 'Esther';          Abbr: 'ES'; Num: 17),    {//33}
-        (Name: 'Exodus';          Abbr: 'EX'; Num: 2),     {//34}
-        (Name: 'Ezekiel';         Abbr: 'EZE'; Num: 26),   {//35}
-        (Name: 'Ezra';            Abbr: 'EZR'; Num: 15),   {//36}
-        (Name: 'Galatians';       Abbr: 'GA'; Num: 72),    {//37}
-        (Name: 'Genesis';         Abbr: 'GE'; Num: 1),     {//38}
-        (Name: 'Genesis';         Abbr: 'GN'; Num: 1),     {//39}
-        (Name: 'Ephesians';       Abbr: 'EP'; Num: 73),    {//40}
-        (Name: 'Esther (Greek)';  Abbr: 'GR'; Num: 42),    {//41}
-        (Name: 'Habakkuk';        Abbr: 'HAB'; Num: 35),   {//42}
-        (Name: 'Haggai';          Abbr: 'HAG'; Num: 37),   {//43}
-        (Name: 'Hebrews';         Abbr: 'HE'; Num: 82),    {//44}
-        (Name: 'Hosea';           Abbr: 'HO'; Num: 28),    {//45}
-        (Name: 'Isaiah';          Abbr: 'IS'; Num: 23),    {//46}
-        (Name: 'James';           Abbr: 'JA'; Num: 83),    {//47}
-        (Name: 'Jeremiah';        Abbr: 'JE'; Num: 24),    {//48}
-        (Name: 'Job';             Abbr: 'JOB'; Num: 18),   {//49}
-        (Name: 'Joel';            Abbr: 'JOE'; Num: 29),   {//50}
-        (Name: 'John';            Abbr: 'JOH'; Num: 67),   {//51}
-        (Name: 'Jonah';           Abbr: 'JON'; Num: 32),   {//52}
-        (Name: 'Joshua';          Abbr: 'JOS'; Num: 6),    {//53}
-        (Name: 'Jude';            Abbr: 'JUDE'; Num: 89),  {//54}
-        (Name: 'Judges';          Abbr: 'JUDG'; Num: 7),   {//55}
-        (Name: 'Judith';          Abbr: 'JUDI'; Num: 41),  {//56}
-        (Name: 'Lamentations';    Abbr: 'LA'; Num: 25),    {//57}
-        (Name: 'Letter of Jeremiah';Abbr:'LET'; Num: 46),  {//58}
-        (Name: 'Leviticus';       Abbr: 'LEV'; Num: 3),    {//59}
-        (Name: 'Luke';            Abbr: 'LK'; Num: 66),    {//60}
-        (Name: 'Leviticus';       Abbr: 'LV'; Num: 3),     {//61}
-        (Name: 'Luke';            Abbr: 'LU'; Num: 66),    {//62}
-        (Name: 'Malachi';         Abbr: 'MAL'; Num: 39),   {//63}
-        (Name: 'Prayer of Manasseh';Abbr:'MAN'; Num: 53),  {//64}
-        (Name: 'Mark';            Abbr: 'MAR'; Num: 65),   {//65}
-        (Name: 'Matthew';         Abbr: 'MAT'; Num: 64),   {//66}
-        (Name: 'Micah';           Abbr: 'MI'; Num: 33),    {//67}
-        (Name: 'Nahum';           Abbr: 'NA'; Num: 34),    {//68}
-        (Name: 'Nehemiah';        Abbr: 'NE'; Num: 16),    {//69}
-        (Name: 'Numbers';         Abbr: 'NU'; Num: 4),     {//70}
-        (Name: 'Obadiah';         Abbr: 'OB'; Num: 31),    {//71}
-        (Name: 'Psalm 151';       Abbr: 'P1'; Num: 54),    {//72}
-        (Name: 'Philemon';        Abbr: 'PHILE'; Num: 81), {//73}
-        (Name: 'Philippians';     Abbr: 'PHILI'; Num: 74), {//74}
-        (Name: 'Philemon';        Abbr: 'PHM'; Num: 81),   {//75}
-        (Name: 'Philippians';     Abbr: 'PHP'; Num: 74),   {//76}
-        (Name: 'Proverbs';        Abbr: 'PR'; Num: 20),    {//77}
-        (Name: 'Psalms';          Abbr: 'PS'; Num: 19),    {//78}
-        (Name: 'Revelation';      Abbr: 'RE'; Num: 90),    {//79}
-        (Name: 'Romans';          Abbr: 'RM'; Num: 69),    {//80}
-        (Name: 'Romans';          Abbr: 'RO'; Num: 69),    {//81}
-        (Name: 'Ruth';            Abbr: 'RU'; Num: 8),     {//82}
-        (Name: 'Sirach';          Abbr: 'SI'; Num: 44),    {//83}
-        (Name: 'Song of Solomon'; Abbr: 'SOL'; Num: 22),   {//84}
-        (Name: 'Song of Solomon'; Abbr: 'SON'; Num: 22),   {//85}
-        (Name: 'Song of Solomon'; Abbr: 'SS'; Num: 22),    {//86}
-        (Name: 'Susanna';         Abbr: 'SU'; Num: 48),    {//87}
-        (Name: 'Titus';           Abbr: 'TI'; Num: 80),    {//88}
-        (Name: 'Tobit';           Abbr: 'TO'; Num: 40),    {//89}
-        (Name: 'Wisdom';          Abbr: 'WI'; Num: 43),    {//90}
-        (Name: 'Zechariah';       Abbr: 'ZEC'; Num: 38),   {//91}
-        (Name: 'Zephaniah';       Abbr: 'ZEP'; Num: 36)    {//92}
-        );
-
-    BookFileName: array[0..90] of string = (
-        '','Genesis','Exodus','Lev','Num','Deut','Joshua','Judges', {// 0 - 7}
-        'Ruth','1Sam','2Sam','1Kings','2Kings','1Chron','2Chron',   {// 8 - 14}
-        'Ezra','Nehemiah','Esther','Job','Psalms','Proverbs',       {// 15-20}
-        'Eccl','Song','Isaiah','Jeremiah','Lament','Ezekiel',       {// 21-26}
-        'Daniel','Hosea','Joel','Amos','Obadiah','Jonah','Micah',   {// 27-33}
-        'Nahum','Habakkuk','Zeph','Haggai','Zech','Malachi',        {// 34-39}
-        'Tobit','Judith','Esther','Wisdom','Sirach','Baruch',       {// 40-45}
-        'Let','Azar','Susanna','Bel','1Mac','2Mac','1Esdras',       {// 46-52}
-        'Man','P1','3Mac','2Esdras','4Mac','','','','','','',       {// 53-63}
-        'Matthew','Mark','Luke','John','Acts','Romans','1Cor',      {// 64-70}
-        '2Cor','Gal','Eph','Philip','Col','1Thes','2Thes','1Tim',   {// 71-78}
-        '2Tim','Titus','Philemon','Hebrews','James','1Peter',       {// 79-84}
-        '2Peter','1John','2John','3John','Jude','Rev');             {// 85-90}
-
-type
-    TReadGBF = record
-{        private}
-        F: File;
-        FName, TokenLine: string;
-        TokenPos: integer;
-        fFileIsOpen, fParagraphEnd, fInTitle, fInPsalmBookTitle, fInHebrewTitle,
-        fInSectionTitle: boolean;
-
-{        public}
-        sBook, sChapter, sVerse, sMode: string;
-        sContext, {// Last text type (header, body, or tail)}
-        sTitle,   {// Title of this book of the Bible}
-        sPsalmBookTitle, {// Title of this Psalm book}
-        sHebrewTitle,    {// Psalm Hebrew title}
-        sSectionTitle,   {// Section headings}
-        sDate,
-        sFontName: string;
-        iTotalWords: integer;
-        chJustification,
-        chDirection: char;
-        fIndent, fPoetry: boolean;
-        CharAttribs: TCharAttribs;
-        bBk, bChap, bVs, bWd: byte;
-{
-        function Init({const}{sFileName: string): boolean;
-        procedure Done;
-        function GetToken(var TokenKind: TToken): string;
-}
-    end;
-
-    TWriteGBF = record
-{        private}
-        F: File;
-        FName, LineOut: string;
-        fFileIsOpen: boolean;
-        bBk, bChap, bVs, bWd: byte;
-
-{        public}
-{
-        function Init({const}{sFileName: string): boolean;
-        function Done: boolean;
-        procedure Out({const}{s: string);
-}
-    end;
-
-{implementation }
-
-function isletter({const}ch: char): boolean;
-begin
-    case ch of
-        'A'..'Z': isletter := true;
-        'a'..'z': isletter := true;
-        else
-        isletter := false;
-    end;
-end;
-
-function isinword({const}ch: char): boolean;
-begin
-    case ch of
-        '-': isinword := true;
-        'A'..'Z': isinword := true;
-        'a'..'z': isinword := true;
-        else
-        isinword := false;
-    end;
-end;
-
-function IsUpper({const}ch: char): Boolean;
-begin
-    case ch of
-        'A'..'Z': IsUpper := true;
-        else
-            IsUpper := false;
-    end;
-end;
-
-function IsDigit({const}ch: char): Boolean;
-begin
-    case ch of
-        '0'..'9': IsDigit := true;
-        else
-            IsDigit := false;
-    end;
-end;
-
-
-function MatchAbbrev({const}sName, sAbbrev: string): boolean;
-var i: integer;
-begin
-    if Length(sName) < Length(sAbbrev) then
-        Result := false
-    else
-        Result := true;
-    i := 1;
-    while (i <= Length(sAbbrev)) and Result do
-        begin
-        if UpCase(sName[i]) <> sAbbrev[i] then
-            Result := false;
-        inc(i);
-        end;
-end;
-
-function BookNameToNumber({const}sBookName: string): byte;
-var i: integer;
-begin
-    Result := 0;
-    try
-    if IsDigit(sBookName[Length(sBookName)]) and IsDigit(sBookName[1]) then
-        Result := StrToInt(sBookName);
-    except
-    Result := 0;
-    end;
-    i := 0;
-    while (Result = 0) and (i <= 115) do  {// Yuk! Linear search.}
-        begin
-        if MatchAbbrev(sBookName,BookAbbr[i].Abbr) then
-            begin
-            Result := BookAbbr[i].Num;
-            end;
-        inc(i);
-        end;
-end;
-
-function BookNumberToName({const}bBookNum: byte): string;
-begin
-    if bBookNum <= 115 then
-        Result := BookAbbr[bBookNum].Name
-    else
-        Result := '';
-end;
-
-function ConformCase({const}sPat, sSrc: string): string;
-var i: integer;
-begin
-    Result := sSrc;
-    if (Length(sPat) > 0) and (Length(sSrc) > 0) then
-        begin
-        Result := LowerCase(sSrc);
-        if IsUpper(sPat[1]) then
-            Result[1] := UpCase(Result[1]);
-        if (Length(sPat) > 1) and (Length(sSrc) > 1) then
-            begin
-            if IsUpper(sPat[2]) then
-                begin
-                for i := 2 to Length(Result) do
-                    Result[i] := UpCase(Result[i]);
-                end;
-            end;
-        end;
-end;
-
-function TReadGBF.Init({const}sFileName: string): boolean;
-var s: string;
-    tok: TToken;
-begin
-    try
-    fParagraphEnd := false;
-    bBk := 0;
-    bChap := 0;
-    bVs := 0;
-    bWd := 0;
-    iTotalWords := 0;
-    FName := sFileName;
-    Assign(F, FName);
-    reset(F);
-    readln(F, TokenLine);
-    TokenPos := 1;
-    fFileIsOpen := true;
-    repeat
-        s := GetToken(tok)
-    until (tok = tokEOF) or ((tok = tokHeader) and (s[3] = '0'));
-    Init := true;
-    except
-    Init := false;
-    fFileIsOpen := false;
-    end
-end;
-
-procedure TReadGBF.Done;
-begin
-    if fFileIsOpen then
-        begin
-        closefile(F);
-        fFileIsOpen := false;
-        end;
-end;
-
-function TReadGBF.GetToken(var TokenKind: TToken): string;
-var m: integer;
-begin
-    Result := '';
-    TokenKind := tokNull;
-    if TokenPos = 0 then
-        begin
-        if (not fFileIsOpen) or EOF(F) then
-            TokenKind := tokEOF
-        else
-            begin
-            ReadLn(F,TokenLine);
-            TokenPos := 1;
-            end;
-        end;
-    if TokenKind <> tokEOF then
-        begin
-        m := Length(TokenLine);
-        if TokenPos > m then
-            begin
-            TokenKind := tokSpace;
-            if fParagraphEnd then
-                fParagraphEnd := false
-            else
-                Result := ' ';
-            TokenPos := 0;
-            end
-        else
-            begin
-            if (TokenLine[TokenPos] = '<') then
-                begin
-                fParagraphEnd := false;
-                repeat
-                    Result := Result + TokenLine[TokenPos];
-                    inc(TokenPos);
-                until (TokenLine[TokenPos] = '>') or (TokenPos > m);
-                Result := Result + '>';
-                inc(TokenPos);
-                case result[2] of
-                    'B': begin {// File body text type}
-                         TokenKind := tokContent;
-                         sContext := Result;
-                         end;
-                    'C': begin {// Special characters}
-                         TokenKind := tokControl;
-                         if (Result[3] = 'M') or (Result[3] = 'L') then
-                             fParagraphEnd := true;
-                         end;
-                    'D': begin {// Direction}
-                         TokenKind := tokControl;
-                         chDirection := Result[3];
-                         end;
-                    'H': begin
-                         TokenKind := tokHeader;
-                         sContext := Result;
-                         end;
-                    'F': begin {// Font attributes}
-                         TokenKind := tokFont;
-                         case Result[3] of
-                             'B': CharAttribs := CharAttribs + [caBold];
-                             'C': CharAttribs := CharAttribs + [caSmallCaps];
-                             'I': CharAttribs := CharAttribs + [caItalic];
-                             'N': sFontName := copy(Result,4,Length(Result)-4);
-                             'O': CharAttribs := CharAttribs + [caOTQuote];
-                             'R': CharAttribs := CharAttribs + [caRed];
-                             'S': CharAttribs := CharAttribs + [caSuperscript];
-                             'U': CharAttribs := CharAttribs + [caUnderline];
-                             'V': CharAttribs := CharAttribs + [caSubscript];
-                             'b': CharAttribs := CharAttribs - [caBold];
-                             'c': CharAttribs := CharAttribs - [caSmallCaps];
-                             'i': CharAttribs := CharAttribs - [caItalic];
-                             'n': sFontName := '';
-                             'o': CharAttribs := CharAttribs - [caOTQuote];
-                             'r': CharAttribs := CharAttribs - [caRed];
-                             's': CharAttribs := CharAttribs - [caSuperscript];
-                             'u': CharAttribs := CharAttribs - [caUnderline];
-                             'v': CharAttribs := CharAttribs - [caSubscript];
-
-                         end;
-                         end;
-                    'J': begin {// Justification}
-                         TokenKind := tokStyle;
-                         chJustification := Result[3];
-                         end;
-                    'P': begin {// Poetry/prose, indent}
-                         TokenKind := tokControl;
-                         case Result[3] of
-                             'I': fIndent := true;
-                             'P': fPoetry := true;
-                             'i': fIndent := false;
-                             'p': fPoetry := false;
-                         end;
-                         end;
-                    'R': begin {// References and footnotes}
-                         TokenKind := tokControl;
-                         end;
-                    'S': begin {// sync mark}
-                         TokenKind := TokSync;
-                         case Result[3] of
-                             'B': begin {// Book}
-                                  sBook := system.copy(Result, 4, length(Result)-4);
-                                  sPsalmBookTitle := '';
-                                  if sBook = '' then
-                                      begin
-                                      inc(bBk);
-                                      sBook := BookNumberToName(bBk);
-                                      end
-                                  else
-                                      bBk := BookNameToNumber(sBook);
-                                  sTitle := sBook;
-                                  end;
-                             'C': begin {//chapter}
-                                  sChapter := system.copy(Result, 4, length(Result)-4);
-                                  if sChapter = '' then
-                                      begin
-                                      inc(bChap);
-                                      sChapter := IntToStr(bChap);
-                                      end
-                                  else
-                                      begin
-                                      try
-                                      bChap := StrToInt(sChapter);
-                                      except
-                                      showmessage('Non-numeric chapter: '+sBook+' '+sChapter);
-                                      end;
-                                      end;
-                                  sHebrewTitle := '';    
-                                  end;
-                             'V': begin {// Verse}
-                                  bWd := 0;
-                                  sVerse := system.copy(Result, 4, length(Result)-4);
-                                  if sVerse = '' then
-                                      begin
-                                      inc(bVs);
-                                      sVerse := IntToStr(bVs);
-                                      end
-                                  else
-                                      begin
-                                      try
-                                      bVs := StrToInt(sVerse);
-                                      except
-                                      showmessage('Non-numeric verse: '+sBook+' '+sChapter+':'+sVerse);
-                                      end;
-                                      end;
-                                  end;
-                             'D': begin {// Date}
-                                  sDate := system.copy(Result, 3, length(Result)-4);
-                                  end;
-                         end;
-                         end;
-                    'T': begin {// Titles}
-                         TokenKind := TokContent;
-                         case Result[3] of
-                             'B':
-                                 begin
-                                 sPsalmBookTitle := '';
-                                 fInPsalmBookTitle := true;
-                                 end;
-                             'b': fInPsalmBookTitle := true;
-                             'H':
-                                 begin
-                                 sHebrewTitle := '';
-                                 fInHebrewTitle := true;
-                                 end;
-                             'h': fInHebrewTitle := false;
-                             'S':
-                                 begin
-                                 sSectionTitle := '';
-                                 fInSectionTitle := true;
-                                 end;
-                             's': fInSectionTitle := false;
-                             'T':
-                                 begin
-                                 sTitle := '';
-                                 fInTitle := true;
-                                 end;
-                             't': fInTitle := false;
-                         end;
-                         end;
-                    'Z': begin {// File tail}
-                         TokenKind := tokTail;
-                         sContext := Result;
-                         if Result[3] = 'Z' then
-                             done;
-                         end;
-                    else
-                         TokenKind := TokControl;
-
-                end;
-                end
-            else if isletter(TokenLine[TokenPos]) then
-                begin {Word}
-                fParagraphEnd := false;
-                TokenKind := tokWord;
-                repeat
-                    Result := Result + TokenLine[TokenPos];
-                    inc(TokenPos);
-                until (TokenPos > m) or (not isinword(TokenLine[TokenPos]));
-                inc(bWd);
-                inc(iTotalWords);
-                end
-            else if ((TokenLine[TokenPos] = ' ') or (TokenLine[TokenPos] = #9)) then
-                begin
-                fParagraphEnd := false;
-                TokenKind := tokSpace;
-                Result := Result + TokenLine[TokenPos];
-                inc(TokenPos);
-                end
-            else
-                begin
-                fParagraphEnd := false;
-                TokenKind := tokChar;
-                Result := Result + TokenLine[TokenPos];
-                inc(TokenPos);
-                end
-            end;
-        end;
-    if ((TokenKind = tokWord) or (TokenKind = tokSpace) or
-       (TokenKind = tokChar)) then
-        begin
-        if fInTitle then
-            sTitle := sTitle + Result
-        else if fInPsalmBookTitle then
-            sPsalmBookTitle := sPsalmBookTitle + Result
-        else if fInHebrewTitle then
-            sHebrewTitle := sHebrewTitle + Result
-        else if fInSectionTitle then
-            sSectionTitle := sSectionTitle + Result;
-        end;
-end;
-
-function TWriteGBF.Init({const}sFileName: string): boolean;
-begin
-    try
-    bBk := 0;
-    bChap := 0;
-    bVs := 0;
-    bWd := 0;
-    LineOut := '';
-    FName := sFileName;
-    Assign(F, FName);
-    filemode := 1;
-    rewrite(F);
-    fFileIsOpen := true;
-    Init := true;
-    except
-    Init := false;
-    fFileIsOpen := false;
-    end
-end;
-
-function TWriteGBF.Done: boolean;
-begin
-    try
-    if fFileIsOpen then
-        begin
-        if LineOut <> '' then
-            begin
-            WriteLn(F, LineOut);
-            LineOut := '';
-            end;
-        CloseFile(F);
-        end;
-    Done := true;
-    except
-    Done := false;
-    end;
-end;
-
-procedure TWriteGBF.Out({const}s: string);
-var sPrint, sSave, sBook, sChapter, sVerse: string;
-    i: integer;
-    b: byte;
-begin
-    if (Length(s) > 0) and IsLetter(s[1]) then
-        begin
-        inc(bWd);
-        LineOut := LineOut + s;
-        end
-    else if Length(s) > 3 then
-        begin
-        if (s[1] = '<') and (s[2] = 'S') then
-            begin
-            case s[3] of
-                'B': begin {// Book}
-                     sBook := system.copy(s, 4, length(s)-4);
-                     if sBook = '' then
-                         begin
-                         inc(bBk);
-                         LineOut := LineOut + s;
-                         end
-                     else
-                         begin
-                         b := bBk;
-                         bBk := BookNameToNumber(sBook);
-                         if b <> bBk then
-                             LineOut := LineOut + s;
-                         end;
-                     end;
-                'C': begin {//chapter}
-                     sChapter := system.copy(s, 4, length(s)-4);
-                     if sChapter = '' then
-                         begin
-                         inc(bChap);
-                         LineOut := LineOut + s;
-                         end
-                     else
-                         begin
-                         try
-{//                         b := bChap;}
-                         bChap := StrToInt(sChapter);
-{//                         if b <> bChap then}
-                             LineOut := LineOut + s;
-                         except
-                         showmessage('Non-numeric chapter: '+sBook+' '+sChapter);
-                         end;
-                         end;
-                     end;
-                'V': begin {// Verse}
-                     bWd := 0;
-                     sVerse := system.copy(s, 4, length(s)-4);
-                     if sVerse = '' then
-                         begin
-                         inc(bVs);
-                         LineOut := LineOut + s;
-                         end
-                     else
-                         begin
-                         try
-{//                         b := bVs;}
-                         bVs := StrToInt(sVerse);
-{//                         if b <> bVs then}
-                             LineOut := LineOut + s;
-                         except
-                         showmessage('Non-numeric verse: '+sBook+' '+sChapter+':'+sVerse);
-                         end;
-                         end;
-                     end;
-                else
-                    LineOut := LineOut + s;
-                end
-            end
-        else
-            LineOut := LineOut + s; {// Not a sync mark}
-        end
-    else {// other token, space, or punctuation}
-        LineOut := LineOut + s; {// Length <= 3}
-    if ((s = '<CM>') or (s = '<CL>')) then
-        begin
-        if (Length(LineOut) > 78) then
-            begin
-            i := 78;
-            while (i > 0) and (LineOut[i] <> ' ') do
-                dec(i);
-            if i < 1 then
-                begin
-                WriteLn(F,LineOut);
-                LineOut := '';
-                end
-            else
-                begin
-                sPrint := system.copy(LineOut,1,i-1);
-                sSave := system.copy(LineOut,i+1,Length(LineOut)-i);
-                WriteLn(F,sPrint);
-                WriteLn(F, sSave);
-                LineOut := '';
-                end
-            end
-        else
-            begin
-            WriteLn(F, LineOut);
-            LineOut := '';
-            end
-        end
-    else if (Length(LineOut) > 78) then
-        begin
-        i := 78;
-        while (i > 0) and (LineOut[i] <> ' ') do
-            dec(i);
-        if i < 1 then
-            begin
-            WriteLn(F,LineOut);
-            LineOut := '';
-            end
-        else
-            begin
-            sPrint := system.copy(LineOut,1,i-1);
-            sSave := system.copy(LineOut,i+1,Length(LineOut)-i);
-            WriteLn(F,sPrint);
-            LineOut := sSave;
-            end
-        end
-end;
-
-end.
diff --git a/src/modules/texts/rawgbf/Gbfmain.pas b/src/modules/texts/rawgbf/Gbfmain.pas
deleted file mode 100644
index 4377622..0000000
--- a/src/modules/texts/rawgbf/Gbfmain.pas
+++ /dev/null
@@ -1,1267 +0,0 @@
-unit GBFMain;
-
-interface
-
-uses
-  Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs,
-  Buttons, StdCtrls, ExtCtrls, GBF;
-
-const
-  sTitlePar = '\pard\plain \s1\fi432\sb240\sa60\keepn\widctlpar \b\f5\fs28\kerning28 ';
-  sNormalPar = '\pard\plain \fi432\widctlpar \f4 ';
-  sNormalQuotePar = '\pard\plain \s20\fi432\li432\widctlpar \f4 ';
-  sPoetryPar = '\pard\plain \s18\fi-432\li432\widctlpar \f4 ';
-  sPoetryQuotePar = '\pard\plain \s21\fi-432\li864\widctlpar \f4 ';
-  sHebrewTitlePar = '\pard\plain \s16\fi432\keep\keepn\widctlpar \f4\fs20 ';
-  sSelahPar = '\pard\plain \s19\qr\widctlpar \f4 ';
-  ANSI2OEM: array[0..255] of char =
-      (  #0,  #1,  #2,  #3,  #4,  #5,  #6,  #7,
-         #8,  #9, #10, #11, #12, #13, #14, #15,
-        #16, #17, #18, #19, #20, #21, #22, #23,
-        #24, #25, #26, #27, #28, #29, #30, #31,
-        #32, #33, #34, #35, #36, #37, #38, #39,
-        #40, #41, #42, #43, #44, #45, #46, #47,
-        #48, #49, #50, #51, #52, #53, #54, #55,
-        #56, #57, #58, #59, #60, #61, #62, #63,
-        #64, #65, #66, #67, #68, #69, #70, #71,
-        #72, #73, #74, #75, #76, #77, #78, #79,
-        #80, #81, #82, #83, #84, #85, #86, #87,
-        #88, #89, #90, #91, #92, #93, #94, #95,
-        #96, #97, #98, #99,#100,#101,#102,#103,
-       #104,#105,#106,#107,#108,#109,#110,#111,
-       #112,#113,#114,#115,#116,#117,#118,#119,
-       #120,#121,#122,#123,#124,#125,#126,#127,
-       #128,#129, ',', 'a', '"',#133,#197,#216,
-        '^', '%', 'S', '<',#140,#141,#142,#143,
-       #144, #96, #97, '"', '"',#249,#150,#151,
-        '~',#153, 's', '>',#156,#157,#158, 'Y',
-        ' ',#173,#155,#156,#232,#157,#124, #21,
-       #168,#169, 'a',#174,#170, '-',#174, '_',
-       #167,#241,#253, '3', #39,#230, #20,#254,
-        ',', '1', 'o',#175,#172,#171,#190,#168,
-        'A', 'A', 'A', 'A',#142,#143,#198,#128,
-        'E',#144, 'E',#142, 'I', 'I', 'I', 'I',
-        'D',#165, 'O', 'O', 'O', 'O',#153, 'x',
-        '0', 'U', 'U', 'U',#154, 'Y', 'b',#225,
-       #133,#130,#131, 'a',#132,#134,#230,#135,
-       #138,#130,#136,#137,#141,#161,#140,#139,
-       #148,#164,#149,#162,#147, 'o',#148,#246,
-        'o',#151,#163,#150,#129, 'y', 'b',#152);
-
-type
-  TGBFConverterMainForm = class(TForm)
-    SourceEdit: TEdit;
-    Label1: TLabel;
-    BrowseButton: TButton;
-    SaveDialog1: TSaveDialog;
-    OpenDialog1: TOpenDialog;
-    DestEdit: TEdit;
-    Label2: TLabel;
-    BrowseDestButton: TButton;
-    FormatRadioGroup: TRadioGroup;
-    GoBitBtn: TBitBtn;
-    CloseBitBtn: TBitBtn;
-    Timer1: TTimer;
-    VerseLabel: TLabel;
-    ApocryphaCheckBox: TCheckBox;
-    WdLabel: TLabel;
-    Label3: TLabel;
-    Label4: TLabel;
-    WEBDraftCheckBox: TCheckBox;
-    QuickButton: TButton;
-    procedure CloseBitBtnClick(Sender: TObject);
-    procedure GoBitBtnClick(Sender: TObject);
-    procedure Timer1Timer(Sender: TObject);
-    procedure FormShow(Sender: TObject);
-    procedure FormatRadioGroupClick(Sender: TObject);
-    procedure QuickConversion;
-    procedure DoConversion;
-    procedure QuickButtonClick(Sender: TObject);
-    procedure FormActivate(Sender: TObject);
-  private
-    { Private declarations }
-  public
-    { Public declarations }
-  end;
-
-var
-  GBFConverterMainForm: TGBFConverterMainForm;
-
-implementation
-
-{$R *.DFM}
-
-var InFile: TReadGBF;
-    OutGBF: TWriteGBF;
-    OutFile: TextFile;
-
-function ANSIToOEM(s: string): string;
-var i, j: integer;
-begin
-    Result := s;
-    j := 1;
-    for i := 1 to length(s) do
-        begin
-        case s[i] of
-                #133:
-                    begin
-                    Result[j] := '.';
-                    inc(j);
-                    Insert('..', Result, j);
-                    inc(j);
-                    end;
-                #140:
-                    begin
-                    Result[j] := 'O';
-                    inc(j);
-                    Insert('E', Result, j);
-                    end;
-                #150:
-                    begin
-                    Result[j] := '-';
-                    inc(j);
-                    Insert('-', Result, j);
-                    end;
-                #151:
-                    begin
-                    Result[j] := '-';
-                    inc(j);
-                    Insert('-', Result, j);
-                    end;
-                #153:
-                    begin
-                    Result[j] := '(';
-                    inc(j);
-                    Insert('TM)', Result, j);
-                    inc(j,2);
-                    end;
-                #156:
-                    begin
-                    Result[j] := 'o';
-                    inc(j);
-                    Insert('e', Result, j);
-                    end;
-                #169:
-                    begin
-                    Result[j] := '(';
-                    inc(j);
-                    Insert('C)',Result, j);
-                    inc(j);
-                    end;
-                #174:
-                    begin
-                    Result[j] := '(';
-                    inc(j);
-                    Insert('R)',Result, j);
-                    inc(j);
-                    end;
-                #198:
-                    begin
-                    Result[j] := 'A';
-                    inc(j);
-                    Insert('E', Result, j);
-                    end;
-                #230:
-                    begin
-                    Result[j] := 'a';
-                    inc(j);
-                    Insert('e', Result, j);
-                    end;
-        else
-            Result[j] := ANSI2OEM[ord(s[i])];
-        end;
-        inc(j);
-        end;
-end;
-
-procedure TGBFConverterMainForm.CloseBitBtnClick(Sender: TObject);
-begin
-    Close;
-end;
-
-procedure TGBFConverterMainForm.DoConversion;
-var LastBook, wd, ParagraphAttributes, s, sLine, sPrint, sSave,
-    OutFileName: string;
-    LinePos, i, iFileNumber: integer;
-    tok: TToken;
-    fInclude, fProse, fSkip, fHTMLisOpen, fRed, fASCIIisOpen: boolean;
-    bLastBook, bChap: byte;
-
-    procedure CheckEOL;
-    begin
-        if Length(sLine) > 65 then
-            begin
-            i := 65;
-            while (i > 0) and (sLine[i] <> ' ') do
-                dec(i);
-            if i < 1 then
-                begin
-                if fASCIIisOpen then WriteLn(OutFile,sLine);
-                if fProse then
-                    sLine := ''
-                else
-                    sLine := '      ';
-                end
-            else
-                begin
-                sPrint := system.copy(sLine,1,i-1);
-                if fProse then
-                    sSave := system.copy(sLine,i+1,Length(sLine)-i)
-                else
-                    sSave := '      '+system.copy(sLine,i+1,Length(sLine)-i);
-                if fASCIIisOpen then WriteLn(OutFile,sPrint);
-                sLine := sSave;
-                end
-            end;
-    end;
-
-    procedure StartNewLine;
-    begin
-        if fInclude then
-            begin
-            CheckEol;
-            if fASCIIisOpen then WriteLn(OutFile, sLine);
-            sLine := '';
-            end;
-    end;
-
-    procedure CloseHTML;
-    begin
-        if fHTMLisOpen then
-            begin
-            WriteLn(OutFile,sLine);
-            sLine := '';
-            WriteLn(OutFile,'</P>');
-            WriteLn(OutFile,'<P></P><HR><A HREF="index.htm">[Index]</A> &nbsp;');
-            WriteLn(OutFile,'<A HREF="http://www.ebible.net/bible/">[Home]</A>');
-            WriteLn(OutFile,'</BODY></HTML>');
-            CloseFile(OutFile);
-            fHTMLisOpen := false;
-            end;
-    end;
-
-    procedure CloseASCII;
-    begin
-        if fASCIIisOpen then
-            begin
-            WriteLn(OutFile,sLine);
-            sLine := '';
-            WriteLn(OutFile);
-            if WEBDraftCheckBox.Checked then
-                begin
-                WriteLn(OutFile,'______________________________________________________________');
-                WriteLn(OutFile);
-                WriteLn(OutFile,'The above is from the public domain World English Bible (WEB).');
-                WriteLn(OutFile,'See http://www.ebible.org/bible/WEB for more about this Bible.');
-                WriteLn(OutFile,'Please report typos to mpj@ebible.org.');
-                end;
-            CloseFile(OutFile);
-            fASCIIisOpen := false;
-            end;
-    end;
-
-    procedure OpenHTML;
-    begin
-        if fHTMLisOpen then CloseHTML;
-        sLine := '';
-        OutFileName := ExtractFilePath(DestEdit.Text)+BookFileName[InFile.bBk]+'.htm';
-        AssignFile(OutFile,OutFileName);
-        Rewrite(OutFile);
-        WriteLn(OutFile,'<HTML>');
-        WriteLn(OutFile,'<HEAD>');
-        WriteLn(OutFile,'<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=windows-1252">');
-        WriteLn(OutFile,'<META http-equiv="PICS-Label" content=''(PICS-1.1 "http://www.rsac.org/ratingsv01.html"');
-        WriteLn(OutFile,' l gen true comment "RSACi North America Server" by "mpj@csn.net" for "http://www.csn.net/~mpj"');
-        WriteLn(OutFile,' on "1996.08.29T12:42-0500" r (n 0 s 0 v 0 l 0))''>');
-        WriteLn(OutFile,'<META NAME="description" CONTENT="'+InFile.sTitle+' from the World English Bible -- a Public Domain Modern English translation of the Holy Bible.">');
-        WriteLn(OutFile,'<META NAME="keywords" CONTENT="'+BookFileName[InFile.bBk]+', '+InFile.sTitle+', Bible, Christian, Holy Bible, Bible search, WEB, World English Bible, Scriptures, Scripture, Bibles, Gospel, Gospels, bible">');
-        WriteLn(OutFile,'<TITLE>'+InFile.sTitle+'</TITLE>');
-        WriteLn(OutFile,'<LINK REL=Home HREF="http://www.ebible.org/bible">');
-        WriteLn(OutFile,'<LINK REL=Glossary HREF="glossary.htm">');
-        WriteLn(OutFile,'</HEAD>');
-        WriteLn(OutFile,'<BODY BGCOLOR="#80ffff">');
-        WriteLn(OutFile,'<H1>');
-        WriteLn(OutFile,InFile.sTitle);
-        WriteLn(OutFile,'</H1><P>');
-        fHTMLisOpen := true;
-    end;
-
-    procedure OpenASCII;
-    begin
-        if fASCIIisOpen then CloseASCII;
-        if fProse then
-            sLine := '   '
-        else
-            sLine := '';
-        OutFileName := ExtractFilePath(DestEdit.Text)+BookFileName[InFile.bBk]+'.txt';
-        AssignFile(OutFile,OutFileName);
-        Rewrite(OutFile);
-        WriteLn(OutFile);
-        WriteLn(OutFile,InFile.sTitle);
-        WriteLn(OutFile);
-        fASCIIisOpen := true;
-    end;
-
-    procedure OpenNTChapter;
-    var s: string;
-    begin
-        if InFile.bBk >= 64 then
-            begin
-            if fASCIIisOpen then CloseASCII;
-            inc(iFileNumber);
-            s := IntToStr(iFileNumber);
-            if Length(s) < 3 then s := '0'+s;
-            if Length(s) < 3 then s := '0'+s;
-            OutFileName := ExtractFilePath(DestEdit.Text)+'n'+s+'.txt';
-            AssignFile(OutFile,OutFileName);
-            Rewrite(OutFile);
-            WriteLn(OutFile,'Subject: '+BookFileName[InFile.bBk]+' '+InFile.sChapter+', World English Bible');
-            if iFileNumber = 260 then
-                WriteLn(OutFile,'X-Reset: 1');
-            WriteLn(OutFile);
-            WriteLn(OutFile);
-            WriteLn(OutFile,InFile.sTitle+', Chapter '+InFile.sChapter);
-            WriteLn(OutFile);
-            fASCIIisOpen := true;
-            if fProse then
-                sLine := '   '
-            else
-                sLine := '';
-            end
-        else
-            begin
-            inc(bChap);
-            if (bLastBook <> Infile.bBk) or ((bChap mod 3) = 1) then
-                begin
-                if (bLastBook <> Infile.bBk) then
-                    begin
-                    bLastBook := Infile.bBk;
-                    bChap := 1;
-                    end;
-                if fASCIIisOpen then CloseASCII;
-                inc(iFileNumber);
-                s := IntToStr(iFileNumber);
-                if Length(s) < 3 then s := '0'+s;
-                if Length(s) < 3 then s := '0'+s;
-                OutFileName := ExtractFilePath(DestEdit.Text)+s+'.txt';
-                AssignFile(OutFile,OutFileName);
-                Rewrite(OutFile);
-                WriteLn(OutFile,'Subject: '+BookFileName[InFile.bBk]+' '+InFile.sChapter+', World English Bible');
-                if (Infile.bBk = 39) and (bChap = 4) then
-                    WriteLn(OutFile,'X-Reset: 1');
-                WriteLn(OutFile);
-                WriteLn(OutFile);
-                WriteLn(OutFile,InFile.sTitle+', starting at chapter '+InFile.sChapter);
-                WriteLn(OutFile);
-                fASCIIisOpen := true;
-                if fProse then
-                    sLine := '   '
-                else
-                    sLine := '';
-                end;
-            end;
-    end;
-
-    procedure CheckHTMLEOL;
-    begin
-        if Length(sLine) > 75 then
-            begin
-            i := 75;
-            while (i > 0) and (sLine[i] <> ' ') do
-                dec(i);
-            if i < 1 then
-                begin
-                if fHTMLisOpen then WriteLn(OutFile,sLine);
-                sLine := ''
-                end
-            else
-                begin
-                sPrint := system.copy(sLine,1,i-1);
-                sSave := system.copy(sLine,i+1,Length(sLine)-i);
-                if fHTMLisOpen then WriteLn(OutFile,sPrint);
-                sLine := sSave;
-                end
-            end;
-    end;
-
-    procedure StartNewHTMLLine;
-    begin
-        if fInclude then
-            begin
-            CheckHTMLEOL;
-            if fHTMLisOpen then WriteLn(OutFile, sLine+'</P>');
-            sLine := '<P>';
-            end;
-    end;
-
-
-begin
-    QuickButton.Enabled := false;
-    GoBitBtn.Enabled := false;
-    fInclude := false;
-    fSkip := false;
-    fProse := true;
-    fRed := false;
-    LastBook := '';
-    ParagraphAttributes := sNormalPar;
-    try
-    InFile := TReadGBF.Create;
-    if InFile.Init(Trim(SourceEdit.Text)) then
-        begin
-        LinePos := 0;
-        case FormatRadioGroup.ItemIndex of
-            -1: showmessage('No destination format selected!');
-             0: begin
-               Label3.Caption := 'Converting to ASCII';
-               AssignFile(OutFile, DestEdit.Text);
-               FileMode := 1;
-               Rewrite(OutFile);
-               fASCIIisOpen := true;
-               sLine := '';
-               repeat
-                   wd := ANSIToOEM(InFile.GetToken(tok));
-                   Application.ProcessMessages;
-                   case tok of
-                       tokWord:
-                           begin
-                           if fInclude and (not fSkip) then
-                               begin
-                               sLine := sLine + wd;
-                               CheckEOL;
-                               end;
-                           end;
-                       tokSpace:
-                           begin
-                           if fInclude and (not fSkip) then
-                               begin
-                               sLine := sLine + wd;
-                               CheckEOL;
-                               end;
-                           end;
-                       tokSync:
-                           begin
-                           if fInclude and (length(wd) > 3) then
-                               begin
-                               if wd[3] = 'V' then
-                                   begin
-                                   sLine := sLine + '{' + InFile.sChapter+':'+
-                                           InFile.sVerse+'} ';
-                                   CheckEOL
-                                   end
-                               else if (wd[3] = 'C') and (InFile.bBk = 19) then
-                                   begin
-                                       StartNewLine;
-                                       WriteLn(OutFile, 'Psalm '+InFile.sChapter);
-                                       WriteLn(OutFile);
-                                   end;
-                               if wd[3] = 'B' then
-                                   fProse := true;
-                               end;
-                           end;
-                       tokContent:
-                           begin
-                           if wd = '<BO>' then
-                               fInclude := true
-                           else if wd = '<BN>' then
-                               fInclude := true
-                           else if wd = '<BO>' then
-                               fInclude := ApocryphaCheckBox.Checked
-                           end;
-                       tokControl:
-                           begin
-                           if wd = '<CM>' then
-                               begin
-                               StartNewLine;
-                               if fProse then
-                                   begin
-                                   WriteLn(OutFile);
-                                   sLine := '   '
-                                   end
-                               end
-                           else if wd = '<CL>' then
-                               begin
-                               StartNewLine;
-                               sLine := '   ';
-                               end
-                           else if wd = '<Pp>' then
-                               fProse := true
-                           else if wd = '<PP>' then
-                               fProse := false
-                           else if wd = '<RF>' then
-                               fSkip := true
-                           else if wd = '<Rf>' then
-                               fSkip := false
-                           else if wd = '<RN>' then
-                               fSkip := true
-                           else if wd = '<Rn>' then
-                               fSkip := false
-                           else if wd = '<ZZ>' then
-                               fInclude := false
-                           end;
-                       tokChar:
-                           begin
-                           if fInclude and (not fSkip) then
-                               begin
-                               sLine := sLine + wd;
-                               CheckEOL;
-                               end;
-                           end;
-                       tokFont:
-                           begin
-                           if wd = '<FI>' then
-                               begin
-                                           if fInclude then
-                                               sLine := sLine + '[';
-                               end
-                           else if wd = '<Fi>' then
-                               begin
-                                           if fInclude then
-                                               sLine := sLine + ']';
-                               end
-                           end;
-                   end
-               until tok = tokEOF;
-               writeln(OutFile, sLine);
-               CloseFile(OutFile);
-               fASCIIisOpen := false;
-               Label3.Caption := '';
-               end;
-             1: begin
-               Label3.Caption := 'Converting to ASCII (one file/book)';
-               FileMode := 1;
-               fASCIIisOpen := false;
-               sLine := '';
-               repeat
-                   Application.ProcessMessages;
-                   wd := ANSIToOEM(InFile.GetToken(tok));
-                   case tok of
-                       tokEOF:
-                           CloseASCII;
-                       tokWord:
-                           begin
-                           if fInclude and (not fSkip) then
-                               begin
-                               sLine := sLine + wd;
-                               CheckEOL;
-                               end;
-                           end;
-                       tokSpace:
-                           begin
-                           if fInclude and (not fSkip) then
-                               begin
-                               sLine := sLine + wd;
-                               CheckEOL;
-                               end;
-                           end;
-                       tokSync:
-                           begin
-                           if fInclude and (length(wd) > 3) then
-                               begin
-                               if wd[3] = 'V' then
-                                   begin
-                                   sLine := sLine + '{' + InFile.sChapter+':'+
-                                           InFile.sVerse+'} ';
-                                   CheckEOL
-                                   end
-                               else if (wd[3] = 'C') and (InFile.bBk = 19) then
-                                   begin
-                                       StartNewLine;
-                                       WriteLn(OutFile, 'Psalm '+InFile.sChapter);
-                                       WriteLn(OutFile);
-                                   end;
-                               if wd[3] = 'B' then
-                                   begin
-                                   fProse := true;
-                                   CloseASCII;
-                                   end;
-                               end;
-                           end;
-                       tokContent:
-                           begin
-                           if wd = '<BO>' then
-                               fInclude := true
-                           else if wd = '<BN>' then
-                               fInclude := true
-                           else if wd = '<BO>' then
-                               fInclude := ApocryphaCheckBox.Checked
-                           else if wd = '<Tt>' then
-                               OpenASCII;
-                           end;
-                       tokControl:
-                           begin
-                           if wd = '<CM>' then
-                               begin
-                               StartNewLine;
-                               if fProse then
-                                   begin
-                                   if fASCIIisOpen then WriteLn(OutFile);
-                                   sLine := '   '
-                                   end
-                               end
-                           else if wd = '<CL>' then
-                               begin
-                               StartNewLine;
-                               sLine := '   ';
-                               end
-                           else if wd = '<Pp>' then
-                               fProse := true
-                           else if wd = '<PP>' then
-                               fProse := false
-                           else if wd = '<RF>' then
-                               fSkip := true
-                           else if wd = '<Rf>' then
-                               fSkip := false
-                           else if wd = '<RN>' then
-                               fSkip := true
-                           else if wd = '<Rn>' then
-                               fSkip := false
-                           else if wd = '<ZZ>' then
-                               fInclude := false
-                           end;
-                       tokChar:
-                           begin
-                           if fInclude and (not fSkip) then
-                               begin
-                               sLine := sLine + wd;
-                               CheckEOL;
-                               end;
-                           end;
-                       tokFont:
-                           begin
-                           if wd = '<FI>' then
-                               begin
-                               if fInclude then
-                                   sLine := sLine + '[';
-                               end
-                           else if wd = '<Fi>' then
-                               begin
-                               if fInclude then
-                                   sLine := sLine + ']';
-                               end
-                           end;
-                   end
-               until tok = tokEOF;
-               if fASCIIisOpen then writeln(OutFile, sLine);
-               CloseASCII;
-               Label3.Caption := '';
-               end;
-             2: begin
-               Label3.Caption := 'Converting ASCII postings';
-               bLastBook := 255;
-               bChap := 0;
-               FileMode := 1;
-               iFileNumber := 0;
-               fASCIIisOpen := false;
-               sLine := '';
-               repeat
-                   Application.ProcessMessages;
-                   wd := ANSIToOEM(InFile.GetToken(tok));
-                   case tok of
-                       tokEOF:
-                           CloseASCII;
-                       tokWord:
-                           begin
-                           if fInclude and (not fSkip) then
-                               begin
-                               sLine := sLine + wd;
-                               CheckEOL;
-                               end;
-                           end;
-                       tokSpace:
-                           begin
-                           if fInclude and (not fSkip) then
-                               begin
-                               sLine := sLine + wd;
-                               CheckEOL;
-                               end;
-                           end;
-                       tokSync:
-                           begin
-                           if fInclude and (length(wd) > 3) then
-                               begin
-                               if wd[3] = 'V' then
-                                   begin
-                                   sLine := sLine + '{' + InFile.sChapter+':'+
-                                           InFile.sVerse+'} ';
-                                   CheckEOL
-                                   end
-                               else if (wd[3] = 'C') then
-                                   begin
-                                   OpenNTChapter;
-                                   if (InFile.bBk = 19) then
-                                       begin
-                                       StartNewLine;
-                                       if fASCIIisOpen then
-                                           begin
-                                           WriteLn(OutFile, 'Psalm '+InFile.sChapter);
-                                           WriteLn(OutFile);
-                                           end;
-                                       end;
-                                   end;
-                               if wd[3] = 'B' then
-                                   begin
-                                   fProse := true;
-                                   CloseASCII;
-                                   end;
-                               end;
-                           end;
-                       tokContent:
-                           begin
-                           if wd = '<BO>' then
-                               fInclude := true
-                           else if wd = '<BN>' then
-                               begin
-                               fInclude := true;
-                               iFileNumber := 0;
-                               end
-                           else if wd = '<BO>' then
-                               fInclude := ApocryphaCheckBox.Checked
-                           end;
-                       tokControl:
-                           begin
-                           if wd = '<CM>' then
-                               begin
-                               StartNewLine;
-                               if fProse then
-                                   begin
-                                   if fASCIIisOpen then WriteLn(OutFile);
-                                   sLine := '   '
-                                   end
-                               end
-                           else if wd = '<CL>' then
-                               begin
-                               StartNewLine;
-                               sLine := '   ';
-                               end
-                           else if wd = '<Pp>' then
-                               fProse := true
-                           else if wd = '<PP>' then
-                               fProse := false
-                           else if wd = '<RF>' then
-                               fSkip := true
-                           else if wd = '<Rf>' then
-                               fSkip := false
-                           else if wd = '<RN>' then
-                               fSkip := true
-                           else if wd = '<Rn>' then
-                               fSkip := false
-                           else if wd = '<ZZ>' then
-                               fInclude := false
-                           end;
-                       tokChar:
-                           begin
-                           if fInclude and (not fSkip) then
-                               begin
-                               sLine := sLine + wd;
-                               CheckEOL;
-                               end;
-                           end;
-                       tokFont:
-                           begin
-                           if wd = '<FI>' then
-                               begin
-                               if fInclude then
-                                   sLine := sLine + '[';
-                               end
-                           else if wd = '<Fi>' then
-                               begin
-                               if fInclude then
-                                   sLine := sLine + ']';
-                               end
-                           end;
-                   end
-               until tok = tokEOF;
-               if fASCIIisOpen then writeln(OutFile, sLine);
-               CloseASCII;
-               Label3.Caption := '';
-               end;
-            3: begin
-               Label3.Caption := 'Converting to RTF';
-               AssignFile(OutFile, DestEdit.Text);
-               FileMode := 1;
-               Rewrite(OutFile);
-               repeat
-                   Application.ProcessMessages;
-                   wd := InFile.GetToken(tok);
-                   case tok of
-                       tokWord:
-                           begin
-                           if fInclude then
-                               begin
-                               LinePos := LinePos + Length(wd);
-                               write(OutFile,wd);
-                               end;
-                           end;
-                       tokSpace:
-                           begin
-                           if fInclude then
-                               begin
-                               LinePos := LinePos + Length(wd);
-                               if LinePos > 78 then
-                                   begin
-                                   WriteLn(OutFile,wd);
-                                   LinePos := 0;
-                                   end
-                               else
-                                   write(OutFile,wd);
-                               end
-                           end;
-                       tokSync:
-                           begin
-                           if length(wd) > 1 then
-                               begin
-                               case wd[2] of
-                                   'B': begin
-                                       if InFile.sBook <> LastBook then
-                                           begin
-                                           LastBook := InFile.sBook;
-                                           WriteLn(OutFile,'\par '+sTitlePar+
-                                               LastBook+'\par '+ParagraphAttributes);
-                                           LinePos := 0;
-                                           end;
-                                       end;
-                                   'V':  begin
-                                       s := '{\f5\super '+InFile.sChapter+':'+
-                                           InFile.sVerse+'}';
-                                       Write(OutFile,s);
-                                       LinePos := LinePos+Length(s);
-                                       end;
-                               end;
-                               end;
-                           end;
-                       tokControl:
-                           begin
-                           if length(wd) > 1 then
-                               begin
-                               case wd[2] of
-                                   'A':  fInclude := false;
-                                   'E':  begin
-                                       Write(OutFile,'{\b\cf1 ');
-                                       LinePos := LinePos + 8;
-                                       end;
-                                   'F':  fInclude := false;
-                                   'H':  begin
-                                       fInclude := true;
-                                       ParagraphAttributes := sHebrewTitlePar;
-                                       Write(OutFile,ParagraphAttributes);
-                                       LinePos := LinePos + Length(ParagraphAttributes);
-                                       end;
-                                   'I' : begin
-                                       Write(OutFile,'{\i\cf1 ');
-                                       LinePos := LinePos + 7;
-                                       end;
-                                   'J' : begin
-                                       Write(OutFile,'{\scaps ');
-                                       LinePos := LinePos + 8;
-                                       end;
-                                   'K':  fInclude := false;
-                                   'M':  begin
-                                       if fInclude then
-                                           begin
-                                           writeln(OutFile);
-                                           write(OutFile,'\par '+ParagraphAttributes);
-                                           LinePos := Length(ParagraphAttributes) + 5;
-                                           end;
-                                       end;
-                                   'N':  begin
-                                       fInclude := true;
-                                       ParagraphAttributes := sNormalPar;
-                                       Write(OutFile,ParagraphAttributes);
-                                       LinePos := LinePos + Length(ParagraphAttributes);
-                                       end;
-                                   'P':  begin
-                                       fInclude := true;
-                                       ParagraphAttributes := sPoetryPar;
-                                       Write(OutFile,ParagraphAttributes);
-                                       LinePos := LinePos + Length(ParagraphAttributes);
-                                       end;
-                                   'Q':  begin
-                                       fInclude := true;
-                                       ParagraphAttributes := sTitlePar;
-                                       Write(OutFile,ParagraphAttributes);
-                                       LinePos := LinePos + Length(ParagraphAttributes);
-                                       end;
-                                   'R' : begin
-                                       Write(OutFile,'\cf6 ');
-                                       LinePos := LinePos + 4;
-                                       end;
-                                   'S':  begin
-                                       fInclude := true;
-                                       ParagraphAttributes := sSelahPar;
-                                       Write(OutFile,ParagraphAttributes);
-                                       LinePos := LinePos + Length(ParagraphAttributes);
-                                       end;
-                                   'T':  begin
-                                       fInclude := true;
-                                       ParagraphAttributes := sTitlePar;
-                                       Write(OutFile,ParagraphAttributes);
-                                       LinePos := LinePos + Length(ParagraphAttributes);
-                                       end;
-                                   'U' : begin
-                                       Write(OutFile,'{\ul ');
-                                       LinePos := LinePos + 4;
-                                       end;
-                                   'W':  begin
-                                       fInclude := true;
-                                       ParagraphAttributes := sNormalQuotePar;
-                                       Write(OutFile,ParagraphAttributes);
-                                       LinePos := LinePos + Length(ParagraphAttributes);
-                                       end;
-                                   'X':  fInclude := false;
-                                   'Y':  begin
-                                       fInclude := true;
-                                       ParagraphAttributes := sPoetryQuotePar;
-                                       Write(OutFile,ParagraphAttributes);
-                                       LinePos := LinePos + Length(ParagraphAttributes);
-                                       end;
-                                   'Z':  fInclude := false;
-                                   'a':  fInclude := false;
-                                   'c':  fInclude := false;
-                                   'e':  begin
-                                       Write(OutFile,'}');
-                                       inc(LinePos);
-                                       end;
-                                   'h':  fInclude := false;
-                                   'i':  begin
-                                       Write(OutFile,'}');
-                                       inc(LinePos);
-                                       end;
-                                   'j':  begin
-                                       Write(OutFile,'}');
-                                       inc(LinePos);
-                                       end;
-                                   'n':  fInclude := false;
-                                   'p':  fInclude := false;
-                                   'r':  begin
-                                       Write(OutFile,'}');
-                                       inc(LinePos);
-                                       end;
-                                   'u':  begin
-                                       Write(OutFile,'}');
-                                       inc(LinePos);
-                                       end;
-
-                               end;
-                               end;
-                           end;
-                       tokChar:
-                           begin
-                           if fInclude then
-                               begin
-                               write(OutFile,wd);
-                               LinePos := LinePos + length(wd);
-                               end;
-                           end;
-                    end;
-               until tok = tokEOF;
-               writeln(OutFile,'\par }');
-               CloseFile(OutFile);
-               Label3.Caption := '';
-               end;
-            4: begin // GBF
-                   Label3.Caption := 'Converting to GBF';
-                   OutGBF := TWriteGBF.Create;
-                   OutGBF.Init(Trim(DestEdit.Text));
-                   OutGBF.Out('<H000>');
-                   repeat
-                       Application.ProcessMessages;
-                       wd := InFile.GetToken(tok);
-                       if tok <> tokEOF then OutGBF.Out(wd);
-                   until tok = tokEOF;
-                   OutGBF.Done;
-                   OutGBF.Free;
-                   Label3.Caption := '';
-               end;
-            5: begin // HTML
-                   Label3.Caption := 'Converting to HTML';
-                   fHTMLisOpen := false;
-                   repeat
-                       Application.ProcessMessages;
-                       wd := Infile.GetToken(tok);
-                       case tok of
-                       tokEOF:
-                           CloseHTML;
-                       tokWord:
-                           begin
-                           if fInclude and (not fSkip) then
-                               begin
-                               sLine := sLine + wd;
-                               CheckHTMLEOL;
-                               end;
-                           end;
-                       tokSpace:
-                           begin
-                           if fInclude and (not fSkip) then
-                               begin
-                               sLine := sLine + wd;
-                               CheckHTMLEOL;
-                               end;
-                           end;
-                       tokSync:
-                           begin
-                           if fInclude and (length(wd) > 3) then
-                               begin
-                               if wd[3] = 'V' then
-                                   begin
-                                   if fRed then
-                                       sLine := sLine + '</FONT>';
-                                   sLine := sLine + '<FONT COLOR="#0000ff"><FONT SIZE=-1><SUP>'+
-                                       InFile.sChapter+':'+
-                                       InFile.sVerse+'</SUP></FONT></FONT>';
-                                   if fRed then
-                                       sLine := sLine + '<FONT COLOR="#ff0000">';
-                                   CheckHTMLEOL
-                                   end
-                               else if (wd[3] = 'C') and (InFile.bBk = 19) then
-                                   begin
-                                       StartNewHTMLLine;
-                                       if fHTMLisOpen then
-                                           begin
-                                           WriteLn(OutFile, '<P><H2>Psalm '+
-                                               InFile.sChapter+'</H2>');
-                                           WriteLn(OutFile);
-                                           end;
-                                   end;
-                               if wd[3] = 'B' then
-                                   begin
-                                   fProse := true;
-                                   CloseHTML;
-                                   end;
-                               end;
-                           end;
-                       tokContent:
-                           begin
-                           if wd = '<BO>' then
-                               fInclude := true
-                           else if wd = '<BN>' then
-                               fInclude := true
-                           else if wd = '<BO>' then
-                               fInclude := ApocryphaCheckBox.Checked
-                           else if wd = '<Tt>' then
-                               OpenHTML;
-                           end;
-                       tokControl:
-                           begin
-                           if wd = '<CM>' then
-                               begin
-                               StartNewHTMLLine;
-                               if not fProse then
-                                   begin
-                                   sLine := sLine + ' &nbsp;';
-                                   end
-                               end
-                           else if wd = '<CL>' then
-                               begin
-                               StartNewHTMLLine;
-                                   sLine := sLine + ' &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'
-                               end
-                           else if wd = '<Pp>' then
-                               fProse := true
-                           else if wd = '<PP>' then
-                               fProse := false
-                           else if wd = '<RF>' then
-                               fSkip := true
-                           else if wd = '<Rf>' then
-                               fSkip := false
-                           else if wd = '<RN>' then
-                               fSkip := true
-                           else if wd = '<Rn>' then
-                               fSkip := false
-                           else if wd = '<ZZ>' then
-                               fInclude := false
-                           end;
-                       tokChar:
-                           begin
-                           if fInclude and (not fSkip) then
-                               begin
-                               if wd = '"' then
-                                   sLine := sLine + '&quot;'
-                               else
-                                   sLine := sLine + wd;
-                               CheckHTMLEOL;
-                               end;
-                           end;
-                       tokFont:
-                           begin
-                           if fInclude then
-                               begin
-                               if wd = '<FI>' then
-                                   sLine := sLine + '<I>'
-                               else if wd = '<Fi>' then
-                                   sLine := sLine + '</I>'
-                               else if wd = '<FR>' then
-                                   begin
-                                   if not fRed then
-                                       begin
-                                       sLine := sLine + '<FONT COLOR="#ff0000">';
-                                       fRed := true
-                                       end
-                                   end
-                               else if wd = '<Fr>' then
-                                   begin
-                                   if fRed then
-                                       begin
-                                       sLine := sLine + '</FONT>';
-                                       fRed := false
-                                       end
-                                   end
-                               end;
-                           end;
-                       end;
-                   until tok = tokEOF;
-                   Label3.Caption := '';
-               end;
-        end;
-        InFile.Done;
-        end;
-    InFile.Free;
-    except
-    showmessage('Error!');
-    end;
-    GoBitBtn.Enabled := true;
-    QuickButton.Enabled := true;
-end;
-
-procedure TGBFConverterMainForm.GoBitBtnClick(Sender: TObject);
-begin
-    DoConversion;
-end;
-
-procedure TGBFConverterMainForm.Timer1Timer(Sender: TObject);
-begin
-    If InFile <> nil then
-        VerseLabel.Caption := InFile.sBook+' ['+IntToStr(InFile.bBk)+'] '+
-        InFile.sChapter+':'+InFile.sVerse
-    else
-        VerseLabel.Caption := '';
-end;
-
-procedure TGBFConverterMainForm.QuickConversion;
-begin
-    FormatRadioGroup.ItemIndex := 1;
-    DoConversion;
-    FormatRadioGroup.ItemIndex := 2;
-    DoConversion;
-    FormatRadioGroup.ItemIndex := 5;
-    DoConversion;
-end;
-
-procedure TGBFConverterMainForm.FormShow(Sender: TObject);
-begin
-    VerseLabel.Caption := '';
-    WdLabel.Caption := '';
-end;
-
-(*
-procedure TGBFConverterMainForm.TransformButtonClick(Sender: TObject);
-var apoc: textfile;
-    last, s, sBook, sChap, sVs: string;
-    blankcount, i: integer;
-begin
-    TransformButton.Enabled := false;
-    blankcount := 0;
-    assignfile(apoc, trim(sourceedit.text));
-    reset(apoc);
-    assignfile(outfile, trim(destedit.text));
-    rewrite(outfile);
-    last := '';
-    while not eof(apoc) do
-        begin
-        readln(apoc, s);
-        if s = '' then
-            begin
-            inc(blankcount);
-            if last <> '' then
-                begin
-                writeln(outfile, last, '~M');
-                last := '';
-                end;
-            end
-        else
-            begin
-            if blankcount >= 2 then
-                writeln(outfile, '~T',s,'~N~M') // book title
-            else if blankcount = 1 then
-                begin
-                sBook := '';
-                sChap := '';
-                sVs := '';
-                i := 1;
-                while (s[i] <> ' ') and (i <= Length(s)) do
-                    begin
-                    sBook := sBook + s[i];
-                    inc(i);
-                    end;
-                while (s[i] = ' ') and (i <= Length(s)) do
-                    inc(i);
-                while (s[i] <> ':') and (i <= Length(s)) do
-                    begin
-                    sChap := sChap + s[i];
-                    inc(i);
-                    end;
-                inc(i);
-                while IsDigit(s[i]) and (i <= Length(s)) do
-                    begin
-                    sVs := sVs + s[i];
-                    inc(i);
-                    end;
-                write(outfile, '~B'+sBook+';~C'+sChap+';');
-                if sVs <> '' then
-                    write(outfile, '~V'+sVs+';');
-                end
-            else
-                begin
-                if last <> '' then
-                    begin
-                    writeln(outfile, last);
-                    end;
-                last := s;
-                end;
-            blankcount := 0;
-            end;
-        end;
-    if last <> '' then
-        begin
-        writeln(outfile, last);
-        last := s;
-        end;
-    closefile(outfile);
-    closefile(apoc);
-    TransformButton.Enabled := true;
-end;
-*)
-
-procedure TGBFConverterMainForm.FormatRadioGroupClick(Sender: TObject);
-begin
-    Case FormatRadioGroup.ItemIndex of
-        0: // Plain ASCII (one file)
-            DestEdit.Text := 'pub\web.txt';
-        1: // Plain ASCII (one file per book)
-            DestEdit.Text := 'pub\web.htm';
-        2: // Daily posts
-            DestEdit.Text := 'pub\queue\web.txt';
-        3: // RTF
-            DestEdit.Text := 'pub\web.rtf';
-        4: // GBF
-            DestEdit.Text := 'pub\web.gbf';
-        5: // HTML
-            DestEdit.Text := 'pub\htm\web.htm';
-    end;
-end;
-
-procedure TGBFConverterMainForm.QuickButtonClick(Sender: TObject);
-begin
-    QuickConversion;
-end;
-
-procedure TGBFConverterMainForm.FormActivate(Sender: TObject);
-begin
-    if ParamCount > 0 then
-        if ParamStr(1) = 'quick' then
-            begin
-            QuickConversion;
-            close;
-            end;
-end;
-
-end.
diff --git a/src/modules/texts/rawgbf/Makefile b/src/modules/texts/rawgbf/Makefile
deleted file mode 100644
index 35d6648..0000000
--- a/src/modules/texts/rawgbf/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-
-root := ../../../..
-
-all:
-	make -C ${root}
diff --git a/src/modules/texts/rawgbf/Makefile.am b/src/modules/texts/rawgbf/Makefile.am
deleted file mode 100644
index ab6aa2e..0000000
--- a/src/modules/texts/rawgbf/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-rawgbfdir = $(top_srcdir)/src/modules/texts/rawgbf
-
-libsword_la_SOURCES += $(rawgbfdir)/rawgbf.cpp
-
diff --git a/src/modules/texts/rawgbf/gbf.cpp b/src/modules/texts/rawgbf/gbf.cpp
deleted file mode 100644
index dc67a1c..0000000
--- a/src/modules/texts/rawgbf/gbf.cpp
+++ /dev/null
@@ -1,735 +0,0 @@
-enum TToken {
-tokNull, tokEOF, tokHeader, tokContent, tokTail, tokStyle,
-	      tokWord, tokSpace, tokSync, tokControl, tokChar, tokFont};
-
-enum TCharacterAttribute { caBold, caSmallCaps, caItalic, caOTQuote, caRed,
-			    caSuperscript, caUnderline, caSubscript};
-
-//    TCharAttribs = set of TCharacterAttribute;
-
-
-struct TBookNameRec {
-	string Name, Abbr;
-	char Num;
-}
-
-const struct TBookNameRec TBookAbbr[116] = {
-	{"1 Chronicles",    "1CH", 13},   //0
-	{"1 Corinthians",   "1CO", 70},   //1
-	{"1 Esdras",        "1E", 52},    //2
-	{"1 John",          "1J", 86},    //3
-	{"1 Kings",         "1K", 11},    //4
-	{"1 Maccabees",     "1M", 50},    //5
-	{"1 Peter",         "1P", 84},    //6
-	{"1 Samuel",        "1S", 9},     //7
-	{"1 Thessalonians", "1TH", 76},   //8
-	{"1 Timothy",       "1TI", 78},   //9
-	{"2 Chronicles",    "2CH", 14},   //10
-	{"2 Corinthians",   "2CO", 71},   //11
-	{"2 Esdras",        "2E", 56},    //12
-	{"2 John",          "2J", 87},    //13
-	{"2 Kings",         "2K", 12},    //14
-	{"2 Maccabees",     "2M", 51},    //15
-	{"2 Peter",         "2P", 85},    //16
-	{"2 Samuel",        "2S", 10},    //17
-	{"2 Thessalonians", "2TH", 77},   //18
-	{"2 Timothy",       "2TI", 79},   //19
-	{"3 John",          "3J", 88},    //20
-	{"3 Maccabees",     "3M", 55},    //21
-	{"4 Maccabees",     "4M", 57},    //22
-	{"1 Chronicles",    "1 CH", 13},   //0
-	{"1 Corinthians",   "1 CO", 70},   //1
-	{"1 Esdras",        "1 E", 52},    //2
-	{"1 John",          "1 J", 86},    //3
-	{"1 Kings",         "1 K", 11},    //4
-	{"1 Maccabees",     "1 M", 50},    //5
-	{"1 Peter",         "1 P", 84},    //6
-	{"1 Samuel",        "1 S", 9},     //7
-	{"1 Thessalonians", "1 TH", 76},   //8
-	{"1 Timothy",       "1 TI", 78},   //9
-	{"2 Chronicles",    "2 CH", 14},   //10
-	{"2 Corinthians",   "2 CO", 71},   //11
-	{"2 Esdras",        "2 E", 56},    //12
-	{"2 John",          "2 J", 87},    //13
-	{"2 Kings",         "2 K", 12},    //14
-	{"2 Maccabees",     "2 M", 51},    //15
-	{"2 Peter",         "2 P", 85},    //16
-	{"2 Samuel",        "2 S", 10},    //17
-	{"2 Thessalonians", "2 TH", 77},   //18
-	{"2 Timothy",       "2 TI", 79},   //19
-	{"3 John",          "3 J", 88},    //20
-	{"3 Maccabees",     "3 M", 55},    //21
-	{"4 Maccabees",     "4 M", 57},    //22
-	{"Acts",            "AC", 68},    //23
-	{"Amos",            "AM", 30},    //24
-	{"Prayer of Asariah and the Song of the Three Jews", "AZ", 47},
-	{"Baruch",          "BA", 45},    //26
-	{"Bel and the Dragon","BE", 49},  //27
-	{"Colossians",      "CO", 75},    //28
-	{"Daniel",          "DA", 27},    //29
-	{"Deuteronomy",     "DE", 5},     //30
-	{"Deuteronomy",     "DT", 5},     //31
-	{"Ecclesiasties",   "EC", 21},    //32
-	{"Esther",          "ES", 17},    //33
-	{"Exodus",          "EX", 2},     //34
-	{"Ezekiel",         "EZE", 26},   //35
-	{"Ezra",            "EZR", 15},   //36
-	{"Galatians",       "GA", 72},    //37
-	{"Genesis",         "GE", 1},     //38
-	{"Genesis",         "GN", 1},     //39
-	{"Ephesians",       "EP", 73},    //40
-	{"Esther (Greek}",  "GR", 42),    //41
-	{"Habakkuk",        "HAB", 35},   //42
-	{"Haggai",          "HAG", 37},   //43
-	{"Hebrews",         "HE", 82},    //44
-	{"Hosea",           "HO", 28},    //45
-	{"Isaiah",          "IS", 23},    //46
-	{"James",           "JA", 83},    //47
-	{"Jeremiah",        "JE", 24},    //48
-	{"Job",             "JOB", 18},   //49
-	{"Joel",            "JOE", 29},   //50
-	{"John",            "JOH", 67},   //51
-	{"Jonah",           "JON", 32},   //52
-	{"Joshua",          "JOS", 6},    //53
-	{"Jude",            "JUDE", 89},  //54
-	{"Judges",          "JUDG", 7},   //55
-	{"Judith",          "JUDI", 41},  //56
-	{"Lamentations",    "LA", 25},    //57
-	{"Letter of Jeremiah",Abbr:"LET", 46},  //58
-	{"Leviticus",       "LEV", 3},    //59
-	{"Luke",            "LK", 66},    //60
-	{"Leviticus",       "LV", 3},     //61
-	{"Luke",            "LU", 66},    //62
-	{"Malachi",         "MAL", 39},   //63
-	{"Prayer of Manasseh",Abbr:"MAN", 53},  //64
-	{"Mark",            "MAR", 65},   //65
-	{"Matthew",         "MAT", 64},   //66
-	{"Micah",           "MI", 33},    //67
-	{"Nahum",           "NA", 34},    //68
-	{"Nehemiah",        "NE", 16},    //69
-	{"Numbers",         "NU", 4},     //70
-	{"Obadiah",         "OB", 31},    //71
-	{"Psalm 151",       "P1", 54},    //72
-	{"Philemon",        "PHILE", 81}, //73
-	{"Philippians",     "PHILI", 74}, //74
-	{"Philemon",        "PHM", 81},   //75
-	{"Philippians",     "PHP", 74},   //76
-	{"Proverbs",        "PR", 20},    //77
-	{"Psalms",          "PS", 19},    //78
-	{"Revelation",      "RE", 90},    //79
-	{"Romans",          "RM", 69},    //80
-	{"Romans",          "RO", 69},    //81
-	{"Ruth",            "RU", 8},     //82
-	{"Sirach",          "SI", 44},    //83
-	{"Song of Solomon", "SOL", 22},   //84
-	{"Song of Solomon", "SON", 22},   //85
-	{"Song of Solomon", "SS", 22},    //86
-	{"Susanna",         "SU", 48},    //87
-	{"Titus",           "TI", 80},    //88
-	{"Tobit",           "TO", 40},    //89
-	{"Wisdom",          "WI", 43},    //90
-	{"Zechariah",       "ZEC", 38},   //91
-	{"Zephaniah",       "ZEP", 36}    //92
-	},
-
-string BookFileName[91] = {
-	"","Genesis","Exodus","Lev","Num","Deut","Joshua","Judges", // 0 - 7
-	"Ruth","1Sam","2Sam","1Kings","2Kings","1Chron","2Chron",   // 8 - 14
-	"Ezra","Nehemiah","Esther","Job","Psalms","Proverbs",       // 15-20
-	"Eccl","Song","Isaiah","Jeremiah","Lament","Ezekiel",       // 21-26
-	"Daniel","Hosea","Joel","Amos","Obadiah","Jonah","Micah",   // 27-33
-	"Nahum","Habakkuk","Zeph","Haggai","Zech","Malachi",        // 34-39
-	"Tobit","Judith","Esther","Wisdom","Sirach","Baruch",       // 40-45
-	"Let","Azar","Susanna","Bel","1Mac","2Mac","1Esdras",       // 46-52
-	"Man","P1","3Mac","2Esdras","4Mac","","","","","","",       // 53-63
-	"Matthew","Mark","Luke","John","Acts","Romans","1Cor",      // 64-70
-	"2Cor","Gal","Eph","Philip","Col","1Thes","2Thes","1Tim",   // 71-78
-	"2Tim","Titus","Philemon","Hebrews","James","1Peter",       // 79-84
-	"2Peter","1John","2John","3John","Jude","Rev"};             // 85-90
-
-class TReadGBF {
-private:
-	FILE *fp;
-	string FName, TokenLine;
-	int TokenPos;
-	bool fFileIsOpen, fParagraphEnd, fInTitle, fInPsalmBookTitle, fInHebrewTitle, fInSectionTitle;
-
-public:
-	string sBook, sChapter, sVerse, sMode;
-	string sContext; // Last text type (header, body, or tail)
-	string sTitle;   // Title of this book of the Bible
-	string sPsalmBookTitle; // Title of this Psalm book
-	string sHebrewTitle;    // Psalm Hebrew title
-	string sSectionTitle;   // Section headings
-	string sDate;
-	string sFontName;
-	int iTotalWords;
-	char chJustification, chDirection;
-	bool fIndent, fPoetry;
-	int CharAttribs;
-	char bBk, bChap, bVs, bWd;
-
-	bool Init(const string sFileName);
-	void Done();
-	string GetToken(TToken &TokenKind);
-    end;
-
-class TWriteGBF {
-	private:
-	F: TextFile;
-	FName, LineOut: string;
-	fFileIsOpen: boolean;
-	bBk, bChap, bVs, bWd: byte;
-
-	public
-
-	function Init(const sFileName: string): boolean;
-	function Done: boolean;
-	procedure Out(const s: string);
-    end;
-
-function isletter(const ch: char): boolean;
-function isinword(const ch: char): boolean;
-function IsDigit(const ch: char): Boolean;
-function IsUpper(const ch: char): Boolean;
-function ConformCase(const sPat, sSrc: string): string;
-function BookNameToNumber(const sBookName: string): byte;
-
-implementation
-
-function isletter(const ch: char): boolean;
-begin
-    case ch of
-	'A'..'Z': isletter := true;
-	'a'..'z': isletter := true;
-	else
-	isletter := false;
-    end;
-end;
-
-function isinword(const ch: char): boolean;
-begin
-    case ch of
-	'-': isinword := true;
-	'A'..'Z': isinword := true;
-	'a'..'z': isinword := true;
-	else
-	isinword := false;
-    end;
-end;
-
-function IsUpper(const ch: char): Boolean;
-begin
-    case ch of
-	'A'..'Z': IsUpper := true;
-	else
-	    IsUpper := false;
-    end;
-end;
-
-function IsDigit(const ch: char): Boolean;
-begin
-    case ch of
-	'0'..'9': IsDigit := true;
-	else
-	    IsDigit := false;
-    end;
-end;
-
-
-function MatchAbbrev(const sName, sAbbrev: string): boolean;
-var i: integer;
-begin
-    if Length(sName) < Length(sAbbrev) then
-	Result := false
-    else
-	Result := true;
-    i := 1;
-    while (i <= Length(sAbbrev)) and Result do
-	begin
-	if UpCase(sName[i]) <> sAbbrev[i] then
-	    Result := false;
-	inc(i);
-	end;
-end;
-
-function BookNameToNumber(const sBookName: string): byte;
-var i: integer;
-begin
-    Result := 0;
-    try
-    if IsDigit(sBookName[Length(sBookName)]) and IsDigit(sBookName[1]) then
-	Result := StrToInt(sBookName);
-    except
-    Result := 0;
-    end;
-    i := 0;
-    while (Result = 0) and (i <= 115) do  // Yuk! Linear search.
-	begin
-	if MatchAbbrev(sBookName,BookAbbr[i].Abbr) then
-	    begin
-	    Result := BookAbbr[i].Num;
-	    end;
-	inc(i);
-	end;
-end;
-
-function BookNumberToName(const bBookNum: byte): string;
-begin
-    if bBookNum <= 115 then
-	Result := BookAbbr[bBookNum].Name
-    else
-	Result := '';
-end;
-
-function ConformCase(const sPat, sSrc: string): string;
-var i: integer;
-begin
-    Result := sSrc;
-    if (Length(sPat) > 0) and (Length(sSrc) > 0) then
-	begin
-	Result := LowerCase(sSrc);
-	if IsUpper(sPat[1]) then
-	    Result[1] := UpCase(Result[1]);
-	if (Length(sPat) > 1) and (Length(sSrc) > 1) then
-	    begin
-	    if IsUpper(sPat[2]) then
-		begin
-		for i := 2 to Length(Result) do
-		    Result[i] := UpCase(Result[i]);
-		end;
-	    end;
-	end;
-end;
-
-function TReadGBF.Init(const sFileName: string): boolean;
-var s: string;
-    tok: TToken;
-begin
-    try
-    fParagraphEnd := false;
-    bBk := 0;
-    bChap := 0;
-    bVs := 0;
-    bWd := 0;
-    iTotalWords := 0;
-    FName := sFileName;
-    Assign(F, FName);
-    reset(F);
-    readln(F, TokenLine);
-    TokenPos := 1;
-    fFileIsOpen := true;
-    repeat
-	s := GetToken(tok)
-    until (tok = tokEOF) or ((tok = tokHeader) and (s[3] = '0'));
-    Init := true;
-    except
-    Init := false;
-    fFileIsOpen := false;
-    end
-end;
-
-procedure TReadGBF.Done;
-begin
-    if fFileIsOpen then
-	begin
-	closefile(F);
-	fFileIsOpen := false;
-	end;
-end;
-
-function TReadGBF.GetToken(var TokenKind: TToken): string;
-var m: integer;
-begin
-    Result := '';
-    TokenKind := tokNull;
-    if TokenPos = 0 then
-	begin
-	if (not fFileIsOpen) or EOF(F) then
-	    TokenKind := tokEOF
-	else
-	    begin
-	    ReadLn(F,TokenLine);
-	    TokenPos := 1;
-	    end;
-	end;
-    if TokenKind <> tokEOF then
-	begin
-	m := Length(TokenLine);
-	if TokenPos > m then
-	    begin
-	    TokenKind := tokSpace;
-	    if fParagraphEnd then
-		fParagraphEnd := false
-	    else
-		Result := ' ';
-	    TokenPos := 0;
-	    end
-	else
-	    begin
-	    if (TokenLine[TokenPos] = '<') then
-		begin
-		fParagraphEnd := false;
-		repeat
-		    Result := Result + TokenLine[TokenPos];
-		    inc(TokenPos);
-		until (TokenLine[TokenPos] = '>') or (TokenPos > m);
-		Result := Result + '>';
-		inc(TokenPos);
-		case result[2] of
-		    'B': begin // File body text type
-			 TokenKind := tokContent;
-			 sContext := Result;
-			 end;
-		    'C': begin // Special characters
-			 TokenKind := tokControl;
-			 if (Result[3] = 'M') or (Result[3] = 'L') then
-			     fParagraphEnd := true;
-			 end;
-		    'D': begin // Direction
-			 TokenKind := tokControl;
-			 chDirection := Result[3];
-			 end;
-		    'H': begin
-			 TokenKind := tokHeader;
-			 sContext := Result;
-			 end;
-		    'F': begin // Font attributes
-			 TokenKind := tokFont;
-			 case Result[3] of
-			     'B': CharAttribs := CharAttribs + [caBold];
-			     'C': CharAttribs := CharAttribs + [caSmallCaps];
-			     'I': CharAttribs := CharAttribs + [caItalic];
-			     'N': sFontName := copy(Result,4,Length(Result)-4);
-			     'O': CharAttribs := CharAttribs + [caOTQuote];
-			     'R': CharAttribs := CharAttribs + [caRed];
-			     'S': CharAttribs := CharAttribs + [caSuperscript];
-			     'U': CharAttribs := CharAttribs + [caUnderline];
-			     'V': CharAttribs := CharAttribs + [caSubscript];
-			     'b': CharAttribs := CharAttribs - [caBold];
-			     'c': CharAttribs := CharAttribs - [caSmallCaps];
-			     'i': CharAttribs := CharAttribs - [caItalic];
-			     'n': sFontName := '';
-			     'o': CharAttribs := CharAttribs - [caOTQuote];
-			     'r': CharAttribs := CharAttribs - [caRed];
-			     's': CharAttribs := CharAttribs - [caSuperscript];
-			     'u': CharAttribs := CharAttribs - [caUnderline];
-			     'v': CharAttribs := CharAttribs - [caSubscript];
-
-			 end;
-			 end;
-		    'J': begin // Justification
-			 TokenKind := tokStyle;
-			 chJustification := Result[3];
-			 end;
-		    'P': begin // Poetry/prose, indent
-			 TokenKind := tokControl;
-			 case Result[3] of
-			     'I': fIndent := true;
-			     'P': fPoetry := true;
-			     'i': fIndent := false;
-			     'p': fPoetry := false;
-			 end;
-			 end;
-		    'R': begin // References and footnotes
-			 TokenKind := tokControl;
-			 end;
-		    'S': begin // sync mark
-			 TokenKind := TokSync;
-			 case Result[3] of
-			     'B': begin // Book
-			          sBook := system.copy(Result, 4, length(Result)-4);
-			          sPsalmBookTitle := '';
-			          if sBook = '' then
-			              begin
-			              inc(bBk);
-			              sBook := BookNumberToName(bBk);
-			              end
-			          else
-			              bBk := BookNameToNumber(sBook);
-			          sTitle := sBook;
-			          end;
-			     'C': begin //chapter
-			          sChapter := system.copy(Result, 4, length(Result)-4);
-			          if sChapter = '' then
-			              begin
-			              inc(bChap);
-			              sChapter := IntToStr(bChap);
-			              end
-			          else
-			              begin
-			              try
-			              bChap := StrToInt(sChapter);
-			              except
-			              showmessage('Non-numeric chapter: '+sBook+' '+sChapter);
-			              end;
-			              end;
-			          sHebrewTitle := '';    
-			          end;
-			     'V': begin // Verse
-			          bWd := 0;
-			          sVerse := system.copy(Result, 4, length(Result)-4);
-			          if sVerse = '' then
-			              begin
-			              inc(bVs);
-			              sVerse := IntToStr(bVs);
-			              end
-			          else
-			              begin
-			              try
-			              bVs := StrToInt(sVerse);
-			              except
-			              showmessage('Non-numeric verse: '+sBook+' '+sChapter+':'+sVerse);
-			              end;
-			              end;
-			          end;
-			     'D': begin // Date
-			          sDate := system.copy(Result, 3, length(Result)-4);
-			          end;
-			 end;
-			 end;
-		    'T': begin // Titles
-			 TokenKind := TokContent;
-			 case Result[3] of
-			     'B':
-			         begin
-			         sPsalmBookTitle := '';
-			         fInPsalmBookTitle := true;
-			         end;
-			     'b': fInPsalmBookTitle := true;
-			     'H':
-			         begin
-			         sHebrewTitle := '';
-			         fInHebrewTitle := true;
-			         end;
-			     'h': fInHebrewTitle := false;
-			     'S':
-			         begin
-			         sSectionTitle := '';
-			         fInSectionTitle := true;
-			         end;
-			     's': fInSectionTitle := false;
-			     'T':
-			         begin
-			         sTitle := '';
-			         fInTitle := true;
-			         end;
-			     't': fInTitle := false;
-			 end;
-			 end;
-		    'Z': begin // File tail
-			 TokenKind := tokTail;
-			 sContext := Result;
-			 if Result[3] = 'Z' then
-			     done;
-			 end;
-		    else
-			 TokenKind := TokControl;
-
-		end;
-		end
-	    else if isletter(TokenLine[TokenPos]) then
-		begin {Word}
-		fParagraphEnd := false;
-		TokenKind := tokWord;
-		repeat
-		    Result := Result + TokenLine[TokenPos];
-		    inc(TokenPos);
-		until (TokenPos > m) or (not isinword(TokenLine[TokenPos]));
-		inc(bWd);
-		inc(iTotalWords);
-		end
-	    else if ((TokenLine[TokenPos] = ' ') or (TokenLine[TokenPos] = #9)) then
-		begin
-		fParagraphEnd := false;
-		TokenKind := tokSpace;
-		Result := Result + TokenLine[TokenPos];
-		inc(TokenPos);
-		end
-	    else
-		begin
-		fParagraphEnd := false;
-		TokenKind := tokChar;
-		Result := Result + TokenLine[TokenPos];
-		inc(TokenPos);
-		end
-	    end;
-	end;
-    if ((TokenKind = tokWord) or (TokenKind = tokSpace) or
-       (TokenKind = tokChar)) then
-	begin
-	if fInTitle then
-	    sTitle := sTitle + Result
-	else if fInPsalmBookTitle then
-	    sPsalmBookTitle := sPsalmBookTitle + Result
-	else if fInHebrewTitle then
-	    sHebrewTitle := sHebrewTitle + Result
-	else if fInSectionTitle then
-	    sSectionTitle := sSectionTitle + Result;
-	end;
-end;
-
-function TWriteGBF.Init(const sFileName: string): boolean;
-begin
-    try
-    bBk := 0;
-    bChap := 0;
-    bVs := 0;
-    bWd := 0;
-    LineOut := '';
-    FName := sFileName;
-    Assign(F, FName);
-    filemode := 1;
-    rewrite(F);
-    fFileIsOpen := true;
-    Init := true;
-    except
-    Init := false;
-    fFileIsOpen := false;
-    end
-end;
-
-function TWriteGBF.Done: boolean;
-begin
-    try
-    if fFileIsOpen then
-	begin
-	if LineOut <> '' then
-	    begin
-	    WriteLn(F, LineOut);
-	    LineOut := '';
-	    end;
-	CloseFile(F);
-	end;
-    Done := true;
-    except
-    Done := false;
-    end;
-end;
-
-procedure TWriteGBF.Out(const s: string);
-var sPrint, sSave, sBook, sChapter, sVerse: string;
-    i: integer;
-    b: byte;
-begin
-    if (Length(s) > 0) and IsLetter(s[1]) then
-	begin
-	inc(bWd);
-	LineOut := LineOut + s;
-	end
-    else if Length(s) > 3 then
-	begin
-	if (s[1] = '<') and (s[2] = 'S') then
-	    begin
-	    case s[3] of
-		'B': begin // Book
-		     sBook := system.copy(s, 4, length(s)-4);
-		     if sBook = '' then
-			 begin
-			 inc(bBk);
-			 LineOut := LineOut + s;
-			 end
-		     else
-			 begin
-			 b := bBk;
-			 bBk := BookNameToNumber(sBook);
-			 if b <> bBk then
-			     LineOut := LineOut + s;
-			 end;
-		     end;
-		'C': begin //chapter
-		     sChapter := system.copy(s, 4, length(s)-4);
-		     if sChapter = '' then
-			 begin
-			 inc(bChap);
-			 LineOut := LineOut + s;
-			 end
-		     else
-			 begin
-			 try
-//			 b := bChap;
-			 bChap := StrToInt(sChapter);
-//			 if b <> bChap then
-			     LineOut := LineOut + s;
-			 except
-			 showmessage('Non-numeric chapter: '+sBook+' '+sChapter);
-			 end;
-			 end;
-		     end;
-		'V': begin // Verse
-		     bWd := 0;
-		     sVerse := system.copy(s, 4, length(s)-4);
-		     if sVerse = '' then
-			 begin
-			 inc(bVs);
-			 LineOut := LineOut + s;
-			 end
-		     else
-			 begin
-			 try
-//			 b := bVs;
-			 bVs := StrToInt(sVerse);
-//			 if b <> bVs then
-			     LineOut := LineOut + s;
-			 except
-			 showmessage('Non-numeric verse: '+sBook+' '+sChapter+':'+sVerse);
-			 end;
-			 end;
-		     end;
-		else
-		    LineOut := LineOut + s;
-		end
-	    end
-	else
-	    LineOut := LineOut + s; // Not a sync mark
-	end
-    else // other token, space, or punctuation
-	LineOut := LineOut + s; // Length <= 3
-    if ((s = '<CM>') or (s = '<CL>')) then
-	begin
-	if (Length(LineOut) > 78) then
-	    begin
-	    i := 78;
-	    while (i > 0) and (LineOut[i] <> ' ') do
-		dec(i);
-	    if i < 1 then
-		begin
-		WriteLn(F,LineOut);
-		LineOut := '';
-		end
-	    else
-		begin
-		sPrint := system.copy(LineOut,1,i-1);
-		sSave := system.copy(LineOut,i+1,Length(LineOut)-i);
-		WriteLn(F,sPrint);
-		WriteLn(F, sSave);
-		LineOut := '';
-		end
-	    end
-	else
-	    begin
-	    WriteLn(F, LineOut);
-	    LineOut := '';
-	    end
-	end
-    else if (Length(LineOut) > 78) then
-	begin
-	i := 78;
-	while (i > 0) and (LineOut[i] <> ' ') do
-	    dec(i);
-	if i < 1 then
-	    begin
-	    WriteLn(F,LineOut);
-	    LineOut := '';
-	    end
-	else
-	    begin
-	    sPrint := system.copy(LineOut,1,i-1);
-	    sSave := system.copy(LineOut,i+1,Length(LineOut)-i);
-	    WriteLn(F,sPrint);
-	    LineOut := sSave;
-	    end
-	end
-end;
-
-end.
diff --git a/src/modules/texts/rawgbf/gbf.h b/src/modules/texts/rawgbf/gbf.h
deleted file mode 100644
index b695759..0000000
--- a/src/modules/texts/rawgbf/gbf.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* Header for module GBF, generated by p2c */
-#ifndef GBF_H
-#define GBF_H
-/* p2c: Gbf.pas, line 5: Warning: Could not find module SYSUTILS [271] */
-
-
-#include "sysutils.h"
-/* p2c: Gbf.pas, line 5: Warning: Could not find module DIALOGS [271] */
-#include "dialogs.h"
-
-
-#ifdef GBF_G
-# define vextern
-#else
-# define vextern extern
-#endif
-
-
-
-typedef enum {
-  tokNull, tokEOF, tokHeader, tokContent, tokTail, tokStyle, tokWord,
-  tokSpace, tokSync, tokControl, tokChar, tokFont
-} TToken;
-typedef enum {
-  caBold, caSmallCaps, caItalic, caOTQuote, caRed, caSuperscript, caUnderline,
-  caSubscript
-} TCharacterAttribute;
-typedef long TCharAttribs;
-
-
-
-typedef struct TBookNameRec {
-  Char Name[256], Abbr[256];
-  uchar Num;
-} TBookNameRec;
-
-typedef TBookNameRec TBookAbbr[116];
-/* p2c: Gbf.pas, line 25: 
- * Warning: Expected an expression, found a '/' [227] */
-/* p2c: Gbf.pas, line 25: 
- * Warning: Expected an expression, found a '/' [227] */
-/* p2c: Gbf.pas, line 25: Warning: Division by zero [163] */
-/* p2c: Gbf.pas, line 26: Warning: Division by zero [163] */
-/* p2c: Gbf.pas, line 26: Warning: Expected a ')', found a '(' [227] */
-/* p2c: Gbf.pas, line 144: 
- * Warning: Expected an expression, found a '/' [227] */
-/* p2c: Gbf.pas, line 144: 
- * Warning: Expected an expression, found a '/' [227] */
-/* p2c: Gbf.pas, line 144: Warning: Division by zero [163] */
-/* p2c: Gbf.pas, line 144: Warning: Division by zero [163] */
-/* p2c: Gbf.pas, line 145: Warning: Mixing non-strings with strings [170] */
-/* p2c: Gbf.pas, line 145: 
- * Warning: Expected a ')', found a string literal [227] */
-
-
-extern TBookAbbr BookAbbr;
-
-extern Char BookFileName[91][256];
-
-vextern Char STR1[256];
-
-
-#undef vextern
-
-#endif /*GBF_H*/
-
-/* End. */
diff --git a/src/modules/texts/rawgbf/gbfidx.cpp b/src/modules/texts/rawgbf/gbfidx.cpp
deleted file mode 100644
index 8337d62..0000000
--- a/src/modules/texts/rawgbf/gbfidx.cpp
+++ /dev/null
@@ -1,294 +0,0 @@
-/*****************************************************************************
- *
- *	This code wreaks but works (at least for WEB).  Good luck!
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-
-#ifndef __GNUC__
-#include <io.h>
-#else
-#include <unistd.h>
-#endif
-
-#include <fcntl.h>
-#include <versekey.h>
-
-
-void writeidx(VerseKey &key1, VerseKey &key2, VerseKey &key3, long offset, short size);
-char findbreak(int fp, long *offset, int *num1, int *num2, int *rangemax, short *size);
-void openfiles(char *fname);
-void checkparams(int argc, char **argv);
-
-
-VerseKey key1, key2, key3;
-int fp, vfp, cfp, bfp;
-long chapoffset;
-short chapsize;
-char testmnt;
-
-
-main(int argc, char **argv)
-{
-	long pos, offset;
-	int num1, num2, rangemax, curbook = 0, curchap = 0, curverse = 0;
-	char buf[127], startflag = 0;
-	short size, tmp;
-
-	checkparams(argc, argv);
-
-	openfiles(argv[1]);
-
-	testmnt = key1.Testament();
-	num1 = key1.Chapter();
-	num2 = key1.Verse();
-	pos  = 0;
-	write(bfp, &pos, 4);  /* Book    offset for testament intros */
-	pos = 4;
-	write(cfp, &pos, 4);  /* Chapter offset for testament intro */
-
-
-/*	Right now just zero out intros until parsing correctly */
-	pos = 0;
-	size = 0;
-	write(vfp, &pos, 4);  /* Module intro */
-	write(vfp, &size, 2);
-	write(vfp, &pos, 4);  /* Testament intro */
-	write(vfp, &size, 2);
-
-	while(!findbreak(fp, &offset, &num1, &num2, &rangemax, &size)) {
-		if (!startflag) {
-			startflag = 1;
-		}
-		else {
-			if (num2 < key2.Verse()) {            // new chapter
-				if (num1 <= key2.Chapter()) { // new book
-					key2.Verse(1);
-					key2.Chapter(1);
-					key2.Book(key2.Book()+1);
-				}
-				printf("Found Chapter Break: %d ('%s')\n", num1, (const char *)key2);
-				chapoffset = offset;
-				chapsize = size;
-//				continue;
-			}
-		}
-		key2.Verse(1);
-		key2.Chapter(num1);
-		key2.Verse(num2);
-
-		key3 = key2;
-//		key3 += (rangemax - key3.Verse());
-
-		writeidx(key1, key2, key3, offset, size);
-	}
-	close(vfp);
-	close(cfp);
-	close(bfp);
-	close(fp);
-}
-
-
-/**************************************************************************
- * ENT:	key1	- current location of index
- * 	key2	- minimum keyval for which this offset is valid
- * 	key3	- maximum keyval for which this offset is valid
- */
-
-void writeidx(VerseKey &key1, VerseKey &key2, VerseKey &key3, long offset, short size)
-{
-	long pos;
-	short tmp;
-
-	for (; ((key1 <= key3) && (key1.Error() != KEYERR_OUTOFBOUNDS) && (key1.Testament() == testmnt)); key1+=1) {
-		if (key1.Verse() == 1) {	// new chapter
-			if (key1.Chapter() == 1) {	// new book
-				pos = lseek(cfp, 0, SEEK_CUR);
-				write(bfp, &pos, 4);
-				pos = lseek(vfp, 0, SEEK_CUR); /* Book intro (cps) */
-				write(cfp, &pos, 4);
-				write(vfp, &chapoffset, 4);  /* Book intro (vss)  set to same as chap for now(it should be chap 1 which usually contains the book into anyway)*/
-				write(vfp, &chapsize, 2);
-			}
-			pos = lseek(vfp, 0, SEEK_CUR);
-			write(cfp, &pos, 4);
-			write(vfp, &chapoffset, 4);  /* Chapter intro */
-			write(vfp, &chapsize, 2);
-		}
-		if (key1 >= key2) {
-			write(vfp, &offset, 4);
-			write(vfp, &size, 2);
-		}
-		else	{
-			pos = 0;
-			tmp = 0;
-			write(vfp, &pos, 4);
-			write(vfp, &tmp, 2);
-		}
-	}
-}
-
-
-char startchap(char *buf)
-{
-	char loop;
-
-	if (buf[0] != '<')
-		return 0;
-	if (buf[1] != 'S')
-		return 0;
-	if (buf[2] != 'C')
-		return 0;
-/*
-	if (!isdigit(buf[2]))
-		return 0;
-	for (loop = 3; loop < 7; loop++) {
-		if (buf[loop] == ' ')
-			break;
-		if ((!isdigit(buf[loop])) && (buf[loop] != ',') && (buf[loop] != '-'))
-			return 0;
-	}
-*/
-	return 1;
-}
-
-
-char startentry(char *buf)
-{
-	char loop;
-
-	if (buf[0] != '<')
-		return 0;
-	if (buf[1] != 'S')
-		return 0;
-	if (buf[2] != 'V')
-		return 0;
-/*
-	if (!isdigit(buf[2]))
-		return 0;
-	for (loop = 3; loop < 7; loop++) {
-		if (buf[loop] == ' ')
-			break;
-		if ((!isdigit(buf[loop])) && (buf[loop] != ',') && (buf[loop] != '-'))
-			return 0;
-	}
-*/
-	return 1;
-}
-
-
-char findbreak(int fp, long *offset, int *num1, int *num2, int *rangemax, short *size)
-{
-	char buf[7];
-	char buf2[20];
-	char ch;
-	char loop;
-	long offset2;
-	int ch2, vs2, rm2;
-	bool flag;
-	long chapstart = 0; 
-	
-	memset(buf, ' ', 7);
-
-	while (1) {
-		if (startchap(buf)) {
-			chapstart = lseek(fp, 0, SEEK_CUR) - 7;
-			memset(buf, ' ', 3);
-			flag = false;
-			for (loop = 3; loop < 6; loop++) {
-				if (isdigit(buf[loop]))
-					flag = true;
-				else {
-					buf[loop] = 0;
-					break;
-				}
-			}
-			if (flag) 
-				*num1 = atoi(buf);
-			else	(*num1)++;
-		}
-		if (startentry(buf)) {
-			memset(buf, ' ', 3);
-			flag = false;
-			for (loop = 3; loop < 6; loop++) {
-				if (isdigit(buf[loop]))
-					flag = true;
-				else {
-					buf[loop] = 0;
-					break;
-				}
-			if (flag)
-				*num2 = atoi(buf);
-			else	(*num2)++;
-			}
-			loop++;
-			if (size)
-				*offset = lseek(fp, 0, SEEK_CUR) - (7 - loop);
-			else	*offset = (chapstart) ? chapstart : lseek(fp, 0, SEEK_CUR) - 7;
-			if (size) {
-				ch2 = *num1;
-				vs2 = *num2;
-				if (findbreak(fp, &offset2, &ch2, &vs2, &rm2, 0)) {
-					*size = (short) (lseek(fp, 0, SEEK_END) - (*offset));
-				}
-				else {
-					if (vs2) {
-						*size = (offset2 - (*offset));
-					}
-				}
-				lseek(fp, *offset, SEEK_SET);
-			}
-			return 0;
-		}
-		memmove(buf, &buf[1], 6);
-		if (read(fp, &buf[6], 1) != 1)
-			return 1;
-	}
-}
-
-
-void openfiles(char *fname)
-{
-#ifndef O_BINARY		// O_BINARY is needed in Borland C++ 4.53
-#define O_BINARY 0		// If it hasn't been defined than we probably
-#endif				// don't need it.
-	char buf[255];
-
-	if ((fp = open(fname, O_RDONLY|O_BINARY)) == -1) {
-		fprintf(stderr, "Couldn't open file: %s\n", fname);
-		exit(1);
-	}
-
-	sprintf(buf, "%s.vss", fname);
-	if ((vfp = open(buf, O_CREAT|O_WRONLY|O_BINARY)) == -1) {
-		fprintf(stderr, "Couldn't open file: %s\n", buf);
-		exit(1);
-	}
-
-	sprintf(buf, "%s.cps", fname);
-	if ((cfp = open(buf, O_CREAT|O_WRONLY|O_BINARY)) == -1) {
-		fprintf(stderr, "Couldn't open file: %s\n", buf);
-		exit(1);
-	}
-
-	sprintf(buf, "%s.bks", fname);
-	if ((bfp = open(buf, O_CREAT|O_WRONLY|O_BINARY)) == -1) {
-		fprintf(stderr, "Couldn't open file: %s\n", buf);
-		exit(1);
-	}
-}
-
-
-void checkparams(int argc, char **argv)
-{
-	if (argc < 2) {
-		fprintf(stderr, "usage: %s <file to process> [nt - for new testmt file]\n", argv[0]);
-		exit(1);
-	}
-	if (argc == 3)
-		key1 = key2 = key3 = "Matthew 1:1";
-	else	key1 = key2 = key3 = "Genesis 1:1";
-}
diff --git a/src/modules/texts/rawgbf/rawgbf.cpp b/src/modules/texts/rawgbf/rawgbf.cpp
deleted file mode 100644
index 6b8516f..0000000
--- a/src/modules/texts/rawgbf/rawgbf.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-/******************************************************************************
- *  rawgbf.cpp - code for class 'RawGBF'- a module that reads raw text files:
- *		  ot and nt using indexs ??.bks ??.cps ??.vss
- */
-
-
-#include <ctype.h>
-#include <stdio.h>
-#include <fcntl.h>
-
-#ifndef __GNUC__
-#include <io.h>
-#else
-#include <unistd.h>
-#endif
-
-#include <string.h>
-#include <utilfuns.h>
-#include <rawverse.h>
-#include <rawgbf.h>
-
-SWORD_NAMESPACE_START
-
-/******************************************************************************
- * RawGBF Constructor - Initializes data for instance of RawGBF
- *
- * ENT:	iname - Internal name for module
- *	idesc - Name to display to user for module
- *	idisp	 - Display object to use for displaying
- */
-
-RawGBF::RawGBF(const char *ipath, const char *iname, const char *idesc, SWDisplay *idisp) : SWText(iname, idesc, idisp), RawVerse(ipath)
-{
-}
-
-
-/******************************************************************************
- * RawGBF Destructor - Cleans up instance of RawGBF
- */
-
-RawGBF::~RawGBF()
-{
-}
-
-
-/******************************************************************************
- * RawGBF::operator char *	- Returns the correct verse when char * cast
- *					is requested
- *
- * RET: string buffer with verse
- */
-
-RawGBF::operator char*()
-{
-	long  start;
-	unsigned short size;
-	VerseKey *key = 0;
-
-#ifndef _WIN32_WCE
-	try {
-#endif
-		key = SWDYNAMIC_CAST(VerseKey, this->key);
-#ifndef _WIN32_WCE
-	}
-	catch ( ... ) {}
-#endif
-	if (!key)
-		key = new VerseKey(this->key);
-
-
-	findoffset(key->Testament(), key->Index(), &start, &size);
-
-	if (entrybuf)
-		delete [] entrybuf;
-	entrybuf = new char [ size * 3 ];		// extra for conversion to RTF or other.
-
-	readtext(key->Testament(), start, size + 1, entrybuf);
-	preptext(entrybuf);
-	RenderText(entrybuf, size * 3);
-	
-	if (key != this->key)
-		delete key;
-
-	return entrybuf;
-}
-
-SWORD_NAMESPACE_END
diff --git a/src/modules/texts/rawtext/Makefile b/src/modules/texts/rawtext/Makefile
deleted file mode 100644
index 35d6648..0000000
--- a/src/modules/texts/rawtext/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-
-root := ../../../..
-
-all:
-	make -C ${root}
diff --git a/src/modules/texts/rawtext/Makefile.am b/src/modules/texts/rawtext/Makefile.am
deleted file mode 100644
index d0e1d7e..0000000
--- a/src/modules/texts/rawtext/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-rawtextdir = $(top_srcdir)/src/modules/texts/rawtext
-
-libsword_la_SOURCES += $(rawtextdir)/rawtext.cpp
-
diff --git a/src/modules/texts/rawtext/kjvidx.cpp b/src/modules/texts/rawtext/kjvidx.cpp
deleted file mode 100644
index 708a9e6..0000000
--- a/src/modules/texts/rawtext/kjvidx.cpp
+++ /dev/null
@@ -1,169 +0,0 @@
-#include <stdio.h>
-#include <fcntl.h>
-#include <versekey.h>
-
-
-char findbreak(int fp, int *offset, int *num1, int *num2, short *size);
-
-
-main(int argc, char **argv)
-{
-	int fp, vfp, cfp, bfp;
-	long pos;
-	short size, tmp;
-	int num1, num2, offset, curbook = 0, curchap = 0, curverse = 0;
-	char buf[127];
-	VerseKey mykey;
-
-	if ((argc < 2) || (argc > 3)) {
-		fprintf(stderr, "usage: %s <file to process> [nt]\n", argv[0]);
-		exit(1);
-	}
-
-	if ((fp = open(argv[1], O_RDONLY)) == -1) {
-		fprintf(stderr, "Couldn't open file: %s\n", argv[1]);
-		exit(1);
-	}
-
-	sprintf(buf, "%s.vss", argv[1]);
-	if ((vfp = open(buf, O_CREAT|O_WRONLY)) == -1) {
-		fprintf(stderr, "Couldn't open file: %s\n", buf);
-		exit(1);
-	}
-
-	sprintf(buf, "%s.cps", argv[1]);
-	if ((cfp = open(buf, O_CREAT|O_WRONLY)) == -1) {
-		fprintf(stderr, "Couldn't open file: %s\n", buf);
-		exit(1);
-	}
-
-	sprintf(buf, "%s.bks", argv[1]);
-	if ((bfp = open(buf, O_CREAT|O_WRONLY)) == -1) {
-		fprintf(stderr, "Couldn't open file: %s\n", buf);
-		exit(1);
-	}
-
-	pos  = 0;
-	write(bfp, &pos, 4);  /* Book    offset for testament intros */
-	pos = 4;
-	write(cfp, &pos, 4);  /* Chapter offset for testament intro */
-
-
-/*	Right now just zero out intros until parsing correctly */
-	pos = 0;
-	size = 0;
-	write(vfp, &pos, 4);  /* Module intro */
-	write(vfp, &size, 2);
-	write(vfp, &pos, 4);  /* Testament intro */
-	write(vfp, &size, 2);
-
-	mykey = (argc == 3) ? "Matthew 1:1" : "Genesis 1:1";
-
-	while (!findbreak(fp, &offset, &num1, &num2, &size)) {
-		num1 = mykey.Chapter();
-		num2 = mykey.Verse();
-		if (num2 == 1) {  		/* if we're at a new chapter */
-			if (num1 == 1) {	/* if we're at a new book */
-				pos = lseek(cfp, 0, SEEK_CUR);
-				write(bfp, &pos, 4);
-				pos = lseek(vfp, 0, SEEK_CUR); /* Book intro (cps) */
-				write(cfp, &pos, 4);
-				pos  = 0;
-				tmp = 0;
-				write(vfp, &pos, 4);  /* Book intro (vss) */
-				write(vfp, &tmp, 2);
-				curbook++;
-				curchap = 0;
-			}
-			pos = lseek(vfp, 0, SEEK_CUR);
-			write(cfp, &pos, 4);
-			curverse = 1;
-			pos  = 0;
-			tmp = 0;
-			write(vfp, &pos, 4);  /* Chapter intro */
-			write(vfp, &tmp, 2);
-			curchap++;
-		}
-		else curverse++;
-	
-		printf("%2d:%3d:%3d found at offset: %7d\n", curbook, num1, num2, offset);
-
-		if (num1 != curchap) {
-			fprintf(stderr, "Error: Found chaptures out of sequence\n");
-			break;
-		}
-		if (num2 != curverse) {
-			fprintf(stderr, "Error: Found verses out of sequence\n");
-			break;
-		}
-		write(vfp, &offset, 4);
-		write(vfp, &size, 2);
-		mykey++;
-	}
-	
-	close(vfp);
-	close(cfp);
-	close(bfp);
-	close(fp);
-}
-
-
-char findbreak(int fp, int *offset, int *num1, int *num2, short *size)
-{
-	char buf[17];
-	char buf2[7];
-	char loop;
-	char offadj, inquotes, sizeadj;
-	int offset2, ch2, vs2;
-	
-	memset(buf, ' ', 17);
-
-	while (1) {
-		offadj = -10;
-		inquotes = 0;
-		sizeadj = 0;
-  		if ((!memcmp(buf, "\\widctlpar {\\b\\f0\\cf2 ", 16)) && (!size)) {
-			offadj = -1;
-//			inquotes = 1;
-			sizeadj = -18;
-		}
-  		if (!memcmp(&buf[1], "\\f0\\fs16\\cf2\\up6", 15)) {
-			offadj = 0;
-			inquotes = 1;
-			sizeadj = (*buf == 10) ? -18:-17;
-		}
-  		if (!memcmp(buf, "\\fi200\\widctlpar", 16)) {
-			offadj = -1;
-//			inquotes = 1;
-			sizeadj = -18;
-		}
-		if (offadj > -10) {
-			*offset = lseek(fp, 0, SEEK_CUR) + offadj;
-			if (size) {
-				(*offset)++;
-				while (inquotes) {
-					while (read(fp, buf2, 1) == 1) {
-						if (*buf2 == '}')
-							break;
-						(*offset)++;
-					}
-					inquotes--;
-				}
-				if (findbreak(fp, &offset2, &ch2, &vs2, 0)) {
-					*size = (short) (lseek(fp, 0, SEEK_END) - (*offset));
-				}
-				else {
-					sprintf(buf2, "%d:%d", ch2, vs2);
-					*size = (offset2 - (*offset));
-				}
-				lseek(fp, *offset+17, SEEK_SET);
-			}
-			else (*offset) += sizeadj;
-			return 0;
-		}
-		memmove(buf, &buf[1], 16);
-		if (read(fp, &buf[16], 1) != 1)
-			return 1;
-	}
-}
-
diff --git a/src/modules/texts/rawtext/makebnds.c b/src/modules/texts/rawtext/makebnds.c
deleted file mode 100644
index 44da447..0000000
--- a/src/modules/texts/rawtext/makebnds.c
+++ /dev/null
@@ -1,86 +0,0 @@
-#include <stdio.h>
-#include <fcntl.h>
-
-
-char *bnames[] = {
-	"Genesis", "Exodus", "Leviticus", "Numbers", "Deuteronomy",
-	"Joshua", "Judges", "Ruth", "I Samual", "II Samuel",
-	"I Kings", "II Kings", "I Chronicles", "II Chronicles", "Ezra",
-	"Nehemiah", "Esther", "Job", "Psalms", "Proverbs",
-	"Ecclesiastes", "Song of Solomon", "Isaiah", "Jeremiah", "Lamentations",
-	"Ezekiel", "Daniel", "Hosea", "Joel", "Amos",
-	"Obadiah", "Jonah", "Micah", "Nahum", "Habakkuk",
-	"Zephaniah", "Haggai", "Zechariah", "Malachi",
-	"Matthew", "Mark", "Luke", "John", "Acts",
-	"Romans", "I Corinthians", "II Corinthians", "Galatians", "Ephesians",
-	"Philippians", "Colossians", "I Thessalonians", "II Thessalonians", "I Timothy",
-	"II Timothy", "Titus", "Philemon", "Hebrews", "James",
-	"I Peter", "II Peter", "I John", "II John", "III John",
-	"Jude", "Revelation of John"};
-
-
-
-main(int argc, char **argv)
-{
-	int fp, vfp, cfp, bfp;
-	long pos;
-	int num1, num2, offset, offset2, chapmax, chapoff, chapoff2, curbook = 0, curchap = 0, curverse = 0;
-	char buf[127];
-
-	if (argc > 3) {
-		fprintf(stderr, "usage: %s <file to process> [NT?]\n", argv[0]);
-		exit(1);
-	}
-
-	if (argc > 2)
-		curbook = 39;
-	sprintf(buf, "%s.vss", argv[1]);
-	if ((vfp = open(buf, O_RDONLY)) == -1) {
-		fprintf(stderr, "Couldn't open file: %s\n", buf);
-		exit(1);
-	}
-
-	sprintf(buf, "%s.cps", argv[1]);
-	if ((cfp = open(buf, O_RDONLY)) == -1) {
-		fprintf(stderr, "Couldn't open file: %s\n", buf);
-		exit(1);
-	}
-
-	sprintf(buf, "%s.bks", argv[1]);
-	if ((bfp = open(buf, O_RDONLY)) == -1) {
-		fprintf(stderr, "Couldn't open file: %s\n", buf);
-		exit(1);
-	}
-
-	read(bfp, &offset2, sizeof(offset2));
-	read(cfp, &chapoff2, sizeof(chapoff2));
-	while (read(bfp, &offset, sizeof(offset)) == sizeof(offset)) {
-		chapmax = (offset - offset2) / sizeof(offset);
-		printf("\n\{\"%s\", %d}, \n// %s\n", bnames[curbook], chapmax, bnames[curbook]);
-		curbook++;
-		for (curchap = 0; curchap < chapmax; curchap++) {
-			read(cfp, &chapoff, sizeof(chapoff));
-			printf("%d, ", (chapoff - chapoff2) / sizeof(chapoff));
-			chapoff2 = chapoff;
-		}
-		offset2 = offset;
-	}
-	pos     =       lseek(cfp, 0, SEEK_CUR);
-	offset  = (int) lseek(cfp, 0, SEEK_END);
-	chapmax = (offset - offset2) / sizeof(offset);
-	printf("\n\{\"%s\", %d}, \n// %s\n", bnames[curbook], chapmax, bnames[curbook]);
-	curbook++;
-	lseek(cfp, pos, SEEK_SET);
-	for (curchap = 0; curchap < chapmax - 1; curchap++) {
-		read(cfp, &chapoff, sizeof(chapoff));
-		printf("%d, ", (chapoff - chapoff2) / sizeof(chapoff));
-		chapoff2 = chapoff;
-	}
-	chapoff = (int) lseek(vfp, 0, SEEK_END);
-	printf("%d, ", (chapoff - chapoff2) / sizeof(chapoff));
-	
-	close(vfp);
-	close(cfp);
-	close(bfp);
-	close(fp);
-}
diff --git a/src/modules/texts/rawtext/nuidx.cpp b/src/modules/texts/rawtext/nuidx.cpp
deleted file mode 100644
index edf298d..0000000
--- a/src/modules/texts/rawtext/nuidx.cpp
+++ /dev/null
@@ -1,238 +0,0 @@
-/*****************************************************************************
- *
- *	This code wreaks but works (at least for MHC).  Good luck!
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-
-#ifndef __GNUC__
-#include <io.h>
-#else
-#include <unistd.h>
-#endif
-
-#include <fcntl.h>
-#include <versekey.h>
-
-
-void writeidx(VerseKey &key1, VerseKey &key2, VerseKey &key3, long offset, short size);
-char findbreak(int fp, long *offset, int *num1, int *num2, int *rangemax, short *size);
-void openfiles(char *fname);
-void checkparams(int argc, char **argv);
-
-
-VerseKey key1, key2, key3;
-int fp, vfp, cfp, bfp;
-long chapoffset;
-short chapsize;
-char testmnt;
-
-
-main(int argc, char **argv)
-{
-	long pos, offset;
-	int num1, num2, rangemax, curbook = 0, curchap = 0, curverse = 0;
-	char buf[127], startflag = 0;
-	short size, tmp;
-
-	checkparams(argc, argv);
-
-	openfiles(argv[1]);
-
-	testmnt = key1.Testament();
-	num1 = key1.Chapter();
-	num2 = key1.Verse();
-	pos  = 0;
-	write(bfp, &pos, 4);  /* Book    offset for testament intros */
-	pos = 4;
-	write(cfp, &pos, 4);  /* Chapter offset for testament intro */
-
-
-/*	Right now just zero out intros until parsing correctly */
-	pos = 0;
-	size = 0;
-	write(vfp, &pos, 4);  /* Module intro */
-	write(vfp, &size, 2);
-	write(vfp, &pos, 4);  /* Testament intro */
-	write(vfp, &size, 2);
-
-	while(!findbreak(fp, &offset, &num1, &num2, &rangemax, &size)) {
-		writeidx(key1, key2, key3, offset, size);
-		key2++;
-		key3 = key2;
-	}
-	close(vfp);
-	close(cfp);
-	close(bfp);
-	close(fp);
-}
-
-
-/**************************************************************************
- * ENT:	key1	- current location of index
- * 	key2	- minimum keyval for which this offset is valid
- * 	key3	- maximum keyval for which this offset is valid
- */
-
-void writeidx(VerseKey &key1, VerseKey &key2, VerseKey &key3, long offset, short size)
-{
-	long pos;
-	short tmp;
-
-	for (; ((key1 <= key3) && (key1.Error() != KEYERR_OUTOFBOUNDS) && (key1.Testament() == testmnt)); key1+=1) {
-		if (key1.Verse() == 1) {	// new chapter
-			if (key1.Chapter() == 1) {	// new book
-				pos = lseek(cfp, 0, SEEK_CUR);
-				write(bfp, &pos, 4);
-				pos = lseek(vfp, 0, SEEK_CUR); /* Book intro (cps) */
-				write(cfp, &pos, 4);
-				write(vfp, &chapoffset, 4);  /* Book intro (vss)  set to same as chap for now(it should be chap 1 which usually contains the book into anyway)*/
-				write(vfp, &chapsize, 2);
-			}
-			pos = lseek(vfp, 0, SEEK_CUR);
-			write(cfp, &pos, 4);
-			write(vfp, &chapoffset, 4);  /* Chapter intro */
-			write(vfp, &chapsize, 2);
-		}
-		if (key1 >= key2) {
-			write(vfp, &offset, 4);
-			write(vfp, &size, 2);
-		}
-		else	{
-			pos = 0;
-			tmp = 0;
-			write(vfp, &pos, 4);
-			write(vfp, &tmp, 2);
-		}
-	}
-}
-
-
-char startchap(char *buf)
-{
-	char loop;
-
-	if (buf[0] != '<')
-		return 0;
-	if (buf[1] != 'S')
-		return 0;
-	if (buf[2] != 'C')
-		return 0;
-/*
-	if (!isdigit(buf[2]))
-		return 0;
-	for (loop = 3; loop < 7; loop++) {
-		if (buf[loop] == ' ')
-			break;
-		if ((!isdigit(buf[loop])) && (buf[loop] != ',') && (buf[loop] != '-'))
-			return 0;
-	}
-*/
-	return 1;
-}
-
-
-char startentry(char *buf)
-{
-	char loop;
-
-	if (buf[0] != '<')
-		return 0;
-	if (buf[1] != 'S')
-		return 0;
-	if (buf[2] != 'V')
-		return 0;
-/*
-	if (!isdigit(buf[2]))
-		return 0;
-	for (loop = 3; loop < 7; loop++) {
-		if (buf[loop] == ' ')
-			break;
-		if ((!isdigit(buf[loop])) && (buf[loop] != ',') && (buf[loop] != '-'))
-			return 0;
-	}
-*/
-	return 1;
-}
-
-
-char findbreak(int fp, long *offset, int *num1, int *num2, int *rangemax, short *size)
-{
-	char buf[7];
-	char buf2[20];
-	char ch;
-	char loop;
-	long offset2;
-	int ch2, vs2, rm2;
-	bool flag;
-	long chapstart = 0; 
-	
-	memset(buf, ' ', 7);
-
-	while (1) {
-		if (startentry(buf)) {
-			if (size)
-				*offset = lseek(fp, 0, SEEK_CUR) - 3;
-			else	*offset = lseek(fp, 0, SEEK_CUR) - 7;
-			if (size) {
-				ch2 = *num1;
-				vs2 = *num2;
-				if (findbreak(fp, &offset2, &ch2, &vs2, &rm2, 0)) {
-					*size = (short) (lseek(fp, 0, SEEK_END) - (*offset));
-				}
-				else {
-					*size = (offset2 - (*offset));
-				}
-				lseek(fp, *offset, SEEK_SET);
-			}
-			return 0;
-		}
-		memmove(buf, &buf[1], 6);
-		if (read(fp, &buf[6], 1) != 1)
-			return 1;
-	}
-}
-
-
-void openfiles(char *fname)
-{
-	char buf[255];
-
-	if ((fp = open(fname, O_RDONLY)) == -1) {
-		fprintf(stderr, "Couldn't open file: %s\n", fname);
-		exit(1);
-	}
-
-	sprintf(buf, "%s.vss", fname);
-	if ((vfp = open(buf, O_CREAT|O_WRONLY)) == -1) {
-		fprintf(stderr, "Couldn't open file: %s\n", buf);
-		exit(1);
-	}
-
-	sprintf(buf, "%s.cps", fname);
-	if ((cfp = open(buf, O_CREAT|O_WRONLY)) == -1) {
-		fprintf(stderr, "Couldn't open file: %s\n", buf);
-		exit(1);
-	}
-
-	sprintf(buf, "%s.bks", fname);
-	if ((bfp = open(buf, O_CREAT|O_WRONLY)) == -1) {
-		fprintf(stderr, "Couldn't open file: %s\n", buf);
-		exit(1);
-	}
-}
-
-
-void checkparams(int argc, char **argv)
-{
-	if (argc < 2) {
-		fprintf(stderr, "usage: %s <file to process> [nt - for new testmt file]\n", argv[0]);
-		exit(1);
-	}
-	if (argc == 3)
-		key1 = key2 = key3 = "Matthew 1:1";
-	else	key1 = key2 = key3 = "Genesis 1:1";
-}
diff --git a/src/modules/texts/rawtext/ojbtxidx.c b/src/modules/texts/rawtext/ojbtxidx.c
deleted file mode 100644
index f70cc01..0000000
--- a/src/modules/texts/rawtext/ojbtxidx.c
+++ /dev/null
@@ -1,166 +0,0 @@
-#include <stdio.h>
-#include <fcntl.h>
-#ifndef __GNUC__
-#include <io.h>
-#else
-#include <unistd.h>
-#endif
-
-
-char findbreak(int fd, long *offset, int *num1, int *num2, short *size);
-
-
-main(int argc, char **argv)
-{
-	int fd, vfd, cfd, bfd;
-	long pos, offset;
-	short size, tmp;
-	int num1, num2, curbook = 0, curchap = 0, curverse = 0;
-	char buf[127];
-
-	if (argc != 2) {
-		fprintf(stderr, "usage: %s <file to process>\n", argv[0]);
-		exit(1);
-	}
-#ifndef O_BINARY		// O_BINARY is for Borland to be happy.  If we're in GNU, just define it to a NULL mask
-#define O_BINARY 0
-#endif
-	if ((fd = open(argv[1], O_RDONLY|O_BINARY)) == -1) {
-		fprintf(stderr, "Couldn't open file: %s\n", argv[1]);
-		exit(1);
-	}
-
-	sprintf(buf, "%s.vss", argv[1]);
-	if ((vfd = open(buf, O_CREAT|O_WRONLY|O_BINARY)) == -1) {
-		fprintf(stderr, "Couldn't open file: %s\n", buf);
-		exit(1);
-	}
-
-	sprintf(buf, "%s.cps", argv[1]);
-	if ((cfd = open(buf, O_CREAT|O_WRONLY|O_BINARY)) == -1) {
-		fprintf(stderr, "Couldn't open file: %s\n", buf);
-		exit(1);
-	}
-
-	sprintf(buf, "%s.bks", argv[1]);
-	if ((bfd = open(buf, O_CREAT|O_WRONLY|O_BINARY)) == -1) {
-		fprintf(stderr, "Couldn't open file: %s\n", buf);
-		exit(1);
-	}
-
-	pos  = 0;
-	write(bfd, &pos, 4);  /* Book    offset for testament intros */
-	pos = 4;
-	write(cfd, &pos, 4);  /* Chapter offset for testament intro */
-
-
-/*	Right now just zero out intros until parsing correctly */
-	pos = 0;
-	size = 0;
-	write(vfd, &pos, 4);  /* Module intro */
-	write(vfd, &size, 2);
-	write(vfd, &pos, 4);  /* Testament intro */
-	write(vfd, &size, 2);
-
-	while (!findbreak(fd, &offset, &num1, &num2, &size)) {
-
-		if (num2 == 1) {  		/* if we're at a new chapter */
-			if (num1 == 1) {	/* if we're at a new book */
-				pos = lseek(cfd, 0, SEEK_CUR);
-				write(bfd, &pos, 4);
-				pos = lseek(vfd, 0, SEEK_CUR); /* Book intro (cps) */
-				write(cfd, &pos, 4);
-				pos  = 0;
-				tmp = 0;
-				write(vfd, &pos, 4);  /* Book intro (vss) */
-				write(vfd, &tmp, 2);
-				curbook++;
-				curchap = 0;
-			}
-			pos = lseek(vfd, 0, SEEK_CUR);
-			write(cfd, &pos, 4);
-			curverse = 1;
-			pos  = 0;
-			tmp = 0;
-			write(vfd, &pos, 4);  /* Chapter intro */
-			write(vfd, &tmp, 2);
-			curchap++;
-		}
-		else curverse++;
-	
-		printf("%2d:%3d:%3d found at offset: %7ld\n", curbook, num1, num2, offset);
-
-		if (num1 != curchap) {
-			fprintf(stderr, "Error: Found chaptures out of sequence (%2d:%3d:%3d)\n", curbook, num1-1, num2);
-			curchap = num1;
-//			break;
-		}
-		if (num2 != curverse) {
-			fprintf(stderr, "Error: Found verses out of sequence (%2d:%3d:%3d)\n", curbook, num1, num2-1);
-//			break;
-			tmp = 0;
-			curverse = num2;
-			write(vfd, &offset, 4);
-			write(vfd, &tmp, 2);
-		}
-		write(vfd, &offset, 4);
-		write(vfd, &size, 2);
-	}
-	
-	close(vfd);
-	close(cfd);
-	close(bfd);
-	close(fd);
-	return 0;
-}
-
-
-char findbreak(int fd, long *offset, int *num1, int *num2, short *size)
-{
-	char buf[8];
-	char buf2[7];
-	char loop, len, star;
-
-	memset(buf, ' ', 7);
-	buf[7] = 0;
-
-	while (1) {
-
-		memmove(buf, &buf[1], 6);
-		if (read(fd, &buf[6], 1) != 1)
-			return 1;
-
-		if ((buf[0] == 10) && ((buf[2] == '*') || (buf[3] == '*') || (buf[4] == '*'))) { 
-			star = 0;
-			for (loop = 0; loop < 7; loop++) {
-				if (buf[loop] == '*')
-					star = 1;
-				if (isdigit(buf[loop])&&star)
-					break;
-				else buf[loop] = ' ';
-			}
-			if (loop < 7) {
-				sscanf(buf, "%d", num1);
-				continue;
-			}
-		}
-
-		if ((buf[0] == '|') && (isdigit(buf[1]))) {
-			sscanf(&buf[1], "%d", num2);
-			sprintf(buf, "%d", *num2);
-			(*offset)  = lseek(fd, 0, SEEK_CUR);
-			(*offset) -= (4-strlen(buf));
-
-			for (len = 1; len == 1; len = read(fd, &loop, 1)) {
-				if (loop == '|')
-					break;
-			}
-
-			*size = (short)(lseek(fd, 0, SEEK_CUR) - *offset) - 1;
-			lseek(fd, -1, SEEK_CUR);
-			break;
-		}
-	}
-	return 0;
-}
-
diff --git a/src/modules/texts/rawtext/rawtext.cpp b/src/modules/texts/rawtext/rawtext.cpp
deleted file mode 100644
index 1e1048d..0000000
--- a/src/modules/texts/rawtext/rawtext.cpp
+++ /dev/null
@@ -1,736 +0,0 @@
-/******************************************************************************
- *  rawtext.cpp - code for class 'RawText'- a module that reads raw text files:
- *		  ot and nt using indexs ??.bks ??.cps ??.vss
- */
-
-
-#include <stdio.h>
-#include <fcntl.h>
-
-#ifndef __GNUC__
-#include <io.h>
-#else
-#include <unistd.h>
-#endif
-
-#include <utilfuns.h>
-#include <rawverse.h>
-#include <rawtext.h>
-
-#include <regex.h>	// GNU
-#ifdef USELUCENE
-#include <CLucene/CLucene.h>
-using namespace lucene::search;
-using namespace lucene::queryParser;
-#else
-#include <map>
-#include <list>
-#include <algorithm>
-
-using std::map;
-using std::list;
-using std::find;
-
-#endif
-
-#ifndef O_BINARY
-#define O_BINARY 0
-#endif
-
-SWORD_NAMESPACE_START
-
-typedef  map < SWBuf, list<long> > strlist;
-typedef list<long> longlist;
-
-/******************************************************************************
- * RawText Constructor - Initializes data for instance of RawText
- *
- * ENT:	iname - Internal name for module
- *	idesc - Name to display to user for module
- *	idisp	 - Display object to use for displaying
- */
-
-RawText::RawText(const char *ipath, const char *iname, const char *idesc, SWDisplay *idisp, SWTextEncoding enc, SWTextDirection dir, SWTextMarkup mark, const char* ilang)
-		: SWText(iname, idesc, idisp, enc, dir, mark, ilang),
-          RawVerse(ipath) {
-          
-#ifdef USELUCENE
-	SWBuf fname;
-	fname = path;
-	ir = 0;
-	is = 0;
-	char ch = fname.c_str()[strlen(fname.c_str())-1];
-	if ((ch != '/') && (ch != '\\'))
-		fname += "/lucene";
-	if (IndexReader::indexExists(fname.c_str())) {
-		ir = &IndexReader::open(fname);
-		is = new IndexSearcher(*ir);
-	}
-#else
-	SWBuf fname;
-	fname = path;
-	char ch = fname.c_str()[strlen(fname.c_str())-1];
-	if ((ch != '/') && (ch != '\\'))
-		fname += "/";
-	
-	for (int loop = 0; loop < 2; loop++) {
-     	fastSearch[loop] = 0;
-		SWBuf fastidxname =(fname + ((loop)?"ntwords.dat":"otwords.dat"));
-		if (!access(fastidxname.c_str(), 04)) {
-			fastidxname = (fname + ((loop)?"ntwords.idx":"otwords.idx"));
-			if (!access(fastidxname.c_str(), 04))
-				fastSearch[loop] = new RawStr((fname + ((loop)?"ntwords":"otwords")).c_str());
-        	}
-	}
-#endif
-}
-
-
-/******************************************************************************
- * RawText Destructor - Cleans up instance of RawText
- */
-
-RawText::~RawText() {
-#ifdef USELUCENE
-	if (is)
-		is->close();
-
-	if (ir)
-		delete ir;
-#else
-	if (fastSearch[0])
-		delete fastSearch[0];
-
-	if (fastSearch[1])
-		delete fastSearch[1];
-#endif
-}
-
-
-VerseKey &RawText::getVerseKey() {
-	static VerseKey tmpVK;
-	VerseKey *key;
-	// see if we have a VerseKey * or decendant
-	try {
-		key = SWDYNAMIC_CAST(VerseKey, this->key);
-	}
-	catch ( ... ) {	}
-	if (!key) {
-		ListKey *lkTest = 0;
-		try {
-			lkTest = SWDYNAMIC_CAST(ListKey, this->key);
-		}
-		catch ( ... ) {	}
-		if (lkTest) {
-			try {
-				key = SWDYNAMIC_CAST(VerseKey, lkTest->GetElement());
-			}
-			catch ( ... ) {	}
-		}
-	}
-	if (!key) {
-		tmpVK = *(this->key);
-		return tmpVK;
-	}
-	else	return *key;
-}
-
-
-/******************************************************************************
- * RawText::getRawEntry	- Returns the correct verse when char * cast
- *					is requested
- *
- * RET: string buffer with verse
- */
-
-SWBuf &RawText::getRawEntryBuf() {
-	long  start = 0;
-	unsigned short size = 0;
-	VerseKey &key = getVerseKey();
-
-	findOffset(key.Testament(), key.Index(), &start, &size);
-	entrySize = size;        // support getEntrySize call
-
-	entryBuf = "";
-	readText(key.Testament(), start, size, entryBuf);
-
-	rawFilter(entryBuf, 0);	// hack, decipher
-	rawFilter(entryBuf, &key);
-
-//	if (!isUnicode())
-		prepText(entryBuf);
-
-	return entryBuf;
-}
-
-
-signed char RawText::createSearchFramework() {
-#ifdef USELUCENE
-	SWKey *savekey = 0;
-	SWKey *searchkey = 0;
-	SWKey textkey;
-	char *word = 0;
-	char *wordBuf = 0;
-
-
-	// save key information so as not to disrupt original
-	// module position
-	if (!key->Persist()) {
-		savekey = CreateKey();
-		*savekey = *key;
-	}
-	else	savekey = key;
-
-	searchkey = (key->Persist())?key->clone():0;
-	if (searchkey) {
-		searchkey->Persist(1);
-		setKey(*searchkey);
-	}
-
-	// position module at the beginning
-	*this = TOP;
-
-	VerseKey *lkey = (VerseKey *)key;
-
-	// iterate thru each entry in module
-
-	IndexWriter* writer = NULL;
-	Directory* d = NULL;
- 
-	lucene::analysis::SimpleAnalyzer& an = *new lucene::analysis::SimpleAnalyzer();
-	SWBuf target = path;
-	char ch = target.c_str()[strlen(target.c_str())-1];
-	if ((ch != '/') && (ch != '\\'))
-		target += "/lucene";
-
-	if (IndexReader::indexExists(target.c_str())) {
-		d = &FSDirectory::getDirectory(target.c_str(), false);
-		if (IndexReader::isLocked(*d)) {
-			IndexReader::unlock(*d);
-		}
-																		   
-		writer = new IndexWriter(*d, an, false);
-	} else {
-		d = &FSDirectory::getDirectory(target.c_str(), true);
-		writer = new IndexWriter( *d ,an, true);
-	}
-
-
- 
-	while (!Error()) {
-		Document &doc = *new Document();
-		doc.add( Field::Text(_T("key"), (const char *)*lkey ) );
-		doc.add( Field::Text(_T("content"), StripText()) );
-		writer->addDocument(doc);
-		delete &doc;
-
-		(*this)++;
-	}
-
-	writer->optimize();
-	writer->close();
-	delete writer;
-	delete &an;
-
-	// reposition module back to where it was before we were called
-	setKey(*savekey);
-
-	if (!savekey->Persist())
-		delete savekey;
-
-	if (searchkey)
-		delete searchkey;
-
-	
-#else
-	SWKey *savekey = 0;
-	SWKey *searchkey = 0;
-	SWKey textkey;
-	char *word = 0;
-	char *wordBuf = 0;
-
-	// dictionary holds words associated with a list
-	// containing every module position that contains
-	// the word.  [0] Old Testament; [1] NT
-	map < SWBuf, list<long> > dictionary[2];
-
-
-	// save key information so as not to disrupt original
-	// module position
-	if (!key->Persist()) {
-		savekey = CreateKey();
-		*savekey = *key;
-	}
-	else	savekey = key;
-
-	searchkey = (key->Persist())?key->clone():0;
-	if (searchkey) {
-		searchkey->Persist(1);
-		setKey(*searchkey);
-	}
-
-	// position module at the beginning
-	*this = TOP;
-
-	VerseKey *lkey = (VerseKey *)key;
-
-	// iterate thru each entry in module
-	while (!Error()) {
-		long index = lkey->Index();
-		wordBuf = (char *)calloc(sizeof(char), strlen(StripText()) + 1);
-		strcpy(wordBuf, StripText());
-
-		// grab each word from the text
-		word = strtok(wordBuf, " !.,?;:()-=+/\\|{}[]\"<>");
-		while (word) {
-
-			// make word upper case
-			toupperstr(word);
-
-			// lookup word in dictionary (or make entry in dictionary
-			// for this word) and add this module position (index) to
-			// the word's associated list of module positions
-			dictionary[lkey->Testament()-1][word].push_back(index);
-			word = strtok(NULL, " !.,?;:()-=+/\\|{}[]\"<>");
-		}
-		free(wordBuf);
-		(*this)++;
-	}
-
-	// reposition module back to where it was before we were called
-	setKey(*savekey);
-
-	if (!savekey->Persist())
-		delete savekey;
-
-	if (searchkey)
-		delete searchkey;
-
-	
-	// --------- Let's output an index from our dictionary -----------
-	int datfd;
-	int idxfd;
-	strlist::iterator it;
-	longlist::iterator it2;
-	unsigned long offset, entryoff;
-	unsigned short size;
-
-	SWBuf fname;
-	fname = path;
-	char ch = fname.c_str()[strlen(fname.c_str())-1];
-	if ((ch != '/') && (ch != '\\'))
-		fname += "/";
-
-	// for old and new testament do...
-	for (int loop = 0; loop < 2; loop++) {
-		if ((datfd = open((fname + ((loop)?"ntwords.dat":"otwords.dat")).c_str(), O_CREAT|O_WRONLY|O_BINARY, 00644 )) == -1)
-			return -1;
-		if ((idxfd = open((fname + ((loop)?"ntwords.idx":"otwords.idx")).c_str(), O_CREAT|O_WRONLY|O_BINARY, 00644 )) == -1) {
-			close(datfd);
-			return -1;
-		}
-
-		// iterate thru each word in the dictionary
-		for (it = dictionary[loop].begin(); it != dictionary[loop].end(); it++) {
-			printf("%s: ", it->first.c_str());
-
-			// get our current offset in our word.dat file and write this as the start
-			// of the next entry in our database
-			offset = lseek(datfd, 0, SEEK_CUR);
-			write(idxfd, &offset, 4);
-
-			// write our word out to the word.dat file, delineating with a \n
-			write(datfd, it->first.c_str(), strlen(it->first.c_str()));
-			write(datfd, "\n", 1);
-
-			// force our mod position list for this word to be unique (remove
-			// duplicates that may exist if the word was found more than once
-			// in the verse
-			it->second.unique();
-
-			// iterate thru each mod position for this word and output it to
-			// our database
-			unsigned short count = 0;
-			for (it2 = it->second.begin(); it2 != it->second.end(); it2++) {
-				entryoff= *it2;
-				write(datfd, &entryoff, 4);
-				count++;
-			}
-			
-			// now see what our new position is in our word.dat file and
-			// determine the size of this database entry
-			size = lseek(datfd, 0, SEEK_CUR) - offset;
-
-			// store the size of this database entry
-			write(idxfd, &size, 2);
-			printf("%d entries (size: %d)\n", count, size);
-		}
-		close(datfd);
-		close(idxfd);
-	}
-#endif
-	return 0;
-}
-
-
-/******************************************************************************
- * SWModule::search 	- Searches a module for a string
- *
- * ENT:	istr		- string for which to search
- * 	searchType	- type of search to perform
- *				>=0 - regex
- *				-1  - phrase
- *				-2  - multiword
- * 	flags		- options flags for search
- *	justCheckIfSupported	- if set, don't search, only tell if this
- *							function supports requested search.
- *
- * RET: listkey set to verses that contain istr
- */
-
-ListKey &RawText::search(const char *istr, int searchType, int flags, SWKey *scope, bool *justCheckIfSupported, void (*percent)(char, void *), void *percentUserData) {
-#ifdef USELUCENE
-	listkey.ClearList();
-
-	if ((is) && (ir)) {
-
-		switch (searchType) {
-		case -2: {	// let lucene replace multiword for now
-
-
-			// test to see if our scope for this search is bounded by a
-			// VerseKey
-			VerseKey *testKeyType = 0, vk;
-			try {
-				testKeyType = SWDYNAMIC_CAST(VerseKey, ((scope)?scope:key));
-			}
-			catch ( ... ) {}
-			// if we don't have a VerseKey * decendant we can't handle
-			// because of scope.
-			// In the future, add bool SWKey::isValid(const char *tryString);
-			if (!testKeyType)
-				break;
-
-
-			// check if we just want to see if search is supported.
-			// If we've gotten this far, then it is supported.
-			if (justCheckIfSupported) {
-				*justCheckIfSupported = true;
-				return listkey;
-			}
-
-			(*percent)(10, percentUserData);
-
-			standard::StandardAnalyzer analyzer;
-			Query &q =  QueryParser::Parse(istr, _T("content"), analyzer);
-			(*percent)(20, percentUserData);
-			Hits &h = is->search(q);
-			(*percent)(80, percentUserData);
-
-
-			// iterate thru each good module position that meets the search
-			for (long i = 0; i < h.Length(); i++) {
-				Document &doc = h.doc(i);
-
-				// set a temporary verse key to this module position
-				vk = doc.get(_T("key"));
-
-				// check scope
-				// Try to set our scope key to this verse key
-				if (scope) {
-					*testKeyType = vk;
-
-					// check to see if it set ok and if so, add to our return list
-					if (*testKeyType == vk)
-						listkey << (const char *) vk;
-						listkey.GetElement()->userData = (void *)(int)(h.score(i)*100);
-				}
-				else {
-					listkey << (const char*) vk;
-					listkey.GetElement()->userData = (void *)(int)(h.score(i)*100);
-				}
-			}
-			(*percent)(98, percentUserData);
-
-			delete &h;
-			delete &q;
-
-			listkey = TOP;
-			(*percent)(100, percentUserData);
-			return listkey;
-		}
-
-		default:
-			break;
-		}
-	}
-
-	// check if we just want to see if search is supported
-	if (justCheckIfSupported) {
-		*justCheckIfSupported = false;
-		return listkey;
-	}
-#else
-	listkey.ClearList();
-
-	if ((fastSearch[0]) && (fastSearch[1])) {
-
-		switch (searchType) {
-		case -2: {
-
-			if ((flags & REG_ICASE) != REG_ICASE)	// if haven't chosen to
-											// ignore case
-				break; // can't handle fast case sensitive searches
-
-			// test to see if our scope for this search is bounded by a
-			// VerseKey
-			VerseKey *testKeyType = 0;
-			try {
-				testKeyType = SWDYNAMIC_CAST(VerseKey, ((scope)?scope:key));
-			}
-			catch ( ... ) {}
-			// if we don't have a VerseKey * decendant we can't handle
-			// because of scope.
-			// In the future, add bool SWKey::isValid(const char *tryString);
-			if (!testKeyType)
-				break;
-
-
-			// check if we just want to see if search is supported.
-			// If we've gotten this far, then it is supported.
-			if (justCheckIfSupported) {
-				*justCheckIfSupported = true;
-				return listkey;
-			}
-
-			SWKey saveKey = *testKeyType; // save current place
-
-			char error = 0;
-			char **words = 0;
-			char *wordBuf = 0;
-			int wordCount = 0;
-			long start;
-			unsigned short size;
-			char *idxbuf = 0;
-			SWBuf datBuf;
-			list <long> indexes;
-			list <long> indexes2;
-			VerseKey vk;
-			vk = TOP;
-
-			(*percent)(10, percentUserData);
-
-			// toupper our copy of search string
-			stdstr(&wordBuf, istr);
-			toupperstr(wordBuf);
-
-			// get list of individual words
-			words = (char **)calloc(sizeof(char *), 10);
-			int allocWords = 10;
-			words[wordCount] = strtok(wordBuf, " ");
-			while (words[wordCount]) {
-				wordCount++;
-				if (wordCount == allocWords) {
-					allocWords+=10;
-					words = (char **)realloc(words, sizeof(char *)*allocWords);
-				}
-				words[wordCount] = strtok(NULL, " ");
-			}
-
-			(*percent)(20, percentUserData);
-
-			// clear our result set
-			indexes.erase(indexes.begin(), indexes.end());
-
-			// search both old and new testament indexes
-			for (int j = 0; j < 2; j++) {
-				// iterate thru each word the user passed to us.
-				for (int i = 0; i < wordCount; i++) {
-
-					// clear this word's result set
-					indexes2.erase(indexes2.begin(), indexes2.end());
-					error = 0;
-
-					// iterate thru every word in the database that starts
-					// with our search word
-					for (int away = 0; !error; away++) {
-						idxbuf = 0;
-						
-						// find our word in the database and jump ahead _away_
-						error = fastSearch[j]->findOffset(words[i], &start, &size, away);
-
-						// get the word from the database
-						fastSearch[j]->getIDXBufDat(start, &idxbuf);
-
-						// check to see if it starts with our target word
-						if (strlen(idxbuf) > strlen(words[i]))
-							idxbuf[strlen(words[i])] = 0;
-//						else	words[i][strlen(idxbuf)] = 0;
-						if (!strcmp(idxbuf, words[i])) {
-
-							// get data for this word from database
-							delete [] idxbuf;
-							idxbuf = 0;
-							datBuf = "";
-							fastSearch[j]->readText(start, &size, &idxbuf, datBuf);
-
-							// we know that the data consists of sizof(long)
-							// records each a valid module position that constains
-							// this word
-							//
-							// iterate thru each of these module positions
-							long *keyindex = (long *)datBuf.getRawData();
-							while (keyindex < (long *)(datBuf.getRawData() + size - (strlen(idxbuf) + 1))) {
-								if (i) {	// if we're not on our first word
-
-									// check to see if this word is already in the result set.
-									// This is our AND functionality
-									if (find(indexes.begin(), indexes.end(), *keyindex) != indexes.end())
-										// add to new result set
-										indexes2.push_back(*keyindex);
-								}
-								else	indexes2.push_back(*keyindex);
-								keyindex++;
-							}
-						}
-						else error = 1;	// no more matches
-						free(idxbuf);
-					}
-
-					// make new result set final result set
-					indexes = indexes2;
-
-					percent((char)(20 + (float)((j*wordCount)+i)/(wordCount * 2) * 78), percentUserData);
-				}
-
-				// indexes contains our good verses, lets return them in a listkey
-				indexes.sort();
-
-				// iterate thru each good module position that meets the search
-				for (longlist::iterator it = indexes.begin(); it != indexes.end(); it++) {
-
-					// set a temporary verse key to this module position
-					vk.Testament(j+1);
-					vk.Error();
-					vk.Index(*it);
-
-					// check scope
-					// Try to set our scope key to this verse key
-					if (scope) {
-						*testKeyType = vk;
-
-						// check to see if it set ok and if so, add to our return list
-						if (*testKeyType == vk)
-							listkey << (const char *) vk;
-					}
-					else listkey << (const char*) vk;
-				}
-			}
-			(*percent)(98, percentUserData);
-
-			free(words);
-			free(wordBuf);
-
-			*testKeyType = saveKey;	// set current place back to original
-
-			listkey = TOP;
-			(*percent)(100, percentUserData);
-			return listkey;
-		}
-
-		default:
-			break;
-		}
-	}
-
-	// check if we just want to see if search is supported
-	if (justCheckIfSupported) {
-		*justCheckIfSupported = false;
-		return listkey;
-	}
-
-#endif
-	// if we don't support this search, fall back to base class
-	return SWModule::search(istr, searchType, flags, scope, justCheckIfSupported, percent, percentUserData);
-}
-
-
-void RawText::setEntry(const char *inbuf, long len) {
-	VerseKey &key = getVerseKey();
-	doSetText(key.Testament(), key.Index(), inbuf, len);
-}
-
-
-void RawText::linkEntry(const SWKey *inkey) {
-	VerseKey &destkey = getVerseKey();
-	const VerseKey *srckey = 0;
-
-	// see if we have a VerseKey * or decendant
-	try {
-		srckey = SWDYNAMIC_CAST(VerseKey, inkey);
-	}
-	catch ( ... ) {}
-	// if we don't have a VerseKey * decendant, create our own
-	if (!srckey)
-		srckey = new VerseKey(inkey);
-
-	doLinkEntry(destkey.Testament(), destkey.Index(), srckey->Index());
-
-	if (inkey != srckey) // free our key if we created a VerseKey
-		delete srckey;
-}
-
-
-/******************************************************************************
- * RawText::deleteEntry	- deletes this entry
- *
- * RET: *this
- */
-
-void RawText::deleteEntry() {
-	VerseKey &key = getVerseKey();
-	doSetText(key.Testament(), key.Index(), "");
-}
-
-/******************************************************************************
- * RawText::increment	- Increments module key a number of entries
- *
- * ENT:	increment	- Number of entries to jump forward
- *
- * RET: *this
- */
-
-void RawText::increment(int steps) {
-	long  start;
-	unsigned short size;
-	VerseKey *tmpkey = &getVerseKey();
-
-	findOffset(tmpkey->Testament(), tmpkey->Index(), &start, &size);
-
-	SWKey lastgood = *tmpkey;
-	while (steps) {
-		long laststart = start;
-		unsigned short lastsize = size;
-		SWKey lasttry = *tmpkey;
-		(steps > 0) ? (*key)++ : (*key)--;
-		tmpkey = &getVerseKey();
-
-		if ((error = key->Error())) {
-			*key = lastgood;
-			break;
-		}
-		long index = tmpkey->Index();
-		findOffset(tmpkey->Testament(), index, &start, &size);
-		if (
-			(((laststart != start) || (lastsize != size))	// we're a different entry
-//				&& (start > 0)
-				&& (size))	// and we actually have a size
-				||(!skipConsecutiveLinks)) {	// or we don't want to skip consecutive links
-			steps += (steps < 0) ? 1 : -1;
-			lastgood = *tmpkey;
-		}
-	}
-	error = (error) ? KEYERR_OUTOFBOUNDS : 0;
-}
-
-SWORD_NAMESPACE_END
diff --git a/src/modules/texts/rawtext/rawtxidx.c b/src/modules/texts/rawtext/rawtxidx.c
deleted file mode 100644
index 311103e..0000000
--- a/src/modules/texts/rawtext/rawtxidx.c
+++ /dev/null
@@ -1,146 +0,0 @@
-#include <stdio.h>
-#include <fcntl.h>
-
-
-char findbreak(int fp, int *offset, int *num1, int *num2, short *size);
-
-
-main(int argc, char **argv)
-{
-	int fp, vfp, cfp, bfp;
-	long pos;
-	short size, tmp;
-	int num1, num2, offset, curbook = 0, curchap = 0, curverse = 0;
-	char buf[127];
-
-	if (argc != 2) {
-		fprintf(stderr, "usage: %s <file to process>\n", argv[0]);
-		exit(1);
-	}
-
-	if ((fp = open(argv[1], O_RDONLY)) == -1) {
-		fprintf(stderr, "Couldn't open file: %s\n", argv[1]);
-		exit(1);
-	}
-
-	sprintf(buf, "%s.vss", argv[1]);
-	if ((vfp = open(buf, O_CREAT|O_WRONLY)) == -1) {
-		fprintf(stderr, "Couldn't open file: %s\n", buf);
-		exit(1);
-	}
-
-	sprintf(buf, "%s.cps", argv[1]);
-	if ((cfp = open(buf, O_CREAT|O_WRONLY)) == -1) {
-		fprintf(stderr, "Couldn't open file: %s\n", buf);
-		exit(1);
-	}
-
-	sprintf(buf, "%s.bks", argv[1]);
-	if ((bfp = open(buf, O_CREAT|O_WRONLY)) == -1) {
-		fprintf(stderr, "Couldn't open file: %s\n", buf);
-		exit(1);
-	}
-
-	pos  = 0;
-	write(bfp, &pos, 4);  /* Book    offset for testament intros */
-	pos = 4;
-	write(cfp, &pos, 4);  /* Chapter offset for testament intro */
-
-
-/*	Right now just zero out intros until parsing correctly */
-	pos = 0;
-	size = 0;
-	write(vfp, &pos, 4);  /* Module intro */
-	write(vfp, &size, 2);
-	write(vfp, &pos, 4);  /* Testament intro */
-	write(vfp, &size, 2);
-
-	while (!findbreak(fp, &offset, &num1, &num2, &size)) {
-
-		if (num2 == 1) {  		/* if we're at a new chapter */
-			if (num1 == 1) {	/* if we're at a new book */
-				pos = lseek(cfp, 0, SEEK_CUR);
-				write(bfp, &pos, 4);
-				pos = lseek(vfp, 0, SEEK_CUR); /* Book intro (cps) */
-				write(cfp, &pos, 4);
-				pos  = 0;
-				tmp = 0;
-				write(vfp, &pos, 4);  /* Book intro (vss) */
-				write(vfp, &tmp, 2);
-				curbook++;
-				curchap = 0;
-			}
-			pos = lseek(vfp, 0, SEEK_CUR);
-			write(cfp, &pos, 4);
-			curverse = 1;
-			pos  = 0;
-			tmp = 0;
-			write(vfp, &pos, 4);  /* Chapter intro */
-			write(vfp, &tmp, 2);
-			curchap++;
-		}
-		else curverse++;
-	
-		printf("%2d:%3d:%3d found at offset: %7d\n", curbook, num1, num2, offset);
-
-		if (num1 != curchap) {
-			fprintf(stderr, "Error: Found chaptures out of sequence\n", buf);
-			break;
-		}
-		if (num2 != curverse) {
-			fprintf(stderr, "Error: Found verses out of sequence\n", buf);
-			break;
-		}
-		write(vfp, &offset, 4);
-		write(vfp, &size, 2);
-	}
-	
-	close(vfp);
-	close(cfp);
-	close(bfp);
-	close(fp);
-}
-
-
-char findbreak(int fp, int *offset, int *num1, int *num2, short *size)
-{
-	char buf[7];
-	char buf2[7];
-	char loop;
-	int offset2, ch2, vs2;
-	
-	memset(buf, ' ', 7);
-
-	while (1) {
-		if (buf[3] == ':') {
-			memcpy(buf2, buf, 7);
-			for (loop = 0; loop < 7; loop++) {
-				if (!isdigit(buf2[loop]))
-					buf2[loop] = ' ';
-			}
-			buf2[3] = 0;
-			*num1 = atoi(buf2);
-			*num2 = atoi(&buf2[4]);
-			if (*num1 && *num2) {
-				*offset = lseek(fp, 0, SEEK_CUR);
-				sprintf(buf2, "%d", *num2);
-				*offset -= 2 - strlen(buf2);
-				if (size) {
-					if (findbreak(fp, &offset2, &ch2, &vs2, 0)) {
-						*size = (short) (lseek(fp, 0, SEEK_END) - (*offset));
-					}
-					else {
-						sprintf(buf2, "%d:%d", ch2, vs2);
-						*size = (offset2 - (*offset)) - (strlen(buf2) + 2);
-					}
-					lseek(fp, *offset, SEEK_SET);
-				}
-				return 0;
-			}
-		}
-		memmove(buf, &buf[1], 6);
-		if (read(fp, &buf[6], 1) != 1)
-			return 1;
-	}
-}
-
diff --git a/src/modules/texts/rawtext/rtfidx.cpp b/src/modules/texts/rawtext/rtfidx.cpp
deleted file mode 100644
index 9fdb305..0000000
--- a/src/modules/texts/rawtext/rtfidx.cpp
+++ /dev/null
@@ -1,164 +0,0 @@
-#include <stdio.h>
-#include <fcntl.h>
-#include <versekey.h>
-
-
-char findbreak(int fp, int *offset, int *num1, int *num2, short *size);
-
-
-main(int argc, char **argv)
-{
-	int fp, vfp, cfp, bfp;
-	long pos;
-	short size, tmp;
-	int num1, num2, offset, curbook = 0, curchap = 0, curverse = 0;
-	char buf[127];
-	VerseKey mykey;
-
-	if ((argc < 2) || (argc > 3)) {
-		fprintf(stderr, "usage: %s <file to process> [nt]\n", argv[0]);
-		exit(1);
-	}
-
-	if ((fp = open(argv[1], O_RDONLY)) == -1) {
-		fprintf(stderr, "Couldn't open file: %s\n", argv[1]);
-		exit(1);
-	}
-
-	sprintf(buf, "%s.vss", argv[1]);
-	if ((vfp = open(buf, O_CREAT|O_WRONLY)) == -1) {
-		fprintf(stderr, "Couldn't open file: %s\n", buf);
-		exit(1);
-	}
-
-	sprintf(buf, "%s.cps", argv[1]);
-	if ((cfp = open(buf, O_CREAT|O_WRONLY)) == -1) {
-		fprintf(stderr, "Couldn't open file: %s\n", buf);
-		exit(1);
-	}
-
-	sprintf(buf, "%s.bks", argv[1]);
-	if ((bfp = open(buf, O_CREAT|O_WRONLY)) == -1) {
-		fprintf(stderr, "Couldn't open file: %s\n", buf);
-		exit(1);
-	}
-
-	pos  = 0;
-	write(bfp, &pos, 4);  /* Book    offset for testament intros */
-	pos = 4;
-	write(cfp, &pos, 4);  /* Chapter offset for testament intro */
-
-
-/*	Right now just zero out intros until parsing correctly */
-	pos = 0;
-	size = 0;
-	write(vfp, &pos, 4);  /* Module intro */
-	write(vfp, &size, 2);
-	write(vfp, &pos, 4);  /* Testament intro */
-	write(vfp, &size, 2);
-
-	mykey = (argc == 3) ? "Matthew 1:1" : "Genesis 1:1";
-
-	while (!findbreak(fp, &offset, &num1, &num2, &size)) {
-		num1 = mykey.Chapter();
-		num2 = mykey.Verse();
-		if (num2 == 1) {  		/* if we're at a new chapter */
-			if (num1 == 1) {	/* if we're at a new book */
-				pos = lseek(cfp, 0, SEEK_CUR);
-				write(bfp, &pos, 4);
-				pos = lseek(vfp, 0, SEEK_CUR); /* Book intro (cps) */
-				write(cfp, &pos, 4);
-				pos  = 0;
-				tmp = 0;
-				write(vfp, &pos, 4);  /* Book intro (vss) */
-				write(vfp, &tmp, 2);
-				curbook++;
-				curchap = 0;
-			}
-			pos = lseek(vfp, 0, SEEK_CUR);
-			write(cfp, &pos, 4);
-			curverse = 1;
-			pos  = 0;
-			tmp = 0;
-			write(vfp, &pos, 4);  /* Chapter intro */
-			write(vfp, &tmp, 2);
-			curchap++;
-		}
-		else curverse++;
-	
-		printf("%2d:%3d:%3d found at offset: %7d\n", curbook, num1, num2, offset);
-
-		if (num1 != curchap) {
-			fprintf(stderr, "Error: Found chaptures out of sequence\n");
-			break;
-		}
-		if (num2 != curverse) {
-			fprintf(stderr, "Error: Found verses out of sequence\n");
-			break;
-		}
-		write(vfp, &offset, 4);
-		write(vfp, &size, 2);
-		mykey++;
-	}
-	
-	close(vfp);
-	close(cfp);
-	close(bfp);
-	close(fp);
-}
-
-
-char findbreak(int fp, int *offset, int *num1, int *num2, short *size)
-{
-	char buf[17];
-	char buf2[7];
-	char loop;
-	char offadj, inquotes, sizeadj;
-	int offset2, ch2, vs2;
-	
-	memset(buf, ' ', 17);
-
-	while (1) {
-		offadj = -10;
-		inquotes = 0;
-		sizeadj = 0;
-  		if (!memcmp(&buf[1], "\\f0\\fs16\\cf2\\up6", 15)) {
-			offadj = 0;
-			inquotes = 1;
-			sizeadj = (*buf == 10) ? -19:-17;
-		}
-  		if (!memcmp(buf, "\\fi200\\widctlpar", 16)) {
-			offadj = -1;
-//			inquotes = 1;
-			sizeadj = -18;
-		}
-		if (offadj > -10) {
-			*offset = lseek(fp, 0, SEEK_CUR) + offadj;
-			if (size) {
-				(*offset)++;
-				while (inquotes) {
-					while (read(fp, buf2, 1) == 1) {
-						if (*buf2 == '}')
-							break;
-						(*offset)++;
-					}
-					inquotes--;
-				}
-				if (findbreak(fp, &offset2, &ch2, &vs2, 0)) {
-					*size = (short) (lseek(fp, 0, SEEK_END) - (*offset));
-				}
-				else {
-					sprintf(buf2, "%d:%d", ch2, vs2);
-					*size = (offset2 - (*offset));
-				}
-				lseek(fp, *offset+17, SEEK_SET);
-			}
-			else (*offset) += sizeadj;
-			return 0;
-		}
-		memmove(buf, &buf[1], 16);
-		if (read(fp, &buf[16], 1) != 1)
-			return 1;
-	}
-}
-
diff --git a/src/modules/texts/rawtext/svetxidx.c b/src/modules/texts/rawtext/svetxidx.c
deleted file mode 100644
index 26e67fd..0000000
--- a/src/modules/texts/rawtext/svetxidx.c
+++ /dev/null
@@ -1,153 +0,0 @@
-#include <stdio.h>
-#include <fcntl.h>
-#ifndef __GNUC__
-#include <io.h>
-#else
-#include <unistd.h>
-#endif
-
-
-char findbreak(int fd, long *offset, int *num1, int *num2, short *size);
-
-
-main(int argc, char **argv)
-{
-	int fd, vfd, cfd, bfd;
-	long pos, offset;
-	short size, tmp;
-	int num1, num2, curbook = 0, curchap = 0, curverse = 0;
-	char buf[127];
-
-	if (argc != 2) {
-		fprintf(stderr, "usage: %s <file to process>\n", argv[0]);
-		exit(1);
-	}
-#ifndef O_BINARY		// O_BINARY is for Borland to be happy.  If we're in GNU, just define it to a NULL mask
-#define O_BINARY 0
-#endif
-	if ((fd = open(argv[1], O_RDONLY|O_BINARY)) == -1) {
-		fprintf(stderr, "Couldn't open file: %s\n", argv[1]);
-		exit(1);
-	}
-
-	sprintf(buf, "%s.vss", argv[1]);
-	if ((vfd = open(buf, O_CREAT|O_WRONLY|O_BINARY)) == -1) {
-		fprintf(stderr, "Couldn't open file: %s\n", buf);
-		exit(1);
-	}
-
-	sprintf(buf, "%s.cps", argv[1]);
-	if ((cfd = open(buf, O_CREAT|O_WRONLY|O_BINARY)) == -1) {
-		fprintf(stderr, "Couldn't open file: %s\n", buf);
-		exit(1);
-	}
-
-	sprintf(buf, "%s.bks", argv[1]);
-	if ((bfd = open(buf, O_CREAT|O_WRONLY|O_BINARY)) == -1) {
-		fprintf(stderr, "Couldn't open file: %s\n", buf);
-		exit(1);
-	}
-
-	pos  = 0;
-	write(bfd, &pos, 4);  /* Book    offset for testament intros */
-	pos = 4;
-	write(cfd, &pos, 4);  /* Chapter offset for testament intro */
-
-
-/*	Right now just zero out intros until parsing correctly */
-	pos = 0;
-	size = 0;
-	write(vfd, &pos, 4);  /* Module intro */
-	write(vfd, &size, 2);
-	write(vfd, &pos, 4);  /* Testament intro */
-	write(vfd, &size, 2);
-
-	while (!findbreak(fd, &offset, &num1, &num2, &size)) {
-
-		if (num2 == 1) {  		/* if we're at a new chapter */
-			if (num1 == 1) {	/* if we're at a new book */
-				pos = lseek(cfd, 0, SEEK_CUR);
-				write(bfd, &pos, 4);
-				pos = lseek(vfd, 0, SEEK_CUR); /* Book intro (cps) */
-				write(cfd, &pos, 4);
-				pos  = 0;
-				tmp = 0;
-				write(vfd, &pos, 4);  /* Book intro (vss) */
-				write(vfd, &tmp, 2);
-				curbook++;
-				curchap = 0;
-			}
-			pos = lseek(vfd, 0, SEEK_CUR);
-			write(cfd, &pos, 4);
-			curverse = 1;
-			pos  = 0;
-			tmp = 0;
-			write(vfd, &pos, 4);  /* Chapter intro */
-			write(vfd, &tmp, 2);
-			curchap++;
-		}
-		else curverse++;
-	
-		printf("%2d:%3d:%3d found at offset: %7ld\n", curbook, num1, num2, offset);
-
-		if (num1 != curchap) {
-			fprintf(stderr, "Error: Found chaptures out of sequence (%2d:%3d:%3d)\n", curbook, num1-1, num2);
-			curchap = num1;
-//			break;
-		}
-		if (num2 != curverse) {
-			fprintf(stderr, "Error: Found verses out of sequence (%2d:%3d:%3d)\n", curbook, num1, num2-1);
-//			break;
-			tmp = 0;
-			curverse = num2;
-			write(vfd, &offset, 4);
-			write(vfd, &tmp, 2);
-		}
-		write(vfd, &offset, 4);
-		write(vfd, &size, 2);
-	}
-	
-	close(vfd);
-	close(cfd);
-	close(bfd);
-	close(fd);
-}
-
-
-char findbreak(int fd, long *offset, int *num1, int *num2, short *size)
-{
-	char buf[8];
-	char buf2[7];
-	char loop, len;
-
-	memset(buf, ' ', 7);
-	buf[7] = 0;
-
-	while (1) {
-
-		memmove(buf, &buf[1], 6);
-		if (read(fd, &buf[6], 1) != 1)
-			return 1;
-
-		if ((buf[0] == 10) && (isdigit(buf[1]))) {
-			sscanf(buf, "%d %s", num2, buf2);
-			if (!strncmp(buf2, "KAP", 3)) {
-				*num1 = *num2;
-				continue;
-			}
-			sprintf(buf, "%d", *num2);
-			(*offset)  = lseek(fd, 0, SEEK_CUR);
-			(*offset) -= (5-strlen(buf));
-			for (len = 1; len == 1; len = read(fd, &loop, 1)) {
-				if ((loop == 10) || (loop == 13))
-					break;
-			}
-
-			*size = (short)(lseek(fd, 0, SEEK_CUR) - *offset) - 1;
-			lseek(fd, -1, SEEK_CUR);
-			break;
-		}
-	}
-	return 0;
-}
-
diff --git a/src/modules/texts/rawtext/vntidx.cpp b/src/modules/texts/rawtext/vntidx.cpp
deleted file mode 100644
index bbb4a9e..0000000
--- a/src/modules/texts/rawtext/vntidx.cpp
+++ /dev/null
@@ -1,185 +0,0 @@
-#include <stdio.h>
-#include <fcntl.h>
-#include <versekey.h>
-
-
-char findbreak(int fp, int *offset, int *num1, int *num2, short *size);
-
-
-main(int argc, char **argv)
-{
-	int fp, vfp, cfp, bfp;
-	long pos;
-	short size, tmp;
-	int num1, num2, offset, curbook = 0, curchap = 0, curverse = 0;
-	char buf[127];
-	VerseKey mykey;
-
-	if ((argc < 2) || (argc > 3)) {
-		fprintf(stderr, "usage: %s <file to process> [nt]\n", argv[0]);
-		exit(1);
-	}
-
-	if ((fp = open(argv[1], O_RDONLY)) == -1) {
-		fprintf(stderr, "Couldn't open file: %s\n", argv[1]);
-		exit(1);
-	}
-
-	sprintf(buf, "%s.vss", argv[1]);
-	if ((vfp = open(buf, O_CREAT|O_WRONLY)) == -1) {
-		fprintf(stderr, "Couldn't open file: %s\n", buf);
-		exit(1);
-	}
-
-	sprintf(buf, "%s.cps", argv[1]);
-	if ((cfp = open(buf, O_CREAT|O_WRONLY)) == -1) {
-		fprintf(stderr, "Couldn't open file: %s\n", buf);
-		exit(1);
-	}
-
-	sprintf(buf, "%s.bks", argv[1]);
-	if ((bfp = open(buf, O_CREAT|O_WRONLY)) == -1) {
-		fprintf(stderr, "Couldn't open file: %s\n", buf);
-		exit(1);
-	}
-
-	pos  = 0;
-	write(bfp, &pos, 4);  /* Book    offset for testament intros */
-	pos = 4;
-	write(cfp, &pos, 4);  /* Chapter offset for testament intro */
-
-
-/*	Right now just zero out intros until parsing correctly */
-	pos = 0;
-	size = 0;
-	write(vfp, &pos, 4);  /* Module intro */
-	write(vfp, &size, 2);
-	write(vfp, &pos, 4);  /* Testament intro */
-	write(vfp, &size, 2);
-
-	mykey = (argc == 3) ? "Matthew 1:1" : "Genesis 1:1";
-
-	while (!findbreak(fp, &offset, &num1, &num2, &size)) {
-		num1 = mykey.Chapter();
-		num2 = mykey.Verse();
-		if (num2 == 1) {  		/* if we're at a new chapter */
-			if (num1 == 1) {	/* if we're at a new book */
-				pos = lseek(cfp, 0, SEEK_CUR);
-				write(bfp, &pos, 4);
-				pos = lseek(vfp, 0, SEEK_CUR); /* Book intro (cps) */
-				write(cfp, &pos, 4);
-				pos  = 0;
-				tmp = 0;
-				write(vfp, &pos, 4);  /* Book intro (vss) */
-				write(vfp, &tmp, 2);
-				curbook++;
-				curchap = 0;
-			}
-			pos = lseek(vfp, 0, SEEK_CUR);
-			write(cfp, &pos, 4);
-			curverse = 1;
-			pos  = 0;
-			tmp = 0;
-			write(vfp, &pos, 4);  /* Chapter intro */
-			write(vfp, &tmp, 2);
-			curchap++;
-		}
-		else curverse++;
-	
-		printf("%2d:%3d:%3d found at offset: %7d\n", curbook, num1, num2, offset);
-
-		if (num1 != curchap) {
-			fprintf(stderr, "Error: Found chaptures out of sequence\n");
-			break;
-		}
-		if (num2 != curverse) {
-			fprintf(stderr, "Error: Found verses out of sequence\n");
-			break;
-		}
-		write(vfp, &offset, 4);
-		write(vfp, &size, 2);
-		mykey++;
-	}
-	
-	close(vfp);
-	close(cfp);
-	close(bfp);
-	close(fp);
-}
-
-
-char findbreak(int fp, int *offset, int *num1, int *num2, short *size)
-{
-	char buf[17];
-	char buf2[7];
-	char buf3[7];
-	char loop;
-	char offadj, inquotes, sizeadj;
-	int offset2, ch2, vs2;
-	
-	strcpy (buf3, "\\par  ");
-	buf3[5] = 10;
-	memset(buf, ' ', 17);
-
-	while (1) {
-		offadj = -100;
-		inquotes = 0;
-		sizeadj = 0;
-  		if (!memcmp(buf, "\\par FIN DEL NUEVO TESTAMENTO", 16)) {
-			offadj = -11;
-//			inquotes = 1;
-			sizeadj = -7;
-		}
-		
-  		if ((!memcmp(buf, buf3, 6)) && (!size)) {
-			offadj = -11;
-//			inquotes = 1;
-			sizeadj = -7;
-		}
-  		if (!memcmp(buf, "\\par  ", 6)) {
-			if (isdigit(buf[6])) {
-				for (loop = 7; loop < 10; loop++) {
-					if (!isdigit(buf[loop]))
-						break;
-				}
-				offadj = -(11 - (loop - 6));
-	//			inquotes = 1;
-				sizeadj = -7;
-			}
-		}
-/*
-  		if (!memcmp(buf, "\\fi200\\widctlpar", 16)) {
-			offadj = -1;
-//			inquotes = 1;
-			sizeadj = -18;
-		}
-*/
-		if (offadj > -100) {
-			*offset = lseek(fp, 0, SEEK_CUR) + offadj;
-			if (size) {
-				(*offset)++;
-				while (inquotes) {
-					while (read(fp, buf2, 1) == 1) {
-						if (*buf2 == '}')
-							break;
-						(*offset)++;
-					}
-					inquotes--;
-				}
-				if (findbreak(fp, &offset2, &ch2, &vs2, 0)) {
-					*size = (short) (lseek(fp, 0, SEEK_END) - (*offset));
-				}
-				else {
-					*size = (offset2 - (*offset));
-				}
-				lseek(fp, *offset-sizeadj, SEEK_SET);
-			}
-			else (*offset) += sizeadj;
-			return 0;
-		}
-		memmove(buf, &buf[1], 16);
-		if (read(fp, &buf[16], 1) != 1)
-			return 1;
-	}
-}
-
diff --git a/src/modules/texts/swtext.cpp b/src/modules/texts/swtext.cpp
deleted file mode 100644
index 8610dae..0000000
--- a/src/modules/texts/swtext.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-/******************************************************************************
- *  swtext.cpp  - code for base class 'SWText'- The basis for all text modules
- */
-
-#include <swtext.h>
-#include <listkey.h>
-
-SWORD_NAMESPACE_START
-
-/******************************************************************************
- * SWText Constructor - Initializes data for instance of SWText
- *
- * ENT:	imodname - Internal name for module
- *	imoddesc - Name to display to user for module
- *	idisp	 - Display object to use for displaying
- */
-
-SWText::SWText(const char *imodname, const char *imoddesc, SWDisplay *idisp, SWTextEncoding enc, SWTextDirection dir, SWTextMarkup mark, const char* ilang): SWModule(imodname, imoddesc, idisp, "Biblical Texts", enc, dir, mark, ilang)
-{
-	delete key;
-	key = CreateKey();
-	skipConsecutiveLinks = false;
-}
-
-
-/******************************************************************************
- * SWText Destructor - Cleans up instance of SWText
- */
-
-SWText::~SWText() {
-}
-
-
-/******************************************************************************
- * SWText CreateKey - Create the correct key (VerseKey) for use with SWText
- */
-
-SWKey *SWText::CreateKey()
-{
-	return new VerseKey();
-}
-
-
-long SWText::Index() const {
-	VerseKey *key = 0;
-	try {
-		key = SWDYNAMIC_CAST(VerseKey, this->key);
-	}
-	catch ( ... ) {}
-	if (!key)
-		key = new VerseKey(this->key);
-
-	entryIndex = key->NewIndex();
-
-	if (key != this->key)
-		delete key;
-
-	return entryIndex;
-}
-
-long SWText::Index(long iindex) {
-	VerseKey *key = 0;
-	try {
-		key = SWDYNAMIC_CAST(VerseKey, this->key);
-	}
-	catch ( ... ) {}
-	if (!key)
-		key = new VerseKey(this->key);
-
-	key->Testament(1);
-	key->Index(iindex);
-
-	if (key != this->key) {
-		this->key->copyFrom(*key);
-		delete key;
-	}
-
-	return Index();
-}
-
-SWORD_NAMESPACE_END
diff --git a/src/modules/texts/ztext/Makefile b/src/modules/texts/ztext/Makefile
deleted file mode 100644
index 35d6648..0000000
--- a/src/modules/texts/ztext/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-
-root := ../../../..
-
-all:
-	make -C ${root}
diff --git a/src/modules/texts/ztext/Makefile.am b/src/modules/texts/ztext/Makefile.am
deleted file mode 100644
index 2b78db6..0000000
--- a/src/modules/texts/ztext/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-ztextdir = $(top_srcdir)/src/modules/texts/ztext
-
-libsword_la_SOURCES += $(ztextdir)/ztext.cpp
-
diff --git a/src/modules/texts/ztext/gbfidx.cpp b/src/modules/texts/ztext/gbfidx.cpp
deleted file mode 100644
index e7a9530..0000000
--- a/src/modules/texts/ztext/gbfidx.cpp
+++ /dev/null
@@ -1,661 +0,0 @@
-/*****************************************************************************

- *

- *	This code reeks but works (sometimes).  Good luck!

- * Modified for zText purposes

- */

-

-//#include <stdio.h>

-#include <iostream>

-#include <fstream>

-#include <stdlib.h>

-#include <string.h>

-#include <ctype.h>

-#include <assert.h>

-

-//#ifndef __GNUC__

-#include <io.h>

-//#else

-//#include <unistd.h>

-//#endif

-

-#include <fcntl.h>

-#include <versekey.h>

-

-

-void writeidx(VerseKey &key1, VerseKey &key2, VerseKey &key3, long offset, short size);

-char findbreak(int fp, long *offset, int *num1, int *num2, int *rangemax, unsigned short *size);

-void openfiles(char *fname);

-void checkparams(int argc, char **argv);

-

-

-VerseKey key1, key2, key3;

-int fp=0, vfp=0, cfp=0, bfp=0;

-long chapoffset=0;

-unsigned short chapsize=0;

-long bookoffset=0;

-unsigned short booksize=0;

-long testoffset=0;

-unsigned short testsize=0;

-long verseoffset=0;

-unsigned short versesize=0;

-long nextoffset=0;

-char testmnt=0;

-int deadcount = 0;

-int chapmark=-4, bookmark=-1;

-ofstream cfile;

-

-

-int main(int argc, char **argv)

-{

-	long pos, offset;

-	int num1, num2, rangemax;//, curbook = 0, curchap = 0, curverse = 0;

-	//char buf[127],

-	char startflag = 0;

-	unsigned short size;//, tmp;

-

-	checkparams(argc, argv);

-

-	openfiles(argv[1]);

-	//key1 = "Matthew 1:1";

-	//key2 = "Matthew 1:1";

-	//key3 = "Matthew 1:1";

-

-	testmnt = key1.Testament();

-	cfile << "testament" << (int) testmnt << "\n";

-	num1 = key1.Chapter();

-	num2 = key1.Verse();

-	pos  = 0;

-	write(bfp, &pos, 4);  /* Book    offset for testament intros */

-	pos = 4;

-	write(cfp, &pos, 4);  /* Chapter offset for testament intro */

-

-

-/*	Right now just zero out intros until parsing correctly */

-	/*pos = 0;

-	size = 0;

-	write(vfp, &pos, 4);  // Module intro

-	write(vfp, &size, 2);

-	cfile << "modintro pos{" << pos << "} size{" << size << "}\n";

-	write(vfp, &pos, 4);  // Testament intro

-	write(vfp, &size, 2);

-	cfile << "test intro pos{" << pos << "} size{" << size << "}\n";

-	*/

-	cout << "GBFIDX Running\n";

-	cout.flush();

-	while(!findbreak(fp, &offset, &num1, &num2, &rangemax, &size)) {

-		if (!startflag) {

-			startflag = 1;

-		}

-		else {

-			if (num2 < key2.Verse()) {            // new chapter

-				if (num1 <= key2.Chapter()) { // new book

-					key2.Verse(1);

-					key2.Chapter(1);

-					key2.Book(key2.Book()+1);

-				}

-				cfile << "Found Chapter Break: " << num1 << " ('" << (const char *)key2 << "')\n";

-				//chapoffset = offset;

-				//chapsize = chapsize - size;

-//				continue;

-			}

-		}

-		key2.Verse(1);

-		key2.Chapter(num1);

-		key2.Verse(num2);

-

-		key3 = key2;

-//		key3 += (rangemax - key3.Verse());

-

-		writeidx(key1, key2, key3, offset, size);

-	}

-	close(vfp);

-	close(cfp);

-	close(bfp);

-	close(fp);

-

-	return 1;

-}

-

-

-/**************************************************************************

- * writeidx:	key1	- current location of index

- * 	key2	- minimum keyval for which this offset is valid

- * 	key3	- maximum keyval for which this offset is valid

- */

-

-void writeidx(VerseKey &key1, VerseKey &key2, VerseKey &key3, long offset, short size)

-{

-	long pos;

-	unsigned short tmp;

-

-	for (; ((key1 <= key3) && (key1.Error() != KEYERR_OUTOFBOUNDS) && (key1.Testament() == testmnt)); key1+=1) {

-		if (chapmark>=2)

-		{

-			if (bookmark==2)

-			{

-				//booksize = booksize - chapsize + 7;

-				cfile << "versesize " << versesize << " booksize " << booksize << " chapsize " << chapsize << " size " << size << "\n";

-				//cfile.flush();

-				//assert(chapsize < size);

-				//if (chapsize > size)           // At start of Psalms gets chapsize rather than chapsize+size ???

-				//{

-				//	versesize = versesize - (booksize - (chapsize - size) + 7);

-				//}

-				//else

-				//{

-				versesize = versesize - (booksize - (chapsize) + 7);

-				//}

-					cfile << "Last verse in book\n";

-			}

-			//chapsize = chapsize - size;

-			cfile << "versesize " << versesize << " chapsize " << chapsize << " size " << size<< "\n";

-			cfile.flush();

-			//assert(chapsize > size);

-			//if (chapsize > size)           // At start of Psalms gets chapsize rather than chapsize+size ???

-			//{

-			//	versesize = versesize - (chapsize - size);

-			//}

-			//else

-			//{

-			versesize = versesize - (chapsize);

-			//}

-			cfile << "Last verse in chapter\n";

-		}

-		if (chapmark>=2 && bookmark!=1)

-		{

-			cfile << "prev verse pos{" << verseoffset << "} size{" << versesize << "} nextoffset{" << nextoffset << "}\n";

-			cfile.flush();

-			assert(verseoffset==nextoffset);

-			write(vfp, &verseoffset, 4);

-			write(vfp, &versesize, 2);

-			nextoffset = verseoffset+versesize;

-			bookmark = 0;

-			chapmark = 0;

-		}

-		if (key1.Verse() == 1) {	// new chapter

-			cfile << "size??? " << size << "\n";

-			cfile.flush();

-			//assert(chapsize > size || key1.Chapter()==1);

-			//assert(chapsize > size);

-			//if (chapsize > size)           // At start of books gets chapsize rather than chapsize+size

-			//{

-			//	chapsize = chapsize - size;

-			//}

-			if (key1.Chapter() == 1) {	// new book

-				booksize = booksize - chapsize + 7;

-				if (key1.Book() == 1)

-				{

-					pos = 0;

-					//tmp = testoffset;

-					tmp = 0;            	// better just remember that it goes up to the testament intro to avoid 64k limit

-												// AV exceeds that anyway!

-					write(vfp, &pos, 4);  /* Module intro */

-					write(vfp, &tmp, 2);

-					assert(nextoffset==0);

-					cfile << "modintro pos{" << pos << "} size{" << tmp << "}\n";

-					testsize = testsize - booksize - chapsize + 7;

-					if (testsize > 10000)

-					{

-						cerr << "Error: testament too big " << testsize << "\n";

-						exit(-1);

-					}

-					//assert(testoffset==nextoffset);

-					write(vfp, &testoffset, 4);  /* Testament intro (vss)  */

-					write(vfp, &testsize, 2);

-					nextoffset = testoffset+testsize;

-					cfile << "test intro pos{" << testoffset << "} size{" << testsize << "}\n";

-				}

-				pos = lseek(cfp, 0, SEEK_CUR);

-				write(bfp, &pos, 4);

-				pos = lseek(vfp, 0, SEEK_CUR); /* Book intro (cps) */

-				write(cfp, &pos, 4);

-				if (booksize > 10000)

-				{

-					cerr << "Error: book too big " << booksize << "\n";

-					exit(-1);

-				}

-				assert(bookoffset==nextoffset);

-				write(vfp, &bookoffset, 4);  /* Book intro (vss)  */

-				write(vfp, &booksize, 2);

-				nextoffset = bookoffset+booksize;

-				cfile << "book intro pos{" << bookoffset << "} size{" << booksize << "}\n";

-				//offset += booksize;

-				//bookmark = false;

-			}

-			pos = lseek(vfp, 0, SEEK_CUR);

-			write(cfp, &pos, 4);

-			assert(chapsize < 10000);

-			write(vfp, &chapoffset, 4);  /* Chapter intro */

-			write(vfp, &chapsize, 2);

-			nextoffset = chapoffset+chapsize;

-			cfile << "chapter intro pos{" << chapoffset << "} size{" << chapsize << "}\n";

-			//offset += chapsize;

-			//size -= chapsize;

-			//chapmark = false;

-		}

-		if (key1 >= key2) {

-			if (size > 10000)

-			{

-				cerr << "Error: verse too big " << size << "\n";

-				exit(-1);

-			}

-			if (!chapmark && !bookmark)

-			{

-				write(vfp, &offset, 4);

-				write(vfp, &size, 2);

-				cfile << "verse pos{" << offset << "} size{" << size << "}\n";

-				cfile.flush();

-				assert(offset==nextoffset);

-				nextoffset = offset+size;

-				//cfile << "bookmark " << bookmark << " chapmark " << chapmark << "\n";

-			}

-			else

-			{

-				verseoffset = offset;

-				versesize = size;

-				cfile << "saving verse pos{" << offset << "} size{" << size << "}\n";

-				cfile << "bookmark " << bookmark << " chapmark " << chapmark << "\n";

-			}

-		}

-		else	{

-			pos = 0;

-			tmp = 0;

-			write(vfp, &pos, 4);

-			write(vfp, &tmp, 2);

-			cfile << "blank pos{" << pos << "} size{" << tmp << "}\n";

-		}

-	}

-}

-

-char startmod(char *buf)

-{

-	//char loop;

-

-	if (buf[0] != '<')

-		return 0;

-	if (buf[1] != 'H')

-		return 0;

-	if (buf[2] != '0')

-		return 0;

-/*

-	if (!isdigit(buf[2]))

-		return 0;

-	for (loop = 3; loop < 7; loop++) {

-		if (buf[loop] == ' ')

-			break;

-		if ((!isdigit(buf[loop])) && (buf[loop] != ',') && (buf[loop] != '-'))

-			return 0;

-	}

-*/

-	return 1;

-}

-

-

-char starttest(char *buf)

-{

-	//char loop;

-

-	if (buf[0] != '<')

-		return 0;

-	if (buf[1] != 'B')

-		return 0;

-	if (testmnt==2)

-	{

-		if (buf[2] != 'N')

-			return 0;

-	}

-	else

-	{

-		if (buf[2] != 'O')

-			return 0;

-	}

-	//if (buf[3] != '>')

-	//	return 0;

-/*

-	if (!isdigit(buf[2]))

-		return 0;

-	for (loop = 3; loop < 7; loop++) {

-		if (buf[loop] == ' ')

-			break;

-		if ((!isdigit(buf[loop])) && (buf[loop] != ',') && (buf[loop] != '-'))

-			return 0;

-	}

-*/

-	return 1;

-}

-

-

-char startbook(char *buf)

-{

-	//char loop;

-

-	if (buf[0] != '<')

-		return 0;

-	if (buf[1] != 'S')

-		return 0;

-	if (buf[2] != 'B')

-		return 0;

-/*

-	if (!isdigit(buf[2]))

-		return 0;

-	for (loop = 3; loop < 7; loop++) {

-		if (buf[loop] == ' ')

-			break;

-		if ((!isdigit(buf[loop])) && (buf[loop] != ',') && (buf[loop] != '-'))

-			return 0;

-	}

-*/

-	return 1;

-}

-

-

-char startchap(char *buf)

-{

-	//char loop;

-

-	if (buf[0] != '<')

-		return 0;

-	if (buf[1] != 'S')

-		return 0;

-	if (buf[2] != 'C')

-		return 0;

-/*

-	if (!isdigit(buf[2]))

-		return 0;

-	for (loop = 3; loop < 7; loop++) {

-		if (buf[loop] == ' ')

-			break;

-		if ((!isdigit(buf[loop])) && (buf[loop] != ',') && (buf[loop] != '-'))

-			return 0;

-	}

-*/

-	return 1;

-}

-

-

-char startentry(char *buf)

-{

-	//char loop;

-	//cfile << "{SV}";

-

-	if (buf[0] != '<')

-	{

-		//cfile << "{no<}";

-		return 0;

-	}

-	if (buf[1] != 'S')

-	{

-		//cfile << "\n{noS}\n";

-		return 0;

-	}

-	if (buf[2] != 'V')

-	{

-		//cfile << "\n{noV}\n";

-		return 0;

-	}

-/*

-	if (!isdigit(buf[2]))

-		return 0;

-	for (loop = 3; loop < 7; loop++) {

-		if (buf[loop] == ' ')

-			break;

-		if ((!isdigit(buf[loop])) && (buf[loop] != ',') && (buf[loop] != '-'))

-			return 0;

-	}

-*/

-	return 1;

-}

-

-

-char findbreak(int fp, long *offset, int *num1, int *num2, int *rangemax, unsigned short *size)

-{

-	char buf[8];

-	//char buf2[20];

-	//char ch;

-	char loop=0;

-	long offset2;

-	int ch2, vs2, rm2;

-	bool flag;

-	long versestart = 0;

-	long chapstart = 0;

-	long bookstart = 0;

-	long teststart = 0;

-

-	memset(buf, ' ', 8);

-

-	while (1) {

-		//cfile << "#" << buf << "#";

-		//if (lseek(fp, 0, SEEK_CUR) > 2000000)

-		//{

-		//	cfile << lseek(fp, 0, SEEK_CUR) << "\n";

-		//}

-		if (starttest(buf)) {

-			cfile << "\n{start of testament}\n";

-			//chapstart = lseek(fp, 0, SEEK_CUR) - 7;

-			teststart = lseek(fp, 0, SEEK_CUR) - 7;

-			testoffset = teststart;

-			memset(buf, ' ', 3);

-			flag = false;

-			for (loop = 3; loop < 6; loop++) {

-				if (buf[loop]!='>')

-					flag = true;

-				else {

-					buf[loop] = 0;

-					break;

-				}

-			}

-			ch2 = *num1;

-			vs2 = 1;

-			if (size) {

-				if (findbreak(fp, &offset2, &ch2, &vs2, &rm2, 0)) {

-					testsize = (unsigned short) (lseek(fp, 0, SEEK_END) - teststart-7);

-				}

-				else {

-					if (vs2) {

-						testsize = (offset2 - teststart - 7);

-					}

-				}

-				lseek(fp, teststart+7, SEEK_SET);

-				cfile << "\nGot testsize " << testsize << "\n";

-			}

-		}

-

-

-		if (startbook(buf)) {

-			cfile << "\n{start of book}\n";

-			bookmark++;

-			//chapstart = lseek(fp, 0, SEEK_CUR) - 7;

-			bookstart = lseek(fp, 0, SEEK_CUR) - 7;

-			bookoffset = bookstart;

-			memset(buf, ' ', 3);

-			flag = false;

-			for (loop = 3; loop < 6; loop++) {

-				if (buf[loop]!='>')

-					flag = true;

-				else {

-					buf[loop] = 0;

-					break;

-				}

-			}

-			if (size) {

-				ch2 = *num1;

-				vs2 = 1;

-				if (findbreak(fp, &offset2, &ch2, &vs2, &rm2, 0)) {

-					booksize = (unsigned short) (lseek(fp, 0, SEEK_END) - bookstart - 7);

-				}

-				else {

-					if (vs2) {

-						booksize = (offset2 - bookstart - 7);

-					}

-				}

-				lseek(fp, bookstart+7, SEEK_SET);

-				cfile << "\nGot booksize " << booksize << "\n";

-			}

-		}

-

-		if (startchap(buf)) {

-			cfile << "{start of chapter}";

-			chapmark++;

-			//chapstart = lseek(fp, 0, SEEK_CUR) - 7;

-			chapstart = lseek(fp, 0, SEEK_CUR) - 7;

-			chapoffset = chapstart;

-			memset(buf, ' ', 3);

-			flag = false;

-			for (loop = 3; loop < 6; loop++) {

-				if (isdigit(buf[loop]))

-					flag = true;

-				else {

-					buf[loop] = 0;

-					break;

-				}

-			}

-			if (flag)

-				*num1 = atoi(buf);

-			else	(*num1)++;

-

-			if (size) {

-				ch2 = *num1;

-				vs2 = 1;

-				lseek(fp, chapstart, SEEK_SET);

-				if (findbreak(fp, &offset2, &ch2, &vs2, &rm2, 0)) {

-					chapsize = (unsigned short) (lseek(fp, 0, SEEK_END) - chapstart);

-					cfile << "getting chapsizeend{" << chapsize << "} = " << lseek(fp, 0, SEEK_END) << " - " << chapstart << "\n";

-				}

-				else {

-					if (vs2) {

-						chapsize = (offset2 - chapstart);

-						cfile << "getting chapsize{" << chapsize << "} = " << offset2 << " - " << chapstart << "\n";

-					}

-				}

-				lseek(fp, chapstart + 7, SEEK_SET);

-				cfile << "\nGot chapsize " << chapsize << " loop{" << (int) loop << "}\n";

-			}

-			//return 0;

-

-		}

-		if (startentry(buf)) {

-			//cfile << "{start of verse}";

-			memset(buf, ' ', 3);

-			flag = false;

-			for (loop = 3; loop < 6; loop++) {

-				if (isdigit(buf[loop]))

-					flag = true;

-				else {

-					buf[loop] = 0;

-					break;

-				}

-			if (flag)

-				*num2 = atoi(buf);

-			else	(*num2)++;

-			}

-			loop++;

-			/*

-			if (size)

-			{

-				// *offset = lseek(fp, 0, SEEK_CUR) - (7 - loop);

-				 *offset = lseek(fp, 0, SEEK_CUR) - 7;

-			}

-			//else	*offset = (chapstart) ? chapstart : lseek(fp, 0, SEEK_CUR) - 7;

-			else	*offset = (chapstart) ? chapstart : lseek(fp, 0, SEEK_CUR) - 7;

-			*/

-			/*if (chapstart)

-			{

-				chapsize = *offset-chapstart;

-			}

-			else

-			{

-				chapsize = 0;

-			}*/

-			*offset = lseek(fp, 0, SEEK_CUR) - 7;

-			versestart = *offset;

-			if (size) {

-				ch2 = *num1;

-				vs2 = *num2;

-				if (findbreak(fp, &offset2, &ch2, &vs2, &rm2, 0)) {

-					*size = (unsigned short) (lseek(fp, 0, SEEK_END) - versestart);

-					cfile << "getting sizeend{" << *size << "} = " << lseek(fp, 0, SEEK_END) << " - " << versestart << "\n";

-				}

-				else {

-					if (vs2) {

-						*size = (offset2 - versestart);

-						cfile << "getting size{" << *size << "} = " << offset2 << " - " << versestart << "\n";

-					}

-				}

-				lseek(fp, *offset+1, SEEK_SET);

-			}

-			else

-			{

-				cfile << "got offset{" << *offset << "}\n";

-			}

-			return 0;

-		}

-		//cfile << "{ng}";

-		//deadcount++;

-		//if (deadcount==1000) exit(-1);

-		//if (!size)

-		//{

-		//	cfile << "not bound offset{" << *offset << "}\n";

-		//}

-		memmove(buf, &buf[1], 6);

-		if (read(fp, &buf[6], 1) != 1)

-			return 1;

-	}

-}

-

-

-void openfiles(char *fname)

-{

-#ifndef O_BINARY		// O_BINARY is needed in Borland C++ 4.53

-#define O_BINARY 0		// If it hasn't been defined than we probably

-#endif				// don't need it.

-	char buf[255];

-

-	if ((fp = open(fname, O_RDONLY|O_BINARY)) == -1) {

-		fprintf(stderr, "Couldn't open file: %s\n", fname);

-		exit(1);

-	}

-

-	sprintf(buf, "%s.vss", fname);

-	if ((vfp = open(buf, O_CREAT|O_WRONLY|O_BINARY|O_TRUNC)) == -1) {

-		fprintf(stderr, "Couldn't open file: %s\n", buf);

-		exit(1);

-	}

-

-	sprintf(buf, "%s.cps", fname);

-	if ((cfp = open(buf, O_CREAT|O_WRONLY|O_BINARY|O_TRUNC)) == -1) {

-		fprintf(stderr, "Couldn't open file: %s\n", buf);

-		exit(1);

-	}

-

-	sprintf(buf, "%s.bks", fname);

-	if ((bfp = open(buf, O_CREAT|O_WRONLY|O_BINARY|O_TRUNC)) == -1) {

-		fprintf(stderr, "Couldn't open file: %s\n", buf);

-		exit(1);

-	}

-	cfile.open("gbfidx.log", ios::out);

-	if (!cfile.is_open())

-	{

-		cerr << "Failed to open log file\n";

-		exit(-1);

-	}

-}

-

-

-void checkparams(int argc, char **argv)

-{

-	if (argc < 2) {

-		fprintf(stderr, "usage: %s <file to process> [nt - for new testmt file]\n", argv[0]);

-		exit(1);

-	}

-	if (!strcmp(argv[1], "nt"))

-		key1 = key2 = key3 = "Matthew 1:1";

-	else if (!strcmp(argv[1], "ot"))

-	{

-			key1 = key2 = key3 = "Genesis 1:1";

-	}

-	else

-	{

-		cerr << "File must be ot or nt\n";

-		exit(-1);

-	}

-}

diff --git a/src/modules/texts/ztext/makeidx.c b/src/modules/texts/ztext/makeidx.c
deleted file mode 100644
index 311103e..0000000
--- a/src/modules/texts/ztext/makeidx.c
+++ /dev/null
@@ -1,146 +0,0 @@
-#include <stdio.h>
-#include <fcntl.h>
-
-
-char findbreak(int fp, int *offset, int *num1, int *num2, short *size);
-
-
-main(int argc, char **argv)
-{
-	int fp, vfp, cfp, bfp;
-	long pos;
-	short size, tmp;
-	int num1, num2, offset, curbook = 0, curchap = 0, curverse = 0;
-	char buf[127];
-
-	if (argc != 2) {
-		fprintf(stderr, "usage: %s <file to process>\n", argv[0]);
-		exit(1);
-	}
-
-	if ((fp = open(argv[1], O_RDONLY)) == -1) {
-		fprintf(stderr, "Couldn't open file: %s\n", argv[1]);
-		exit(1);
-	}
-
-	sprintf(buf, "%s.vss", argv[1]);
-	if ((vfp = open(buf, O_CREAT|O_WRONLY)) == -1) {
-		fprintf(stderr, "Couldn't open file: %s\n", buf);
-		exit(1);
-	}
-
-	sprintf(buf, "%s.cps", argv[1]);
-	if ((cfp = open(buf, O_CREAT|O_WRONLY)) == -1) {
-		fprintf(stderr, "Couldn't open file: %s\n", buf);
-		exit(1);
-	}
-
-	sprintf(buf, "%s.bks", argv[1]);
-	if ((bfp = open(buf, O_CREAT|O_WRONLY)) == -1) {
-		fprintf(stderr, "Couldn't open file: %s\n", buf);
-		exit(1);
-	}
-
-	pos  = 0;
-	write(bfp, &pos, 4);  /* Book    offset for testament intros */
-	pos = 4;
-	write(cfp, &pos, 4);  /* Chapter offset for testament intro */
-
-
-/*	Right now just zero out intros until parsing correctly */
-	pos = 0;
-	size = 0;
-	write(vfp, &pos, 4);  /* Module intro */
-	write(vfp, &size, 2);
-	write(vfp, &pos, 4);  /* Testament intro */
-	write(vfp, &size, 2);
-
-	while (!findbreak(fp, &offset, &num1, &num2, &size)) {
-
-		if (num2 == 1) {  		/* if we're at a new chapter */
-			if (num1 == 1) {	/* if we're at a new book */
-				pos = lseek(cfp, 0, SEEK_CUR);
-				write(bfp, &pos, 4);
-				pos = lseek(vfp, 0, SEEK_CUR); /* Book intro (cps) */
-				write(cfp, &pos, 4);
-				pos  = 0;
-				tmp = 0;
-				write(vfp, &pos, 4);  /* Book intro (vss) */
-				write(vfp, &tmp, 2);
-				curbook++;
-				curchap = 0;
-			}
-			pos = lseek(vfp, 0, SEEK_CUR);
-			write(cfp, &pos, 4);
-			curverse = 1;
-			pos  = 0;
-			tmp = 0;
-			write(vfp, &pos, 4);  /* Chapter intro */
-			write(vfp, &tmp, 2);
-			curchap++;
-		}
-		else curverse++;
-	
-		printf("%2d:%3d:%3d found at offset: %7d\n", curbook, num1, num2, offset);
-
-		if (num1 != curchap) {
-			fprintf(stderr, "Error: Found chaptures out of sequence\n", buf);
-			break;
-		}
-		if (num2 != curverse) {
-			fprintf(stderr, "Error: Found verses out of sequence\n", buf);
-			break;
-		}
-		write(vfp, &offset, 4);
-		write(vfp, &size, 2);
-	}
-	
-	close(vfp);
-	close(cfp);
-	close(bfp);
-	close(fp);
-}
-
-
-char findbreak(int fp, int *offset, int *num1, int *num2, short *size)
-{
-	char buf[7];
-	char buf2[7];
-	char loop;
-	int offset2, ch2, vs2;
-	
-	memset(buf, ' ', 7);
-
-	while (1) {
-		if (buf[3] == ':') {
-			memcpy(buf2, buf, 7);
-			for (loop = 0; loop < 7; loop++) {
-				if (!isdigit(buf2[loop]))
-					buf2[loop] = ' ';
-			}
-			buf2[3] = 0;
-			*num1 = atoi(buf2);
-			*num2 = atoi(&buf2[4]);
-			if (*num1 && *num2) {
-				*offset = lseek(fp, 0, SEEK_CUR);
-				sprintf(buf2, "%d", *num2);
-				*offset -= 2 - strlen(buf2);
-				if (size) {
-					if (findbreak(fp, &offset2, &ch2, &vs2, 0)) {
-						*size = (short) (lseek(fp, 0, SEEK_END) - (*offset));
-					}
-					else {
-						sprintf(buf2, "%d:%d", ch2, vs2);
-						*size = (offset2 - (*offset)) - (strlen(buf2) + 2);
-					}
-					lseek(fp, *offset, SEEK_SET);
-				}
-				return 0;
-			}
-		}
-		memmove(buf, &buf[1], 6);
-		if (read(fp, &buf[6], 1) != 1)
-			return 1;
-	}
-}
-
diff --git a/src/modules/texts/ztext/nasb.cpp b/src/modules/texts/ztext/nasb.cpp
deleted file mode 100644
index 51e08b4..0000000
--- a/src/modules/texts/ztext/nasb.cpp
+++ /dev/null
@@ -1,107 +0,0 @@
-
-
-#include <ctype.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <errno.h>
-
-#ifndef __GNUC__
-#include <io.h>
-#else
-#include <unistd.h>
-#endif
-
-#include <swcomprs.h>
-
-class FileCompress: public SWCompress {
-	int ifd;
-	int ofd;
-	int ufd;
-	int zfd;
-public:
-	FileCompress(char *);
-	~FileCompress();
-	int GetChars(char *, int len);
-	int SendChars(char *, int len);
-	void Encode();
-	void Decode();
-};
-
-
-FileCompress::FileCompress(char *fname) 
-{
-	char buf[256];
-
-#ifndef O_BINARY
-#define O_BINARY 0
-#endif
-
-	ufd  = open(fname, O_RDWR|O_CREAT|O_BINARY);
-
-	sprintf(buf, "%s.zzz", fname);
-	zfd = open(buf, O_RDWR|O_CREAT|O_BINARY);
-}
-
-	
-FileCompress::~FileCompress(char *fname) 
-{
-	close(ufd);
-	close(zfd);
-}
-
-
-int FileCompress::GetChars(char *buf, int len) 
-{
-	return read(ifd, buf, len);
-}
-
-
-int FileCompress::SendChars(char *buf, int len) 
-{
-	return write(ofd, buf, len);
-}
-
-
-void FileCompress::Encode() 
-{
-	ifd = ufd;
-	ofd = zfd;
-
-	SWCompress::Encode();
-}
-
-
-void FileCompress::Decode() 
-{
-	ifd = zfd;
-	ofd = ufd;
-
-	SWCompress::Decode();
-}
-
-
-main(int argc, char **argv)
-{
-	int decomp = 0;
-	SWCompress *fobj;
-	
-	if (argc != 2) {
-		fprintf(stderr, "usage: %s <filename|filename.zzz>\n", argv[0]);
-		exit(1);
-	}
-
-	if (strlen(argv[1]) > 4) {
-		if (!strcmp(&argv[1][strlen(argv[1])-4], ".zzz")) {
-			argv[1][strlen(argv[1])-4] = 0;
-			decomp = 1;
-		}
-	}
-			
-	fobj = new FileCompress(argv[1]);
-	
-	if (decomp)
-		fobj->Decode();
-	else fobj->Encode();
-
-	delete fobj;
-}
diff --git a/src/modules/texts/ztext/rawtxt2z.cpp b/src/modules/texts/ztext/rawtxt2z.cpp
deleted file mode 100644
index 7eafe2a..0000000
--- a/src/modules/texts/ztext/rawtxt2z.cpp
+++ /dev/null
@@ -1,457 +0,0 @@
-// Compression on variable granularity

-

-#include <fcntl.h>

-#include <iostream>

-#include <fstream>

-#include <string>

-

-#ifndef __GNUC__

-#include <io.h>

-#else

-#include <unistd.h>

-#endif

-

-#include <zlib.h>

-#include <versekey.h>

-

-int iBufSize, ulBuffNum;

-ofstream cfile;

-ofstream cfile2;

-

-int ofd[2], oxfd[2], ovxfd[2];

-int ifd[2], ixfd[2];

-int itestfd[2], itestxfd[2];

-unsigned long ulIOff=0, ulCOff=0, ulFOff=0, ulNone=0;

-string currbuff="";

-

-

-int openreadfile(char *buffer, char *path, const char *filename)

-{

-	int filenum;

-	sprintf(buffer, "%s/%s", path, filename);

-	cfile << buffer << "\n";

-	filenum =  open(buffer, O_RDONLY|O_BINARY);

-	if (filenum > 0)

-	{

-		return filenum;

-	}

-	else

-	{

-		cerr << "failed to open file to read\n";

-		exit(-1);

-	}

-}

-

-int openwritefile(char *buffer, char *path, const char *filename)

-{

-	int filenum;

-	sprintf(buffer, "%s/%s", path, filename);

-	cfile << buffer << "\n";

-	filenum =  open(buffer, O_WRONLY|O_BINARY|O_CREAT|O_TRUNC);

-	if (filenum > 0)

-	{

-		return filenum;

-	}

-	else

-	{

-		cerr << "failed to open file to read\n";

-		exit(-1);

-	}

-}

-

-int bytebound(unsigned long offset, VerseKey &thekey)

-{

-	unsigned long bufferoff;

-	cfile << "byteboundtest " << thekey << "\n";

-	bufferoff = iBufSize * (ulBuffNum+1);

-	if (offset > bufferoff)

-	{

-		return 1;

-	}

-	else

-	{

-		return 0;

-	}

-}

-

-int versebound(unsigned long offset, VerseKey &thekey)

-{

-	cfile << "verseboundtest " << thekey << "\n";

-	return 1;

-}

-

-int chapterbound(unsigned long offset, VerseKey &thekey)

-{

-	VerseKey testkey;

-	testkey = thekey;

-	testkey++;

-	//cfile << "chapterboundtest " << testkey;

-	if (testkey.Verse()==1 || (!thekey.compare("Revelation of John 22:21")))

-	{

-		//cfile << " 1\n";

-		return 1;

-	}

-	else

-	{

-		//cfile << " 0\n";

-		return 0;

-	}

-}

-

-int bookbound(unsigned long offset, VerseKey &thekey)

-{

-	VerseKey testkey;

-	testkey = thekey;

-	cfile << "bookboundtest " << testkey << "\n";

-	testkey++;

-	if (testkey.Chapter()==1 || (!thekey.compare("Revelation of John 22:21")))

-	{

-		return 1;

-	}

-	else

-	{

-		return 0;

-	}

-}

-

-

-typedef int (*boundfunc)(unsigned long offset, VerseKey &thekey);

-

-int writeblock(int i)

-{

-	char *destbuff=NULL;

-	unsigned long compsize = 0, buffsize=0;

-

-	cfile << "compressing block\n";

-	// compress current buffer

-	buffsize = currbuff.length();

-	write(itestfd[i], currbuff.c_str(), buffsize);

-	compsize = (unsigned long) (buffsize*1.01)+20;  // at least 1% bigger than buffer + 12 bytes

-	//cfile << "{" << compsize << "}";

-	//destbuff = (char *) calloc(compsize + 1, 1);

-	destbuff = new char[compsize];

-	if (compress((Bytef*)destbuff, &compsize, (const Bytef*)currbuff.c_str(), buffsize)!=Z_OK)

-	{

-		cerr << "Could not compress buffer: exiting\n";

-		delete[] destbuff;

-		exit(-1);

-	}

-	//cout << "Compressed buffer{" << compsize << "}\n" << destbuff << "\n";

-	//cout.flush();

-	// write to compressed file index

-	ulCOff = lseek(ofd[i], 0, SEEK_END);

-	write(oxfd[i], &ulCOff, 4);    // offset in compressed file

-	write(oxfd[i], &compsize, 4);	 // compressed size

-	write(oxfd[i], &buffsize, 4);	 // uncompressed size

-	cfile << buffsize << " -> " << compsize << "\n";

-	cfile2 << "Compressed{" << compsize << "}\n" << destbuff << "\n";

-	cfile2.flush();

-

-	//write compressed buffer to file

-	write(ofd[i], destbuff, compsize);

-

-	//free(destbuff);

-	delete[] destbuff;

-

-	currbuff = "";

-	ulBuffNum++;

-	ulIOff = 0;

-	return 1;

-}

-

-

-

-int main(int argc, char **argv)

-{

-	VerseKey key1, key2, key3;

-	int i;

-	char xbuff[64];

-	unsigned long offset;

-	unsigned short size=0;

-	unsigned long ulsize=0;

-	char *tmpbuf=NULL;

-	int iType;

-	boundfunc blockbound[4] = {bytebound, versebound, chapterbound, bookbound};

-	bool newbook=true, newchapter=true, newtestament = true, newmodule = true, lasttodo=true;

-

-	if ((argc < 2) || (argc > 4)) {

-		cerr << "usage: " << argv[0] << " datapath [compression type [buffer size]]\n";

-		exit(1);

-	}

-

-	if (argc>2)

-	{

-		iType = atoi(argv[2]);

-		if (argc==4)

-		{

-			iBufSize = atoi(argv[3]);

-		}

-		else

-		{

-			iBufSize = 1;

-		}

-	}

-	else

-	{

-		iType = 2;

-		iBufSize = 1;

-	}

-

-	cfile.open("raw2z.log", ios::out);

-	if (!cfile.is_open())

-	{

-		cerr << "Failed to open log file\n";

-		exit(-1);

-	}

-	cfile2.open("raw2z.lg2", ios::out);

-	if (!cfile2.is_open())

-	{

-		cerr << "Failed to open log file\n";

-		exit(-1);

-	}

-	cfile << iType << " " << iBufSize << "\n";

-

-	if ((iType<=0) || (iType > 4) || !iBufSize || !strcmp(argv[1], "-h") || !strcmp(argv[1], "--help") || !strcmp(argv[1], "/?") || !strcmp(argv[1], "-help"))

-	{

-		cfile << argv[0] << " - a tool to create compressed Sword modules\n";

-		cfile << "version 0.1\n\n";

-		cfile << "usage: "<< argv[0] << " datapath [compression type [buffer size]]\n\n";

-		cfile << "datapath: the directory in which to find the raw module\n";

-		cfile << "compression type: (default 2)\n" << "   1 - bytes\n" << "   2 - verses\n" << "   3 - chapters\n" << "   4 - books\n";

-		cfile << "buffer size (default 1): the number of the compression type in each block\n";

-		exit(1);

-	}

-

-	//zobj = new SWCompress();

-	//rawdrv = new RawVerse(argv[1]);

-

-#ifndef O_BINARY

-#define O_BINARY 0

-#endif

-	cfile << "opening files\n";

-

-	tmpbuf = new char [ strlen(argv[1]) + 11 ];

-

-	//original files

-	ifd[0] = openreadfile(tmpbuf, argv[1], "ot");

-	ixfd[0] = openreadfile(tmpbuf, argv[1], "ot.vss");

-	ifd[1] = openreadfile(tmpbuf, argv[1], "nt");

-	ixfd[1] = openreadfile(tmpbuf, argv[1], "nt.vss");

-

-switch ( iType) {

-	case 1 :

-		ofd[0] = openwritefile(tmpbuf, argv[1], "ot.rzz");

-		oxfd[0] = openwritefile(tmpbuf, argv[1], "ot.rzs");

-		ovxfd[0] = openwritefile(tmpbuf, argv[1], "ot.rzv");

-		ofd[1] = openwritefile(tmpbuf, argv[1], "nt.rzz");

-		oxfd[1] = openwritefile(tmpbuf, argv[1], "nt.rzs");

-		ovxfd[1] = openwritefile(tmpbuf, argv[1], "nt.rzv");

-		//boundfunc = bytebound;

-		break;

-	case 2 :

-		ofd[0] = openwritefile(tmpbuf, argv[1], "ot.vzz");

-		oxfd[0] = openwritefile(tmpbuf, argv[1], "ot.vzs");

-		ovxfd[0] = openwritefile(tmpbuf, argv[1], "ot.vzv");

-		ofd[1] = openwritefile(tmpbuf, argv[1], "nt.vzz");

-		oxfd[1] = openwritefile(tmpbuf, argv[1], "nt.vzs");

-		ovxfd[1] = openwritefile(tmpbuf, argv[1], "nt.vzv");

-		break;

-	case 3 :

-		ofd[0] = openwritefile(tmpbuf, argv[1], "ot.czz");

-		oxfd[0] = openwritefile(tmpbuf, argv[1], "ot.czs");

-		ovxfd[0] = openwritefile(tmpbuf, argv[1], "ot.czv");

-		ofd[1] = openwritefile(tmpbuf, argv[1], "nt.czz");

-		oxfd[1] = openwritefile(tmpbuf, argv[1], "nt.czs");

-		ovxfd[1] = openwritefile(tmpbuf, argv[1], "nt.czv");

-		break;

-	case 4 :

-		ofd[0] = openwritefile(tmpbuf, argv[1], "ot.bzz");

-		oxfd[0] = openwritefile(tmpbuf, argv[1], "ot.bzs");

-		ovxfd[0] = openwritefile(tmpbuf, argv[1], "ot.bzv");

-		ofd[1] = openwritefile(tmpbuf, argv[1], "nt.bzz");

-		oxfd[1] = openwritefile(tmpbuf, argv[1], "nt.bzs");

-		ovxfd[1] = openwritefile(tmpbuf, argv[1], "nt.bzv");

-		break;

-	default:

-		cerr << "Unknown compression type\n";

-		exit(-1);

-}

-	itestfd[0] = openwritefile(tmpbuf, argv[1], "ot.tst");

-	itestfd[1] = openwritefile(tmpbuf, argv[1], "nt.tst");

-	itestxfd[0] = openwritefile(tmpbuf, argv[1], "ot.tdx");

-	itestxfd[1] = openwritefile(tmpbuf, argv[1], "nt.tdx");

-

-

-	delete [] tmpbuf;

-

-	//cfile << "about to start\n";

-

-for ( i=0; i<2; i++)

-{

-	ulIOff=0, ulBuffNum=0;

-	currbuff = "";

-	key1 = (i == 1) ? "Matthew 1:1" : "Genesis 1:1";

-	key2 = key3 = key1;

-	newtestament = true;

-

-	cfile << "key: " << key1 << " Testament {" << key1.Testament()-1 << "}\n";

-	//cfile << "Chapter {" << key.Chapter() << "}\n";

-	//cfile << "Verse {" << key.Verse() << "}\n";

-	//cfile << key.compare("Revelation of John 22:21") << "\n";

-	//cfile << key.compare("Genesis 1:1") << "\n";

-	do

-	{

-		//cfile << "ok";

-		// read current verse offset

-		if (read(ixfd[i], &offset, 4) != 4)

-		{

-			cfile << "Failed to read input verse offsets?\n";

-			break;

-		}

-		if (read(ixfd[i], &size, 2) != 2)

-		{

-			cfile << "Failed to read input verse sizes?\n";

-			break;

-		}

-		cfile << "key:" << key1 << " offset:" << offset << " size:" << size << "\n";

-		sprintf(xbuff, "key{%s} offset{%ld} size{%d}\n", (const char *)key1, offset, size);

-		write(itestxfd[i], &xbuff, strlen(xbuff));

-		ulsize = size;

-		if (!offset && !size)

-		{

-			//Check for module header

-			if (read(ixfd[i], &ulIOff, 4) != 4)

-			{

-				cfile << "Failed to read input verse offsets?\n";

-				break;

-			}

-			ulsize = ulIOff;

-			ulIOff = 0;

-			lseek(ixfd[i], 6, SEEK_SET);

-		}

-

-		if (ulsize)

-		{

-			// read current verse and add to current buffer

-			tmpbuf = (char *) calloc(ulsize + 1, 1);

-			lseek(ifd[i], offset, SEEK_SET);

-			read(ifd[i], tmpbuf, ulsize);

-			currbuff += tmpbuf;

-			//cfile << currbuff << "\n";

-

-			// write to verse index into compressed

-			write(ovxfd[i], &ulBuffNum, 4);    // current buffer number

-			write(ovxfd[i], &ulIOff, 4);    // offset within the buffer

-			write(ovxfd[i], &size, 2);    // verse size

-

-			ulFOff = lseek(ofd[i], 0, SEEK_CUR) + size;

-			if (key1.compare("Revelation of John 22:21")!=-1)

-			{

-				lasttodo = false;

-			}

-			if (blockbound[iType-1](ulFOff, key1)/*at block boudary*/)

-			{

-				writeblock(i);

-				/*

-				cfile << "compressing block\n";

-				// compress current buffer

-				buffsize = currbuff.length();

-				write(itestfd[i], currbuff.c_str(), buffsize);

-				compsize = (unsigned long) (buffsize*1.01)+20;  // at least 1% bigger than buffer + 12 bytes

-				//cfile << "{" << compsize << "}";

-				//destbuff = (char *) calloc(compsize + 1, 1);

-				destbuff = new char[compsize];

-				if (compress((Bytef*)destbuff, &compsize, (const Bytef*)currbuff.c_str(), buffsize)!=Z_OK)

-				{

-					cerr << "Could not compress buffer: exiting\n";

-					delete[] destbuff;

-					exit(-1);

-				}

-				//cout << "Compressed buffer{" << compsize << "}\n" << destbuff << "\n";

-				//cout.flush();

-				// write to compressed file index

-				ulCOff = lseek(ofd[i], 0, SEEK_END);

-				write(oxfd[i], &ulCOff, 4);    // offset in compressed file

-				write(oxfd[i], &compsize, 4);	 // compressed size

-				write(oxfd[i], &buffsize, 4);	 // uncompressed size

-				cfile << buffsize << " -> " << compsize << "\n";

-				cfile2 << "Compressed{" << compsize << "}\n" << destbuff << "\n";

-				cfile2.flush();

-

-				//write compressed buffer to file

-				write(ofd[i], destbuff, compsize);

-

-				//free(destbuff);

-				delete[] destbuff;

-

-				currbuff = "";

-				ulBuffNum++;

-				ulIOff = 0;

-				*/

-			}

-			else

-			{

-				ulIOff += ulsize;

-			}

-			free(tmpbuf);

-

-			if (newmodule)

-			{

-				newmodule = false;

-				cfile << "had a new module " << (const char *) key1 << "{" << offset << "}\n";

-				writeblock(i);

-			}

-			else if (newtestament)

-			{

-				newtestament = false;

-				cfile << "had a new testament " << (const char *) key1 << "{" << offset << "}\n";

-			}

-			else if (newbook)

-			{

-				newbook = false;

-				cfile << "had a new book " << (const char *) key1 << "{" << offset << "}\n";

-			}

-			else if (newchapter)

-			{

-				newchapter = false;

-				cfile << "had a new chapter " << (const char *) key1 << "{" << offset << "}\n";

-			}

-			else

-			{

-				key1++;

-			}

-

-			if (key1.Chapter()!=key2.Chapter() || (key1.Book()!=key2.Book()))

-			{

-				newchapter = true;

-				cfile << "got a new chapter " << (const char *) key1 << "\n";

-			}

-			if (key1.Book()!=key2.Book())

-			{

-				newbook = true;

-				cfile << "got a new book " << (const char *) key1 << "\n";

-			}

-			key2 = key1;

-

-		}

-		else

-		{

-			cfile << "empty offset\n";

-			// write to verse index into compressed

-			write(ovxfd[i], &ulNone, 4);    // current buffer number

-			write(ovxfd[i], &size, 2);    // verse size

-			write(ovxfd[i], &ulNone, 4);    // offset within the buffer

-		}

-	}

-	while ( (key1.Testament()==i+1) && ((key1.compare("Revelation of John 22:21")==-1) || (lasttodo)));

-

-	close(ifd[i]);

-	close(ofd[i]);

-	close(ixfd[i]);

-	close(oxfd[i]);

-	close(ovxfd[i]);

-	close(itestfd[i]);

-	close(itestxfd[i]);

-}

-	return 1;

-}

diff --git a/src/modules/texts/ztext/ztext.cpp b/src/modules/texts/ztext/ztext.cpp
deleted file mode 100644
index 1fe0e7a..0000000
--- a/src/modules/texts/ztext/ztext.cpp
+++ /dev/null
@@ -1,440 +0,0 @@
-/******************************************************************************
- *  ztext.cpp - code for class 'zText'- a module that reads compressed text
- *				files: ot and nt using indexs ??.vss
- */
-
-
-#include <ctype.h>
-#include <stdio.h>
-#include <fcntl.h>
-
-#ifndef __GNUC__
-#include <io.h>
-#else
-#include <unistd.h>
-#endif
-
-#include <utilfuns.h>
-#include <ztext.h>
-
-#include <regex.h>	// GNU
-
-
-#ifdef USELUCENE
-#include <CLucene/CLucene.h>
-using namespace lucene::search;
-using namespace lucene::queryParser;
-#endif
-
-SWORD_NAMESPACE_START
-
-/******************************************************************************
- * zText Constructor - Initializes data for instance of zText
- *
- * ENT:	ipath - path to data files
- *		iname - Internal name for module
- *		idesc - Name to display to user for module
- *		iblockType - verse, chapter, book, etc. of index chunks
- *		icomp - Compressor object
- *		idisp - Display object to use for displaying
- */
-
-zText::zText(const char *ipath, const char *iname, const char *idesc, int iblockType, SWCompress *icomp, SWDisplay *idisp, SWTextEncoding enc, SWTextDirection dir, SWTextMarkup mark, const char* ilang)
-		: zVerse(ipath, -1, iblockType, icomp), SWText(iname, idesc, idisp, enc, dir, mark, ilang) {
-	blockType = iblockType;
-	lastWriteKey = 0;
-#ifdef USELUCENE
-	SWBuf fname;
-	fname = path;
-	ir = 0;
-	is = 0;
-	char ch = fname.c_str()[strlen(fname.c_str())-1];
-	if ((ch != '/') && (ch != '\\'))
-		fname += "/lucene";
-	if (IndexReader::indexExists(fname.c_str())) {
-		ir = &IndexReader::open(fname);
-		is = new IndexSearcher(*ir);
-	}
-#endif
-}
-
-
-/******************************************************************************
- * zText Destructor - Cleans up instance of zText
- */
-
-zText::~zText()
-{
-	flushCache();
-
-	if (lastWriteKey)
-		delete lastWriteKey;
-
-#ifdef USELUCENE
-	if (is)
-		is->close();
-
-	if (ir)
-		delete ir;
-#endif
-}
-
-
-/******************************************************************************
- * zText::getRawEntry	- Returns the current verse buffer
- *
- * RET: buffer with verse
- */
-
-SWBuf &zText::getRawEntryBuf() {
-	long  start = 0;
-	unsigned short size = 0;
-	VerseKey &key = getVerseKey();
-
-	findOffset(key.Testament(), key.Index(), &start, &size);
-	entrySize = size;        // support getEntrySize call
-			  
-	entryBuf = "";
-	zReadText(key.Testament(), start, size, entryBuf);
-
-	rawFilter(entryBuf, &key);
-
-//	if (!isUnicode())
-		prepText(entryBuf);
-
-	return entryBuf;
-}
-
-
-bool zText::sameBlock(VerseKey *k1, VerseKey *k2) {
-	if (k1->Testament() != k2->Testament())
-		return false;
-
-	switch (blockType) {
-	case VERSEBLOCKS:
-		if (k1->Verse() != k2->Verse())
-			return false;
-	case CHAPTERBLOCKS:
-		if (k1->Chapter() != k2->Chapter())
-			return false;
-	case BOOKBLOCKS:
-		if (k1->Book() != k2->Book())
-			return false;
-	}
-	return true;
-}
-
-
-void zText::setEntry(const char *inbuf, long len) {
-	VerseKey &key = getVerseKey();
-
-	// see if we've jumped across blocks since last write
-	if (lastWriteKey) {
-		if (!sameBlock(lastWriteKey, &key)) {
-			flushCache();
-		}
-		delete lastWriteKey;
-	}
-
-	doSetText(key.Testament(), key.Index(), inbuf, len);
-
-	lastWriteKey = (VerseKey *)key.clone();	// must delete
-}
-
-
-void zText::linkEntry(const SWKey *inkey) {
-	VerseKey &destkey = getVerseKey();
-	const VerseKey *srckey = 0;
-
-	// see if we have a VerseKey * or decendant
-	try {
-		srckey = (const VerseKey *) SWDYNAMIC_CAST(VerseKey, inkey);
-	}
-	catch ( ... ) {
-	}
-	// if we don't have a VerseKey * decendant, create our own
-	if (!srckey)
-		srckey = new VerseKey(inkey);
-
-	doLinkEntry(destkey.Testament(), destkey.Index(), srckey->Index());
-
-	if (inkey != srckey) // free our key if we created a VerseKey
-		delete srckey;
-}
-
-
-/******************************************************************************
- * zFiles::deleteEntry	- deletes this entry
- *
- */
-
-void zText::deleteEntry() {
-
-	VerseKey &key = getVerseKey();
-
-	doSetText(key.Testament(), key.Index(), "");
-}
-
-
-/******************************************************************************
- * zText::increment	- Increments module key a number of entries
- *
- * ENT:	increment	- Number of entries to jump forward
- *
- */
-
-void zText::increment(int steps) {
-	long  start;
-	unsigned short size;
-	VerseKey *tmpkey = &getVerseKey();
-
-	findOffset(tmpkey->Testament(), tmpkey->Index(), &start, &size);
-
-	SWKey lastgood = *tmpkey;
-	while (steps) {
-		long laststart = start;
-		unsigned short lastsize = size;
-		SWKey lasttry = *tmpkey;
-		(steps > 0) ? (*key)++ : (*key)--;
-		tmpkey = &getVerseKey();
-
-		if ((error = key->Error())) {
-			*key = lastgood;
-			break;
-		}
-		long index = tmpkey->Index();
-		findOffset(tmpkey->Testament(), index, &start, &size);
-
-		if (
-			(((laststart != start) || (lastsize != size))	// we're a different entry
-//				&& (start > 0)
-				&& (size))	// and we actually have a size
-				||(!skipConsecutiveLinks)) {	// or we don't want to skip consecutive links
-			steps += (steps < 0) ? 1 : -1;
-			lastgood = *tmpkey;
-		}
-	}
-	error = (error) ? KEYERR_OUTOFBOUNDS : 0;
-}
-
-
-VerseKey &zText::getVerseKey() {
-	static VerseKey tmpVK;
-	VerseKey *key;
-	// see if we have a VerseKey * or decendant
-	try {
-		key = SWDYNAMIC_CAST(VerseKey, this->key);
-	}
-	catch ( ... ) {	}
-	if (!key) {
-		ListKey *lkTest = 0;
-		try {
-			lkTest = SWDYNAMIC_CAST(ListKey, this->key);
-		}
-		catch ( ... ) {	}
-		if (lkTest) {
-			try {
-				key = SWDYNAMIC_CAST(VerseKey, lkTest->GetElement());
-			}
-			catch ( ... ) {	}
-		}
-	}
-	if (!key) {
-		tmpVK = *(this->key);
-		return tmpVK;
-	}
-	else	return *key;
-}
-
-
-#ifndef O_BINARY
-#define O_BINARY 0
-#endif
-
-signed char zText::createSearchFramework() {
-#ifdef USELUCENE
-	SWKey *savekey = 0;
-	SWKey *searchkey = 0;
-	SWKey textkey;
-	char *word = 0;
-	char *wordBuf = 0;
-
-
-	// save key information so as not to disrupt original
-	// module position
-	if (!key->Persist()) {
-		savekey = CreateKey();
-		*savekey = *key;
-	}
-	else	savekey = key;
-
-	searchkey = (key->Persist())?key->clone():0;
-	if (searchkey) {
-		searchkey->Persist(1);
-		setKey(*searchkey);
-	}
-
-	// position module at the beginning
-	*this = TOP;
-
-	VerseKey *lkey = (VerseKey *)key;
-
-	// iterate thru each entry in module
-
-	IndexWriter* writer = NULL;
-	Directory* d = NULL;
- 
-	lucene::analysis::SimpleAnalyzer& an = *new lucene::analysis::SimpleAnalyzer();
-	SWBuf target = path;
-	char ch = target.c_str()[strlen(target.c_str())-1];
-	if ((ch != '/') && (ch != '\\'))
-		target += "/lucene";
-
-	if (IndexReader::indexExists(target.c_str())) {
-		d = &FSDirectory::getDirectory(target.c_str(), false);
-		if (IndexReader::isLocked(*d)) {
-			IndexReader::unlock(*d);
-		}
-																		   
-		writer = new IndexWriter(*d, an, false);
-	} else {
-		d = &FSDirectory::getDirectory(target.c_str(), true);
-		writer = new IndexWriter( *d ,an, true);
-	}
-
-
- 
-	while (!Error()) {
-		Document &doc = *new Document();
-		doc.add( Field::Text(_T("key"), (const char *)*lkey ) );
-		doc.add( Field::Text(_T("content"), StripText()) );
-		writer->addDocument(doc);
-		delete &doc;
-
-		(*this)++;
-	}
-
-	writer->optimize();
-	writer->close();
-	delete writer;
-	delete &an;
-
-	// reposition module back to where it was before we were called
-	setKey(*savekey);
-
-	if (!savekey->Persist())
-		delete savekey;
-
-	if (searchkey)
-		delete searchkey;
-
-	
-#endif
-	return 0;
-}
-
-
-/******************************************************************************
- * SWModule::Search 	- Searches a module for a string
- *
- * ENT:	istr		- string for which to search
- * 	searchType	- type of search to perform
- *				>=0 - regex
- *				-1  - phrase
- *				-2  - multiword
- * 	flags		- options flags for search
- *	justCheckIfSupported	- if set, don't search, only tell if this
- *							function supports requested search.
- *
- * RET: listkey set to verses that contain istr
- */
-
-ListKey &zText::search(const char *istr, int searchType, int flags, SWKey *scope, bool *justCheckIfSupported, void (*percent)(char, void *), void *percentUserData) {
-#ifdef USELUCENE
-	listkey.ClearList();
-
-	if ((is) && (ir)) {
-
-		switch (searchType) {
-		case -2: {	// let lucene replace multiword for now
-
-
-			// test to see if our scope for this search is bounded by a
-			// VerseKey
-			VerseKey *testKeyType = 0, vk;
-			try {
-				testKeyType = SWDYNAMIC_CAST(VerseKey, ((scope)?scope:key));
-			}
-			catch ( ... ) {}
-			// if we don't have a VerseKey * decendant we can't handle
-			// because of scope.
-			// In the future, add bool SWKey::isValid(const char *tryString);
-			if (!testKeyType)
-				break;
-
-
-			// check if we just want to see if search is supported.
-			// If we've gotten this far, then it is supported.
-			if (justCheckIfSupported) {
-				*justCheckIfSupported = true;
-				return listkey;
-			}
-
-			(*percent)(10, percentUserData);
-
-			standard::StandardAnalyzer analyzer;
-			Query &q =  QueryParser::Parse(istr, _T("content"), analyzer);
-			(*percent)(20, percentUserData);
-			Hits &h = is->search(q);
-			(*percent)(80, percentUserData);
-
-
-			// iterate thru each good module position that meets the search
-			for (long i = 0; i < h.Length(); i++) {
-				Document &doc = h.doc(i);
-
-				// set a temporary verse key to this module position
-				vk = doc.get(_T("key"));
-
-				// check scope
-				// Try to set our scope key to this verse key
-				if (scope) {
-					*testKeyType = vk;
-
-					// check to see if it set ok and if so, add to our return list
-					if (*testKeyType == vk)
-						listkey << (const char *) vk;
-						listkey.GetElement()->userData = (void *)(int)(h.score(i)*100);
-				}
-				else {
-					listkey << (const char*) vk;
-					listkey.GetElement()->userData = (void *)(int)(h.score(i)*100);
-				}
-			}
-			(*percent)(98, percentUserData);
-
-			delete &h;
-			delete &q;
-
-			listkey = TOP;
-			(*percent)(100, percentUserData);
-			return listkey;
-		}
-
-		default:
-			break;
-		}
-	}
-
-	// check if we just want to see if search is supported
-	if (justCheckIfSupported) {
-		*justCheckIfSupported = false;
-		return listkey;
-	}
-#endif
-	// if we don't support this search, fall back to base class
-	return SWModule::search(istr, searchType, flags, scope, justCheckIfSupported, percent, percentUserData);
-}
-
-
-SWORD_NAMESPACE_END