diff --git a/website/cli.html b/website/cli.html
index a1ee2e6c..2bd2b3a2 100644
--- a/website/cli.html
+++ b/website/cli.html
@@ -300,7 +300,7 @@
 							<input onclick="_gaq.push(['_trackPageview', '/donate/paypal'])" type="image" src="images/donate.png" name="submit" alt="PayPal - The safer, easier way to pay online." />
 						</form>
 					</div>
-					Hosted on <a href="http://sourceforge.net">sourceforge.net</a> | Creative Commons License: Attribution-NonCommercial-ShareAlike © 2011
+					Hosted on <a href="http://sourceforge.net/projects/filebot/">sourceforge.net</a> | Creative Commons License: Attribution-NonCommercial-ShareAlike © 2011
 				</div>
 			</div>
 		</div>
diff --git a/website/data/shell/housekeeping.groovy b/website/data/shell/housekeeping.groovy
new file mode 100644
index 00000000..69488a3b
--- /dev/null
+++ b/website/data/shell/housekeeping.groovy
@@ -0,0 +1,27 @@
+// filebot -script "http://filebot.sourceforge.net/data/shell/housekeeping.groovy" <folder>
+
+/*
+* Watch folder for new tv shows and automatically 
+* move/rename new episodes into a predefined folder structure
+*/
+
+// check for new media files once every 5 seconds
+def updateFrequency = 5 * 1000;
+
+// V:/path for windows /usr/home/name/ for unix
+def destinationRoot = "{com.sun.jna.Platform.isWindows() ? file.path[0..1] : System.getProperty('user.home')}"
+
+// V:/TV Shows/Stargate/Season 1/Stargate.S01E01.Pilot
+def episodeFormat = destinationRoot + "/TV Shows/{n}{'/Season '+s}/{n.space('.')}.{s00e00}.{t.space('.')}"
+
+// spawn daemon thread
+Thread.startDaemon {
+	while (sleep(updateFrequency) || true) {
+		args.eachMediaFolder {
+			rename(folder:it, db: "thetvdb", format:episodeFormat)
+		}
+	}
+}
+
+println "Press ENTER to abort"
+console.readLine() // keep script running until aborted by user
diff --git a/website/index.html b/website/index.html
index 43cd9962..a3e93ad4 100644
--- a/website/index.html
+++ b/website/index.html
@@ -117,7 +117,7 @@
 									<img width="150" height="118" src="screenshots/small/panel.rename.png" alt="Rename files" />
 								</a>
 							</div>
-							Rename hundreds of media files in a matter of seconds<br/><span class="note java">physically move renaming files requires Java 7</span>
+							Rename and move hundreds of media files in a matter of seconds<br/><span class="note java">physically moving files requires Java 7</span>
 						</li>
 						<li>Fetch episode info from <a href="http://www.tvrage.com">TVRage</a>, <a href="http://anidb.net">AniDB</a>, <a href="http://www.imdb.com">IMDb</a>, <a href="http://thetvdb.com">TheTVDB</a> or <a href="http://www.serienjunkies.de">Serienjunkies</a></li>
 						<li>Accurate and robust and simply awesome file / episode matching logic</li>
@@ -211,7 +211,7 @@
 						<input onclick="_gaq.push(['_trackPageview', '/donate/paypal'])" type="image" src="images/donate.png" name="submit" alt="PayPal - The safer, easier way to pay online." />
 					</form>
 				</div>
-				Hosted on <a href="http://sourceforge.net">sourceforge.net</a> | Creative Commons License: Attribution-NonCommercial-ShareAlike © 2011
+				Hosted on <a href="http://sourceforge.net/projects/filebot/">sourceforge.net</a> | Creative Commons License: Attribution-NonCommercial-ShareAlike © 2011
 			</div>
 		</div>
 	</body>
diff --git a/website/naming.html b/website/naming.html
index 1f2e53b3..624fb8c1 100644
--- a/website/naming.html
+++ b/website/naming.html
@@ -87,11 +87,10 @@
 					</p>
 					<h2 id="examples">Examples</h2>
 					<p>
-					<code><span class="block start">{</span><span class="variable">n</span><span class="block end">}</span> - <span class="block start">{</span><span class="variable">s</span><span class="block end">}</span>.<span class="block start">{</span><span class="variable">e</span><span class="block end">}</span> - <span class="block start">{</span><span class="variable">t</span><span class="block end">}</span></code>
-					Dark Angel - 3.1 - Labyrinth
+					<code><span class="block start">{</span><span class="variable">n</span><span class="block end">}</span> - <span class="block start">{</span><span class="variable">s00e00</span><span class="block end">}</span> - <span class="block start">{</span><span class="variable">t</span><span class="block end">}</span></code>Dark Angel - S03E01 - Labyrinth
 					</p>
 					<p>
-					<code><span class="block start">{</span><span class="variable">n</span><span class="block end">}</span> - <span class="block start">{</span><span class="string">'S'</span>+<span class="variable">s</span>.<span class="method"><span class="method">pad</span></span>(<span class="numeral">2</span>)<span class="block end">}</span>E<span class="block start">{</span><span class="variable">e</span>.<span class="method">pad</span>(<span class="numeral">2</span>)<span class="block end">}</span> - <span class="block start">{</span><span class="variable">t</span><span class="block end">}</span></code>Dark Angel - S03E01 - Labyrinth
+					<code>V:/TV Shows/<span class="block start">{</span><span class="variable">n</span><span class="block end">}</span>/Season <span class="block start">{</span><span class="variable">s</span><span class="block end">}</span>/<span class="block start">{</span><span class="variable">sxe</span><span class="block end">}</span> - <span class="block start">{</span><span class="variable">t</span><span class="block end">}</span></code>V:\TV Shows\Dark Angel\Season 3\3x01 - Labyrinth
 					</p>
 					<p>
 					<code><span class="block start">{</span><span class="variable">n</span>.<span class="method">space</span>(<span class="string">'.'</span>).<span class="method">lower</span>()<span class="block end">}</span>.<span class="block start">{</span><span class="variable">s</span><span class="block end">}</span><span class="block start">{</span><span class="variable">e</span>.<span class="method">pad</span>(<span class="numeral">2</span>)<span class="block end">}</span></code>dark.angel.301
@@ -371,7 +370,7 @@
 							<input onclick="_gaq.push(['_trackPageview', '/donate/paypal'])" type="image" src="images/donate.png" name="submit" alt="PayPal - The safer, easier way to pay online." />
 						</form>
 					</div>
-					Hosted on <a href="http://sourceforge.net">sourceforge.net</a> | Creative Commons License: Attribution-NonCommercial-ShareAlike © 2011
+					Hosted on <a href="http://sourceforge.net/projects/filebot/">sourceforge.net</a> | Creative Commons License: Attribution-NonCommercial-ShareAlike © 2011
 				</div>
 			</div>
 		</div>
diff --git a/website/script.html b/website/script.html
index ad437af7..b3a6825a 100644
--- a/website/script.html
+++ b/website/script.html
@@ -235,7 +235,7 @@
 							<input onclick="_gaq.push(['_trackPageview', '/donate/paypal'])" type="image" src="images/donate.png" name="submit" alt="PayPal - The safer, easier way to pay online." />
 						</form>
 					</div>
-					Hosted on <a href="http://sourceforge.net">sourceforge.net</a> | Creative Commons License: Attribution-NonCommercial-ShareAlike © 2011
+					Hosted on <a href="http://sourceforge.net/projects/filebot/">sourceforge.net</a> | Creative Commons License: Attribution-NonCommercial-ShareAlike © 2011
 				</div>
 			</div>
 		</div>