diff --git a/.classpath b/.classpath
index b26daeb59..18857aff7 100644
--- a/.classpath
+++ b/.classpath
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry excluding=".gitignore|build.xml" kind="src" path="src"/>
-	<classpathentry kind="src" path="i18n"/>
 	<classpathentry kind="src" path="test"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="lib" path="libs/activation.jar"/>
diff --git a/src/net/sf/briar/api/i18n/FontManager.java b/i18n/net/sf/briar/api/i18n/FontManager.java
similarity index 100%
rename from src/net/sf/briar/api/i18n/FontManager.java
rename to i18n/net/sf/briar/api/i18n/FontManager.java
diff --git a/src/net/sf/briar/api/i18n/I18n.java b/i18n/net/sf/briar/api/i18n/I18n.java
similarity index 100%
rename from src/net/sf/briar/api/i18n/I18n.java
rename to i18n/net/sf/briar/api/i18n/I18n.java
diff --git a/src/net/sf/briar/api/i18n/Stri18ng.java b/i18n/net/sf/briar/api/i18n/Stri18ng.java
similarity index 100%
rename from src/net/sf/briar/api/i18n/Stri18ng.java
rename to i18n/net/sf/briar/api/i18n/Stri18ng.java
diff --git a/src/net/sf/briar/i18n/FontManagerImpl.java b/i18n/net/sf/briar/i18n/FontManagerImpl.java
similarity index 100%
rename from src/net/sf/briar/i18n/FontManagerImpl.java
rename to i18n/net/sf/briar/i18n/FontManagerImpl.java
diff --git a/test/net/sf/briar/i18n/FontManagerTest.java b/i18n/net/sf/briar/i18n/FontManagerTest.java
similarity index 100%
rename from test/net/sf/briar/i18n/FontManagerTest.java
rename to i18n/net/sf/briar/i18n/FontManagerTest.java
diff --git a/src/net/sf/briar/i18n/I18nImpl.java b/i18n/net/sf/briar/i18n/I18nImpl.java
similarity index 100%
rename from src/net/sf/briar/i18n/I18nImpl.java
rename to i18n/net/sf/briar/i18n/I18nImpl.java
diff --git a/src/net/sf/briar/i18n/I18nModule.java b/i18n/net/sf/briar/i18n/I18nModule.java
similarity index 100%
rename from src/net/sf/briar/i18n/I18nModule.java
rename to i18n/net/sf/briar/i18n/I18nModule.java
diff --git a/test/net/sf/briar/i18n/I18nTest.java b/i18n/net/sf/briar/i18n/I18nTest.java
similarity index 100%
rename from test/net/sf/briar/i18n/I18nTest.java
rename to i18n/net/sf/briar/i18n/I18nTest.java
diff --git a/installer.manifest b/installer.manifest
deleted file mode 100644
index fa91ff510..000000000
--- a/installer.manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-Main-Class: net.sf.briar.ui.setup.SetupMain
-
diff --git a/test/build.xml b/test/build.xml
index 2eb934d8a..5d0a8916f 100644
--- a/test/build.xml
+++ b/test/build.xml
@@ -21,7 +21,6 @@
 			<test name='net.sf.briar.db.BasicH2Test'/>
 			<test name='net.sf.briar.db.DatabaseCleanerImplTest'/>
 			<test name='net.sf.briar.db.DatabaseComponentImplTest'/>
-			<test name='net.sf.briar.i18n.I18nTest'/>
 			<test name='net.sf.briar.lifecycle.ShutdownManagerImplTest'/>
 			<test name='net.sf.briar.lifecycle.WindowsShutdownManagerImplTest'/>
 			<test name='net.sf.briar.plugins.PluginManagerImplTest'/>
@@ -70,7 +69,6 @@
 			</classpath>
 			<jvmarg value='-Djava.library.path=../libs'/>
 			<test name='net.sf.briar.db.H2DatabaseTest'/>
-			<test name='net.sf.briar.i18n.FontManagerTest'/>
 			<test name='net.sf.briar.plugins.tor.TorPluginTest'/>
 		</junit>
 	</target>