diff --git a/build.xml b/build.xml
index c727de07..bff9737d 100644
--- a/build.xml
+++ b/build.xml
@@ -4,7 +4,7 @@
 	<property file="profile.properties" />
 
 	<!-- include application properties -->
-	<property file="source/net/sourceforge/filebot/Settings.properties" />
+	<property file="source/net/filebot/Settings.properties" />
 	<property name="title" value="${application.name}" />
 	<property name="version" value="${application.version}" />
 
@@ -380,12 +380,12 @@
 
 		<!-- create mediainfo jar as seperate jar and use as trigger for lazy loading the native libs -->
 		<jar destfile="${dir.dist}/webstart/mediainfo.jar">
-			<fileset dir="${dir.build}" includes="net/sourceforge/filebot/mediainfo/**" />
+			<fileset dir="${dir.build}" includes="net/filebot/mediainfo/**" />
 		</jar>
 
 		<!-- create indexed main jar -->
 		<jar destfile="${dir.dist}/webstart/filebot.jar" index="yes">
-			<fileset dir="${dir.build}" excludes="**/*Test*, net/sourceforge/filebot/mediainfo/**" />
+			<fileset dir="${dir.build}" excludes="**/*Test*, net/filebot/mediainfo/**" />
 			<indexjars>
 				<!-- IMPORTANT if groovy is indexed things break during runtime!! -->
 				<fileset dir="${dir.dist}/webstart" includes="**/*.jar" excludes="filebot.jar, groovy.jar" />
diff --git a/website/cli.html b/website/cli.html
index 074bfa41..bc493285 100644
--- a/website/cli.html
+++ b/website/cli.html
@@ -212,7 +212,7 @@
 					
 					<h2 class="reference" id="arguments">
 						Argument Reference
-						<a href="https://sourceforge.net/p/filebot/code/HEAD/tree/trunk/source/net/sourceforge/filebot/cli/ArgumentBean.java" class="source" target="_blank">source</a>
+						<a href="https://sourceforge.net/p/filebot/code/HEAD/tree/trunk/source/net/filebot/cli/ArgumentBean.java" class="source" target="_blank">source</a>
 					</h2>
 					<table class="reference cli">
 						<tr>
diff --git a/website/naming.html b/website/naming.html
index f2343372..3b4412e3 100644
--- a/website/naming.html
+++ b/website/naming.html
@@ -186,7 +186,7 @@
 					
 					<h2 class="reference" id="bindings">
 						Binding Reference
-						<a href="https://sourceforge.net/p/filebot/code/HEAD/tree/trunk/source/net/sourceforge/filebot/format/MediaBindingBean.java" class="source" target="_blank">source</a>
+						<a href="https://sourceforge.net/p/filebot/code/HEAD/tree/trunk/source/net/filebot/format/MediaBindingBean.java" class="source" target="_blank">source</a>
 					</h2>
 					<table class="reference binding">
 						<tr>
@@ -418,7 +418,7 @@
 					
 					<h2 class="reference" id="functions">
 						Function Reference
-						<a href="https://sourceforge.net/p/filebot/code/HEAD/tree/trunk/source/net/sourceforge/filebot/format/ExpressionFormat.lib.groovy?force=True" class="source" target="_blank">source</a>
+						<a href="https://sourceforge.net/p/filebot/code/HEAD/tree/trunk/source/net/filebot/format/ExpressionFormatMethods.java" class="source" target="_blank">source</a>
 					</h2>
 					<p>
 					<code><span class="method">pad</span>(<span class="numeral">length</span>, <span class="string">padding</span> = <span class="string">"0"</span>)</code>Pad strings or numbers with given characters ('0' by default).
diff --git a/website/script.html b/website/script.html
index 42bc75a6..1619be36 100644
--- a/website/script.html
+++ b/website/script.html
@@ -186,7 +186,7 @@
 					
 					<h2 class="reference" id="functions">
 						Function Reference
-						<a href="https://sourceforge.net/p/filebot/code/HEAD/tree/trunk/source/net/sourceforge/filebot/cli/ScriptShell.lib.groovy?force=True" class="source" target="_blank">source</a>
+						<a href="https://sourceforge.net/p/filebot/code/HEAD/tree/trunk/source/net/filebot/cli/ScriptShellMethods.java" class="source" target="_blank">source</a>
 					</h2>
 					
 					<div class="documentation">
@@ -287,7 +287,7 @@
 					<div class="documentation">
 					<h4>Extras</h4>
 					<div>
-						<a href="https://sourceforge.net/p/filebot/code/HEAD/tree/trunk/source/net/sourceforge/filebot/cli/ScriptShell.lib.groovy?force=True" target="_blank">ScriptShell.lib.groovy</a> also defines lots extra useful functions 
+						<a href="https://sourceforge.net/p/filebot/code/HEAD/tree/trunk/source/net/filebot/cli/ScriptShellBaseClass.java</a> also defines lots extra useful functions 
 						and there is example code in the <a href="https://github.com/filebot/scripts">script repository</a>.
 					</div>
 					</div>