directory layout cleanup !IMPORTANT

This patch changes the directory structure of dokuwiki as suggested
in http://www.freelists.org/archives/dokuwiki/06-2005/msg00045.html

As the changes.log is not managed through darcs you need to move it your
self to the new location in data/changes.log

I think I modified the code at all nessessary places, but I may have
forgotten a few things.

darcs-hash:20050605103842-9977f-af20f63c1d604888375d175d89ac6bd71566d47d.gz

129 files changed, 251 insertions, 152 deletions

diff --git a/conf/dokuwiki.php b/conf/dokuwiki.php
index 1cdca0624..c40728d0a 100644
--- a/conf/dokuwiki.php
+++ b/conf/dokuwiki.php
@@ -12,11 +12,11 @@
 $conf['umask']       = 0111;              //set the umask for new files
 $conf['dmask']       = 0000;              //directory mask accordingly
 $conf['lang']        = 'en';              //your language
-$conf['basedir']     = '';                //relative dir to serveroot - blank for autodetection
-$conf['datadir']     = './data';          //where to store the data
-$conf['olddir']      = './attic';         //where to store old revisions
-$conf['mediadir']    = './media';         //where to store media files
-$conf['changelog']   = './changes.log';   //change log
+$conf['basedir']     = '';                //absolute dir from serveroot - blank for autodetection
+$conf['datadir']     = './data/pages';    //where to store the data
+$conf['olddir']      = './data/attic';    //where to store old revisions
+$conf['mediadir']    = './data/media';    //where to store media files
+$conf['changelog']   = './data/changes.log'; //change log
 
 /* Display Options */
 
diff --git a/conf/interwiki.conf b/conf/interwiki.conf
index dbb1331f6..0a640ddcc 100644
--- a/conf/interwiki.conf
+++ b/conf/interwiki.conf
@@ -24,6 +24,7 @@ phpfn     http://www.php.net/manual/en/function.{NAME}.php
 go        http://www.google.com/search?q={URL}&btnI=lucky

 bug       http://bugs.splitbrain.org/index.php?do=details&id=

 coral     http://{HOST}.{PORT}.nyud.net:8090/{PATH}?{QUERY}

+xref      http://dev.splitbrain.org/reference/dokuwiki/{NAME}.html

 

 # Standards from http://usemod.com/intermap.txt follow

 

diff --git a/conf/wordblock.conf b/conf/wordblock.conf
index 604f4b8a3..b337dd5bb 100644
--- a/conf/wordblock.conf
+++ b/conf/wordblock.conf
@@ -7,6 +7,9 @@ https?:\/\/([^\/]*\.)?0--sex\.com
 https?:\/\/([^\/]*\.)?0008888\.com
 https?:\/\/([^\/]*\.)?001love\.com
 https?:\/\/([^\/]*\.)?001love\.freewebpage\.org
+https?:\/\/([^\/]*\.)?01incest\.za\.pl
+https?:\/\/([^\/]*\.)?02incest\.za\.pl
+https?:\/\/([^\/]*\.)?03incest\.za\.pl
 https?:\/\/([^\/]*\.)?0571a\.com
 https?:\/\/([^\/]*\.)?0755shopping\.com
 https?:\/\/([^\/]*\.)?086books\.com
@@ -475,6 +478,7 @@ https?:\/\/([^\/]*\.)?acrs\.us
 https?:\/\/([^\/]*\.)?activeshow\.net
 https?:\/\/([^\/]*\.)?actonel\.rx4\.org
 https?:\/\/([^\/]*\.)?actos\.rx4\.org
+https?:\/\/([^\/]*\.)?acyclovir\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?acyclovir\.chat\.ru
 https?:\/\/([^\/]*\.)?adaware-spyware\.yoll\.net
 https?:\/\/([^\/]*\.)?adballoon\.freewebpage\.org
@@ -495,6 +499,7 @@ https?:\/\/([^\/]*\.)?adipex-order\.frwh\.net
 https?:\/\/([^\/]*\.)?adipex-p\.6x\.to
 https?:\/\/([^\/]*\.)?adipex-phentermine\.6x\.to
 https?:\/\/([^\/]*\.)?adipex-without-a-prescription\.6x\.to
+https?:\/\/([^\/]*\.)?adipex\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?adipex\.b6\.to
 https?:\/\/([^\/]*\.)?adipex\.chat\.ru
 https?:\/\/([^\/]*\.)?adipex\.cjb\.net
@@ -565,7 +570,9 @@ https?:\/\/([^\/]*\.)?all-cigarette\.newmail\.ru
 https?:\/\/([^\/]*\.)?all-cigarette\.nm\.ru
 https?:\/\/([^\/]*\.)?all-cigarettes\.newmail\.ru
 https?:\/\/([^\/]*\.)?all-cigarettes\.nm\.ru
+https?:\/\/([^\/]*\.)?allegra\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?allegra\.rx4\.org
+https?:\/\/([^\/]*\.)?allergy\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?allgo5\.com
 https?:\/\/([^\/]*\.)?allopurinol\.rx4\.org
 https?:\/\/([^\/]*\.)?allthemeds\.com
@@ -620,6 +627,7 @@ https?:\/\/([^\/]*\.)?ambien-online\.wagoo\.com
 https?:\/\/([^\/]*\.)?ambien-pharmacy\.6x\.to
 https?:\/\/([^\/]*\.)?ambien-price\.redi\.tk
 https?:\/\/([^\/]*\.)?ambien-sleeping-pills\.redi\.tk
+https?:\/\/([^\/]*\.)?ambien\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?ambien\.4t\.com
 https?:\/\/([^\/]*\.)?ambien\.6x\.to
 https?:\/\/([^\/]*\.)?ambien\.chat\.ru
@@ -674,11 +682,14 @@ https?:\/\/([^\/]*\.)?antely\.com
 https?:\/\/([^\/]*\.)?anti-spyware\.yoll\.net
 https?:\/\/([^\/]*\.)?anti-spyware\.yoll\.net:microsoft\.com
 https?:\/\/([^\/]*\.)?antibiotics\.rx4\.org
+https?:\/\/([^\/]*\.)?antidepressants\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?antifungal\.rx4\.org
 https?:\/\/([^\/]*\.)?antihistamine\.rx4\.org
 https?:\/\/([^\/]*\.)?antiqueautoinsurance\.uni\.cc
 https?:\/\/([^\/]*\.)?antu\.com\.cn
+https?:\/\/([^\/]*\.)?anxiety\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?anxiety\.741\.com
+https?:\/\/([^\/]*\.)?anylight4u\.com
 https?:\/\/([^\/]*\.)?anzwers\.org
 https?:\/\/([^\/]*\.)?aohua\.com\.cn
 https?:\/\/([^\/]*\.)?apa-redlion\.com
@@ -756,6 +767,7 @@ https?:\/\/([^\/]*\.)?awxk\.net
 https?:\/\/([^\/]*\.)?axa_carinsurance\.6x\.to
 https?:\/\/([^\/]*\.)?axair\.jia\.net
 https?:\/\/([^\/]*\.)?azian\.org
+https?:\/\/([^\/]*\.)?azzacash\.com
 https?:\/\/([^\/]*\.)?b-liver\.com
 https?:\/\/([^\/]*\.)?b-mailbox\.com
 https?:\/\/([^\/]*\.)?b345\.com
@@ -877,6 +889,7 @@ https?:\/\/([^\/]*\.)?bijibencn\.51\.net
 https?:\/\/([^\/]*\.)?bijibendiannao1\.51\.net
 https?:\/\/([^\/]*\.)?billleo\.com
 https?:\/\/([^\/]*\.)?bingo4you\.greatnow\.com
+https?:\/\/([^\/]*\.)?birth-control\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?birthday-flower\.boom\.ru
 https?:\/\/([^\/]*\.)?bj-guoxiang\.com
 https?:\/\/([^\/]*\.)?bj-sd\.com
@@ -925,6 +938,8 @@ https?:\/\/([^\/]*\.)?body1acne\.chat\.ru
 https?:\/\/([^\/]*\.)?bokaibj\.com
 https?:\/\/([^\/]*\.)?bolicn\.51\.net
 https?:\/\/([^\/]*\.)?boligangcn\.51\.net
+https?:\/\/([^\/]*\.)?bon-rassi\.com
+https?:\/\/([^\/]*\.)?bontril\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?bontril\.chat\.ru
 https?:\/\/([^\/]*\.)?bontril\.rx4\.org
 https?:\/\/([^\/]*\.)?booking-room\.com
@@ -950,6 +965,7 @@ https?:\/\/([^\/]*\.)?budget-travel\.boom\.ru
 https?:\/\/([^\/]*\.)?budgettravel\.chat\.ru
 https?:\/\/([^\/]*\.)?bujindianji\.51\.net
 https?:\/\/([^\/]*\.)?buprenorphine\.rx4\.org
+https?:\/\/([^\/]*\.)?bupropion-hcl\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?business--for--sale\.tripod\.com
 https?:\/\/([^\/]*\.)?business-and-money\.info
 https?:\/\/([^\/]*\.)?business-for-sale\.6x\.to
@@ -971,9 +987,12 @@ https?:\/\/([^\/]*\.)?business4sale\.friko\.pl
 https?:\/\/([^\/]*\.)?businessforsale\.esmartdesign\.com
 https?:\/\/([^\/]*\.)?businessitaly\.info
 https?:\/\/([^\/]*\.)?businesstravel\.chat\.ru
+https?:\/\/([^\/]*\.)?buspar\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?buspar\.rx4\.org
+https?:\/\/([^\/]*\.)?buspirone\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?buspirone\.chat\.ru
 https?:\/\/([^\/]*\.)?busty--sluts\.com
+https?:\/\/([^\/]*\.)?butalbital-apap\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?butianshi\.com
 https?:\/\/([^\/]*\.)?buy-adipex-online\.6x\.to
 https?:\/\/([^\/]*\.)?buy-adipex-online\.iscool\.net
@@ -1355,6 +1374,7 @@ https?:\/\/([^\/]*\.)?carisoprodol-next-day\.usa\.gs
 https?:\/\/([^\/]*\.)?carisoprodol-side-effects\.usa\.gs
 https?:\/\/([^\/]*\.)?carisoprodol-storage\.usa\.gs
 https?:\/\/([^\/]*\.)?carisoprodol-tablets350mg\.usa\.gs
+https?:\/\/([^\/]*\.)?carisoprodol\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?carisoprodol\.4t\.com
 https?:\/\/([^\/]*\.)?carisoprodol\.b6\.to
 https?:\/\/([^\/]*\.)?carisoprodol\.chat\.ru
@@ -1428,6 +1448,7 @@ https?:\/\/([^\/]*\.)?cebooks\.net
 https?:\/\/([^\/]*\.)?cefzil\.rx4\.org
 https?:\/\/([^\/]*\.)?celebrcruiseline\.boom\.ru
 https?:\/\/([^\/]*\.)?celebrcruiseline\.chat\.ru
+https?:\/\/([^\/]*\.)?celebrex\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?celebrex\.4mg\.com
 https?:\/\/([^\/]*\.)?celebrex\.chat\.ru
 https?:\/\/([^\/]*\.)?celebrex\.rx4\.org
@@ -1435,6 +1456,7 @@ https?:\/\/([^\/]*\.)?celebrex4you\.nightmail\.ru
 https?:\/\/([^\/]*\.)?celebrity-cruise-lin\.hotmail\.ru
 https?:\/\/([^\/]*\.)?celebritycruise\.chat\.ru
 https?:\/\/([^\/]*\.)?celebritycruisel\.chat\.ru
+https?:\/\/([^\/]*\.)?celexa\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?celexa\.rx4\.org
 https?:\/\/([^\/]*\.)?celexa4you\.bannerless\.com
 https?:\/\/([^\/]*\.)?cellphones4you\.land\.ru
@@ -1620,6 +1642,7 @@ https?:\/\/([^\/]*\.)?cialis-pills\.maclenet\.com
 https?:\/\/([^\/]*\.)?cialis-place-online\.maclenet\.com
 https?:\/\/([^\/]*\.)?cialis-place-onweb\.maclenet\.com
 https?:\/\/([^\/]*\.)?cialis-world\.maclenet\.com
+https?:\/\/([^\/]*\.)?cialis\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?cialis\.321\.cn
 https?:\/\/([^\/]*\.)?cialis\.b6\.to
 https?:\/\/([^\/]*\.)?cialis\.chat\.ru
@@ -1878,6 +1901,7 @@ https?:\/\/([^\/]*\.)?cstarcom\.com
 https?:\/\/([^\/]*\.)?cufflinks\.oneuk\.com
 https?:\/\/([^\/]*\.)?curevitiligo\.com
 https?:\/\/([^\/]*\.)?cw92013\.chinaw3\.com
+https?:\/\/([^\/]*\.)?cyclobenzaprine\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?cyclobenzaprine\.chat\.ru
 https?:\/\/([^\/]*\.)?cyclobenzaprine\.port5\.com
 https?:\/\/([^\/]*\.)?cyclobenzaprine\.rx4\.org
@@ -1915,6 +1939,7 @@ https?:\/\/([^\/]*\.)?datcent\.com
 https?:\/\/([^\/]*\.)?dating\.lir\.dk
 https?:\/\/([^\/]*\.)?dating4you\.greatnow\.com
 https?:\/\/([^\/]*\.)?dating999\.com
+https?:\/\/([^\/]*\.)?dawsonanddadrealty\.com
 https?:\/\/([^\/]*\.)?day-phentermine\.eu\.kz
 https?:\/\/([^\/]*\.)?daya-cn\.com
 https?:\/\/([^\/]*\.)?daying-fur\.com
@@ -1929,6 +1954,7 @@ https?:\/\/([^\/]*\.)?ddd6\.freewebpage\.org
 https?:\/\/([^\/]*\.)?ddd7\.freewebpage\.org
 https?:\/\/([^\/]*\.)?ddd8\.freewebpage\.org
 https?:\/\/([^\/]*\.)?ddd9\.freewebpage\.org
+https?:\/\/([^\/]*\.)?deadsex\.info
 https?:\/\/([^\/]*\.)?debt-consolidation-loans\.6x\.to
 https?:\/\/([^\/]*\.)?debt-consolidation\.fm\.interia\.pl
 https?:\/\/([^\/]*\.)?debt-consolidation\.undonet\.com
@@ -1981,6 +2007,7 @@ https?:\/\/([^\/]*\.)?diazepam-valium\.land\.ru
 https?:\/\/([^\/]*\.)?diazepam\.chat\.ru
 https?:\/\/([^\/]*\.)?diazepam\.rx4\.org
 https?:\/\/([^\/]*\.)?diclofenac\.rx4\.org
+https?:\/\/([^\/]*\.)?didrex\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?didrex\.chat\.ru
 https?:\/\/([^\/]*\.)?didrex\.enacre\.net
 https?:\/\/([^\/]*\.)?didrex\.rx4\.org
@@ -2121,6 +2148,7 @@ https?:\/\/([^\/]*\.)?e-bridge\.narod\.ru
 https?:\/\/([^\/]*\.)?e-cigarettes\.imess\.net
 https?:\/\/([^\/]*\.)?e-cinema\.greatnow\.com
 https?:\/\/([^\/]*\.)?e-debt-consolidation-loans\.com
+https?:\/\/([^\/]*\.)?eaglechief\.com
 https?:\/\/([^\/]*\.)?earphone168\.com
 https?:\/\/([^\/]*\.)?easy-application-credit-cards\.com
 https?:\/\/([^\/]*\.)?easy-hosting-services\.com
@@ -2135,6 +2163,7 @@ https?:\/\/([^\/]*\.)?ec51\.com
 https?:\/\/([^\/]*\.)?ec51\.net
 https?:\/\/([^\/]*\.)?ec51\.org
 https?:\/\/([^\/]*\.)?ecar-rentals\.com
+https?:\/\/([^\/]*\.)?ececu\.com
 https?:\/\/([^\/]*\.)?echinabid\.com
 https?:\/\/([^\/]*\.)?ecommerce\.vladimir\.ru
 https?:\/\/([^\/]*\.)?ecstasy\.rx4\.org
@@ -2151,21 +2180,27 @@ https?:\/\/([^\/]*\.)?eee7\.freewebpage\.org
 https?:\/\/([^\/]*\.)?eee8\.freewebpage\.org
 https?:\/\/([^\/]*\.)?eee9\.freewebpage\.org
 https?:\/\/([^\/]*\.)?effects-of-carisoprodol\.usa\.gs
+https?:\/\/([^\/]*\.)?effexor-xr\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?effexor\.b0ne\.com
 https?:\/\/([^\/]*\.)?effexor\.chat\.ru
 https?:\/\/([^\/]*\.)?effexor\.rx4\.org
 https?:\/\/([^\/]*\.)?elavil\.rx4\.org
 https?:\/\/([^\/]*\.)?electrical-components-importers\.org
+https?:\/\/([^\/]*\.)?electricscooterland\.com
 https?:\/\/([^\/]*\.)?elm\.chat\.ru
 https?:\/\/([^\/]*\.)?eloancom\.chat\.ru
 https?:\/\/([^\/]*\.)?embacn\.51\.net
 https?:\/\/([^\/]*\.)?emmss\.com
 https?:\/\/([^\/]*\.)?empire--poker\.com
+https?:\/\/([^\/]*\.)?empire-holdem\.com
+https?:\/\/([^\/]*\.)?empire-holdem\.net
+https?:\/\/([^\/]*\.)?empire-holdem\.us
 https?:\/\/([^\/]*\.)?empire-poker-site\.com
 https?:\/\/([^\/]*\.)?enalapril\.rx4\.org
 https?:\/\/([^\/]*\.)?endocet\.rx4\.org
 https?:\/\/([^\/]*\.)?engine4ford\.chat\.ru
 https?:\/\/([^\/]*\.)?enlargement\.rx4\.org
+https?:\/\/([^\/]*\.)?enpresse\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?entex\.rx4\.org
 https?:\/\/([^\/]*\.)?ephedra\.rx4\.org
 https?:\/\/([^\/]*\.)?ephedrine\.rx4\.org
@@ -2179,6 +2214,7 @@ https?:\/\/([^\/]*\.)?errolware\.com
 https?:\/\/([^\/]*\.)?erythromycin\.rx4\.org
 https?:\/\/([^\/]*\.)?escitalopram\.rx4\.org
 https?:\/\/([^\/]*\.)?escort\.6x\.to
+https?:\/\/([^\/]*\.)?esgic\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?esmartbiz\.com
 https?:\/\/([^\/]*\.)?esmartbuyer\.com
 https?:\/\/([^\/]*\.)?esportswave\.com
@@ -2209,6 +2245,7 @@ https?:\/\/([^\/]*\.)?extasy\.rx4\.org
 https?:\/\/([^\/]*\.)?extruder\.freewebpage\.org
 https?:\/\/([^\/]*\.)?eyesom\.com
 https?:\/\/([^\/]*\.)?ezytech\.com\.cn
+https?:\/\/([^\/]*\.)?f-z-a\.com
 https?:\/\/([^\/]*\.)?fabuloussextoys\.com
 https?:\/\/([^\/]*\.)?factive\.rx4\.org
 https?:\/\/([^\/]*\.)?fadianji\.freewebpage\.org
@@ -2222,6 +2259,7 @@ https?:\/\/([^\/]*\.)?familycruises\.chat\.ru
 https?:\/\/([^\/]*\.)?familysex\.friko\.pl
 https?:\/\/([^\/]*\.)?famousleather\.com
 https?:\/\/([^\/]*\.)?famouss\.friko\.pl
+https?:\/\/([^\/]*\.)?famvir\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?famvir\.chat\.ru
 https?:\/\/([^\/]*\.)?fangzhijixie\.51\.net
 https?:\/\/([^\/]*\.)?fanyi88\.bizhat\.com
@@ -2241,9 +2279,11 @@ https?:\/\/([^\/]*\.)?faucetsink\.com
 https?:\/\/([^\/]*\.)?favorlaser\.com
 https?:\/\/([^\/]*\.)?fearcrow\.com
 https?:\/\/([^\/]*\.)?federal-student-loans\.6x\.to
+https?:\/\/([^\/]*\.)?feidenfurniture\.com
 https?:\/\/([^\/]*\.)?feijipiaocn\.51\.net
 https?:\/\/([^\/]*\.)?feilun\.com\.cn
 https?:\/\/([^\/]*\.)?feixiangcable\.com
+https?:\/\/([^\/]*\.)?female-v\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?femdom\.za\.pl
 https?:\/\/([^\/]*\.)?femdomx\.za\.pl
 https?:\/\/([^\/]*\.)?fentanyl\.rx4\.org
@@ -2267,6 +2307,7 @@ https?:\/\/([^\/]*\.)?finddatingsites\.com
 https?:\/\/([^\/]*\.)?fingerchina\.com
 https?:\/\/([^\/]*\.)?fiorecet\.chat\.ru
 https?:\/\/([^\/]*\.)?fioricet-i\.6x\.to
+https?:\/\/([^\/]*\.)?fioricet\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?fioricet\.b6\.to
 https?:\/\/([^\/]*\.)?fioricet\.cjb\.net
 https?:\/\/([^\/]*\.)?fioricet\.esmartdesign\.com
@@ -2289,13 +2330,17 @@ https?:\/\/([^\/]*\.)?first1aid\.chat\.ru
 https?:\/\/([^\/]*\.)?firstchoicebanksandpremiercredit\.com
 https?:\/\/([^\/]*\.)?firstclasstravel\.boom\.ru
 https?:\/\/([^\/]*\.)?firsthorizonmtg\.com
+https?:\/\/([^\/]*\.)?firstnightcharleston\.com
 https?:\/\/([^\/]*\.)?fitness-eq\.boom\.ru
 https?:\/\/([^\/]*\.)?flafeber\.com
+https?:\/\/([^\/]*\.)?flexeril\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?flexeril\.chat\.ru
 https?:\/\/([^\/]*\.)?flexeril\.enacre\.net
 https?:\/\/([^\/]*\.)?flexeril\.rx4\.org
+https?:\/\/([^\/]*\.)?flextra\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?flixotide\.rx4\.org
 https?:\/\/([^\/]*\.)?flomax\.rx4\.org
+https?:\/\/([^\/]*\.)?flonase\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?flonase\.noneto\.com
 https?:\/\/([^\/]*\.)?flonase\.rx4\.org
 https?:\/\/([^\/]*\.)?floor-lamp\.hotmail\.ru
@@ -2326,6 +2371,7 @@ https?:\/\/([^\/]*\.)?flowerwish\.51\.net
 https?:\/\/([^\/]*\.)?flowerwish\.com
 https?:\/\/([^\/]*\.)?flowerwish\.freewebpage\.org
 https?:\/\/([^\/]*\.)?flug-datenbank\.com
+https?:\/\/([^\/]*\.)?fluoxetine\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?fluoxetine\.chat\.ru
 https?:\/\/([^\/]*\.)?fluoxetine\.rx4\.org
 https?:\/\/([^\/]*\.)?fluoxetine\.yoll\.net
@@ -2358,6 +2404,7 @@ https?:\/\/([^\/]*\.)?free-craps\.cjb\.net
 https?:\/\/([^\/]*\.)?free-mature-oni\.com
 https?:\/\/([^\/]*\.)?free-money-investment\.com
 https?:\/\/([^\/]*\.)?free-omaha-holdem\.cjb\.net
+https?:\/\/([^\/]*\.)?free-online-poker-000\.biz
 https?:\/\/([^\/]*\.)?free-pai-gow-poker\.cjb\.net
 https?:\/\/([^\/]*\.)?free-poker-rooms\.us
 https?:\/\/([^\/]*\.)?free-poker\.cjb\.net
@@ -2434,6 +2481,7 @@ https?:\/\/([^\/]*\.)?gardening\.msk\.su
 https?:\/\/([^\/]*\.)?gargzdai\.net
 https?:\/\/([^\/]*\.)?garment-china\.com
 https?:\/\/([^\/]*\.)?garrywa\.com
+https?:\/\/([^\/]*\.)?gastrointestinal\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?gaybeastiality\.za\.pl
 https?:\/\/([^\/]*\.)?gayboy\.friko\.pl
 https?:\/\/([^\/]*\.)?geico-autoinsurance\.uni\.cc
@@ -2452,7 +2500,6 @@ https?:\/\/([^\/]*\.)?generic-prescription-viagra-without\.iredirector\.com
 https?:\/\/([^\/]*\.)?generic-xanax\.undonet\.com
 https?:\/\/([^\/]*\.)?generic-xanax\.uni\.cc
 https?:\/\/([^\/]*\.)?genset-sh\.com
-https?:\/\/([^\/]*\.)?geocities\.com
 https?:\/\/([^\/]*\.)?gerardoknutson\.com
 https?:\/\/([^\/]*\.)?germanytek\.com
 https?:\/\/([^\/]*\.)?get--sex\.com
@@ -2608,9 +2655,11 @@ https?:\/\/([^\/]*\.)?heavy-equipment\.boom\.ru
 https?:\/\/([^\/]*\.)?hebeishuangan\.com
 https?:\/\/([^\/]*\.)?hengshui\.com\.cn
 https?:\/\/([^\/]*\.)?herbalviagra\.za\.pl
+https?:\/\/([^\/]*\.)?here\.com\.cn
 https?:\/\/([^\/]*\.)?hermosa\.us
 https?:\/\/([^\/]*\.)?heroin\.rx4\.org
 https?:\/\/([^\/]*\.)?heroine\.rx4\.org
+https?:\/\/([^\/]*\.)?herpes\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?hg8888\.com
 https?:\/\/([^\/]*\.)?hgh\.chat\.ru
 https?:\/\/([^\/]*\.)?hgh\.rx4\.org
@@ -2627,6 +2676,9 @@ https?:\/\/([^\/]*\.)?hk9697\.com
 https?:\/\/([^\/]*\.)?hm-it\.com
 https?:\/\/([^\/]*\.)?hmc-wiremesh\.com
 https?:\/\/([^\/]*\.)?hmlaser\.com
+https?:\/\/([^\/]*\.)?hold-em-play\.com
+https?:\/\/([^\/]*\.)?hold-em-play\.net
+https?:\/\/([^\/]*\.)?hold-em-winner\.us
 https?:\/\/([^\/]*\.)?hold-screen\.com
 https?:\/\/([^\/]*\.)?holiday-gift\.newmail\.ru
 https?:\/\/([^\/]*\.)?home--business\.tripod\.com
@@ -2750,6 +2802,7 @@ https?:\/\/([^\/]*\.)?hydroxyzine\.rx4\.org
 https?:\/\/([^\/]*\.)?hyip-online-investing\.com
 https?:\/\/([^\/]*\.)?hzgy\.com
 https?:\/\/([^\/]*\.)?hzjl365\.com
+https?:\/\/([^\/]*\.)?hzmeitai\.com
 https?:\/\/([^\/]*\.)?hzn\.cn
 https?:\/\/([^\/]*\.)?i-ambien\.com
 https?:\/\/([^\/]*\.)?i-cheap-cialis\.6x\.to
@@ -2770,16 +2823,19 @@ https?:\/\/([^\/]*\.)?i-texas-holdem\.com
 https?:\/\/([^\/]*\.)?i-texas-holdem\.info
 https?:\/\/([^\/]*\.)?i-texas-holdem\.u
 https?:\/\/([^\/]*\.)?i-tramadol\.6x\.to
+https?:\/\/([^\/]*\.)?i-truepoker\.com
 https?:\/\/([^\/]*\.)?i-ultram\.6x\.to
 https?:\/\/([^\/]*\.)?ialprazolam\.home\.ro
 https?:\/\/([^\/]*\.)?ibuprofen\.rx4\.org
 https?:\/\/([^\/]*\.)?ice1cream\.chat\.ru
 https?:\/\/([^\/]*\.)?icp315\.com
 https?:\/\/([^\/]*\.)?ihydrocodone\.home\.ro
+https?:\/\/([^\/]*\.)?illcom\.com
 https?:\/\/([^\/]*\.)?illinoisattorney\.chat\.ru
 https?:\/\/([^\/]*\.)?im-sb\.boom\.ru
 https?:\/\/([^\/]*\.)?imc\.com\.cn
 https?:\/\/([^\/]*\.)?imipramine\.rx4\.org
+https?:\/\/([^\/]*\.)?imitrex\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?imitrex\.enacre\.net
 https?:\/\/([^\/]*\.)?imitrex\.rx4\.org
 https?:\/\/([^\/]*\.)?importers-wiki\.org
@@ -2826,6 +2882,7 @@ https?:\/\/([^\/]*\.)?investing-get-rich-quick\.info
 https?:\/\/([^\/]*\.)?investment-fraud-lawyer\.info
 https?:\/\/([^\/]*\.)?investments-free-money\.info
 https?:\/\/([^\/]*\.)?invite-cn\.com
+https?:\/\/([^\/]*\.)?ionamin\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?ionamin\.chat\.ru
 https?:\/\/([^\/]*\.)?ionamin\.rx4\.org
 https?:\/\/([^\/]*\.)?iq-testen\.de\.ms
@@ -2902,6 +2959,7 @@ https?:\/\/([^\/]*\.)?jq-js\.com
 https?:\/\/([^\/]*\.)?jrcreations\.com
 https?:\/\/([^\/]*\.)?js-shuangsui\.com
 https?:\/\/([^\/]*\.)?js9\.cn
+https?:\/\/([^\/]*\.)?junyuan\.com\.cn
 https?:\/\/([^\/]*\.)?just--sex\.com
 https?:\/\/([^\/]*\.)?justpills\.net
 https?:\/\/([^\/]*\.)?jxrczp\.com
@@ -3027,6 +3085,7 @@ https?:\/\/([^\/]*\.)?levitra-online\.imess\.net
 https?:\/\/([^\/]*\.)?levitra-online\.lidonet\.net
 https?:\/\/([^\/]*\.)?levitra-online\.redi\.tk
 https?:\/\/([^\/]*\.)?levitra-pharmacyonline\.lidonet\.net
+https?:\/\/([^\/]*\.)?levitra\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?levitra\.active\.ws
 https?:\/\/([^\/]*\.)?levitra\.chat\.ru
 https?:\/\/([^\/]*\.)?levitra\.cjb\.net
@@ -3049,6 +3108,7 @@ https?:\/\/([^\/]*\.)?levitraonweb\.lidonet\.net
 https?:\/\/([^\/]*\.)?levitrapills\.lidonet\.net
 https?:\/\/([^\/]*\.)?levitrapillsonline\.lidonet\.net
 https?:\/\/([^\/]*\.)?levitrapillsonweb\.lidonet\.net
+https?:\/\/([^\/]*\.)?lexapro\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?lexapro\.rx4\.org
 https?:\/\/([^\/]*\.)?lhyj\.com\.cn
 https?:\/\/([^\/]*\.)?liansuocn\.51\.net
@@ -3095,6 +3155,7 @@ https?:\/\/([^\/]*\.)?lizifengji\.quickchina\.com\.cn
 https?:\/\/([^\/]*\.)?lminute-cruise\.boom\.ru
 https?:\/\/([^\/]*\.)?loan-amortizer\.6x\.to
 https?:\/\/([^\/]*\.)?loan-calculator\.6x\.to
+https?:\/\/([^\/]*\.)?loestrin\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?logistics\.freewebpage\.org
 https?:\/\/([^\/]*\.)?logowap\.com
 https?:\/\/([^\/]*\.)?lonamin\.chat\.ru
@@ -3184,6 +3245,7 @@ https?:\/\/([^\/]*\.)?lvyoucn\.51\.net
 https?:\/\/([^\/]*\.)?lw8\.de
 https?:\/\/([^\/]*\.)?lxaz\.freewebpage\.org
 https?:\/\/([^\/]*\.)?lygweb\.com
+https?:\/\/([^\/]*\.)?lyndawyllie\.com
 https?:\/\/([^\/]*\.)?lysodren\.rx4\.org
 https?:\/\/([^\/]*\.)?m-shopping\.de
 https?:\/\/([^\/]*\.)?m6z\.com
@@ -3262,7 +3324,9 @@ https?:\/\/([^\/]*\.)?memantine\.rx4\.org
 https?:\/\/([^\/]*\.)?memory_stick\.chat\.ru
 https?:\/\/([^\/]*\.)?memory_sticks\.chat\.ru
 https?:\/\/([^\/]*\.)?menjincn\.51\.net
+https?:\/\/([^\/]*\.)?mens\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?mercuryinsurance\.chat\.ru
+https?:\/\/([^\/]*\.)?meridia\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?meridia\.chat\.ru
 https?:\/\/([^\/]*\.)?meridia\.my-age\.net
 https?:\/\/([^\/]*\.)?meridia\.rx4\.org
@@ -3326,6 +3390,7 @@ https?:\/\/([^\/]*\.)?mmyou\.com
 https?:\/\/([^\/]*\.)?mnfastpitch\.com
 https?:\/\/([^\/]*\.)?mobic\.rx4\.org
 https?:\/\/([^\/]*\.)?mobic\.sytes\.net
+https?:\/\/([^\/]*\.)?mobilefamilydental\.com
 https?:\/\/([^\/]*\.)?mobilequicksale\.com
 https?:\/\/([^\/]*\.)?mobilesandringtones\.com
 https?:\/\/([^\/]*\.)?moclobemide\.rx4\.org
@@ -3372,6 +3437,7 @@ https?:\/\/([^\/]*\.)?multivision\.com\.hk
 https?:\/\/([^\/]*\.)?murad-acn\.boom\.ru
 https?:\/\/([^\/]*\.)?murad1acne\.chat\.ru
 https?:\/\/([^\/]*\.)?muscle-carisoprodol-soma\.usa\.gs
+https?:\/\/([^\/]*\.)?muscle-relaxers\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?musical88\.com
 https?:\/\/([^\/]*\.)?musicbox1\.com
 https?:\/\/([^\/]*\.)?mxbearings\.com
@@ -3396,7 +3462,9 @@ https?:\/\/([^\/]*\.)?naproxen\.chat\.ru
 https?:\/\/([^\/]*\.)?naproxen\.rx4\.org
 https?:\/\/([^\/]*\.)?naproxen\.zapto\.org
 https?:\/\/([^\/]*\.)?nardil\.rx4\.org
+https?:\/\/([^\/]*\.)?nasacort\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?nasacort\.rx4\.org
+https?:\/\/([^\/]*\.)?nasonex\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?nasonex\.rx4\.org
 https?:\/\/([^\/]*\.)?navinic\.com
 https?:\/\/([^\/]*\.)?nb-jinhui\.com
@@ -3446,6 +3514,7 @@ https?:\/\/([^\/]*\.)?newport-cigarette\.newmail\.ru
 https?:\/\/([^\/]*\.)?newportcigarette\.boom\.ru
 https?:\/\/([^\/]*\.)?newtruths\.com
 https?:\/\/([^\/]*\.)?newyorkcruises\.chat\.ru
+https?:\/\/([^\/]*\.)?nexium\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?nexium\.chat\.ru
 https?:\/\/([^\/]*\.)?nexium\.rx4\.org
 https?:\/\/([^\/]*\.)?nfpaydayloan\.chat\.ru
@@ -3476,6 +3545,7 @@ https?:\/\/([^\/]*\.)?no-fax-payday-loans\.6x\.to
 https?:\/\/([^\/]*\.)?no-prescription-alprazolam\.6x\.to
 https?:\/\/([^\/]*\.)?noni\.chat\.ru
 https?:\/\/([^\/]*\.)?norco\.rx4\.org
+https?:\/\/([^\/]*\.)?nordette\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?nordette\.rx4\.org
 https?:\/\/([^\/]*\.)?norflex\.rx4\.org
 https?:\/\/([^\/]*\.)?nortriptyline\.rx4\.org
@@ -3662,6 +3732,7 @@ https?:\/\/([^\/]*\.)?order-xanax\.fateback\.com
 https?:\/\/([^\/]*\.)?order-zyban-8\.atspace\.com
 https?:\/\/([^\/]*\.)?organize-your-life\.net
 https?:\/\/([^\/]*\.)?orlandovacation\.chat\.ru
+https?:\/\/([^\/]*\.)?ortho-tri-cyclen\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?orthomol\.rx4\.org
 https?:\/\/([^\/]*\.)?osakabondage\.info
 https?:\/\/([^\/]*\.)?ourhost\.com\.cn
@@ -3674,6 +3745,7 @@ https?:\/\/([^\/]*\.)?oxazepam\.rx4\.org
 https?:\/\/([^\/]*\.)?oxycodone\.rx4\.org
 https?:\/\/([^\/]*\.)?oxycontin\.rx4\.org
 https?:\/\/([^\/]*\.)?p-cruise-line\.boom\.ru
+https?:\/\/([^\/]*\.)?p2l\.info
 https?:\/\/([^\/]*\.)?pack001\.cn
 https?:\/\/([^\/]*\.)?pack001\.com
 https?:\/\/([^\/]*\.)?packing-machine\.com
@@ -3682,6 +3754,7 @@ https?:\/\/([^\/]*\.)?pages\.at
 https?:\/\/([^\/]*\.)?pagetwo\.org
 https?:\/\/([^\/]*\.)?pai-gow-poker\.cjb\.net
 https?:\/\/([^\/]*\.)?paiduijicn\.51\.net
+https?:\/\/([^\/]*\.)?pain-relief\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?paite\.net
 https?:\/\/([^\/]*\.)?paiwei\.cn
 https?:\/\/([^\/]*\.)?pamelor\.rx4\.org
@@ -3710,6 +3783,7 @@ https?:\/\/([^\/]*\.)?partypoker-i\.us
 https?:\/\/([^\/]*\.)?pasco-stationery\.com
 https?:\/\/([^\/]*\.)?passion\.org\.cn
 https?:\/\/([^\/]*\.)?patent\.pisem\.net
+https?:\/\/([^\/]*\.)?paxil\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?paxil\.rx4\.org
 https?:\/\/([^\/]*\.)?paxil\.undonet\.com
 https?:\/\/([^\/]*\.)?pay-day-loans\.6x\.to
@@ -3747,6 +3821,7 @@ https?:\/\/([^\/]*\.)?pharmacyusonline\.lidonet\.net
 https?:\/\/([^\/]*\.)?pharmak\.webzdarma\.cz
 https?:\/\/([^\/]*\.)?pharmchemical\.com
 https?:\/\/([^\/]*\.)?phen\.rx4\.org
+https?:\/\/([^\/]*\.)?phendimetrazine\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?phendimetrazine\.rx4\.org
 https?:\/\/([^\/]*\.)?phenergan\.rx4\.org
 https?:\/\/([^\/]*\.)?phenobarbital\.rx4\.org
@@ -3763,6 +3838,7 @@ https?:\/\/([^\/]*\.)?phentermine-online\.b6\.to
 https?:\/\/([^\/]*\.)?phentermine-order\.199mb\.com
 https?:\/\/([^\/]*\.)?phentermine-pills\.wagoo\.com
 https?:\/\/([^\/]*\.)?phentermine-weight-loss\.eu\.kz
+https?:\/\/([^\/]*\.)?phentermine\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?phentermine\.b6\.to
 https?:\/\/([^\/]*\.)?phentermine\.chat\.ru
 https?:\/\/([^\/]*\.)?phentermine\.cjb\.net
@@ -3874,9 +3950,12 @@ https?:\/\/([^\/]*\.)?prednisone\.rx4\.org
 https?:\/\/([^\/]*\.)?premarin\.rx4\.org
 https?:\/\/([^\/]*\.)?premarin\.undonet\.com
 https?:\/\/([^\/]*\.)?prescription-ambien\.hotusa\.org
+https?:\/\/([^\/]*\.)?prevacid\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?prevacid\.chat\.ru
 https?:\/\/([^\/]*\.)?prevacid\.rx4\.org
 https?:\/\/([^\/]*\.)?prevnar\.rx4\.org
+https?:\/\/([^\/]*\.)?price-top\.com
+https?:\/\/([^\/]*\.)?prilosec\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?prilosec\.rx4\.org
 https?:\/\/([^\/]*\.)?princescruiselin\.boom\.ru
 https?:\/\/([^\/]*\.)?princescruiselin\.chat\.ru
@@ -3896,6 +3975,7 @@ https?:\/\/([^\/]*\.)?projector2lamp\.chat\.ru
 https?:\/\/([^\/]*\.)?promethazine\.rx4\.org
 https?:\/\/([^\/]*\.)?promotional-gift\.newmail\.ru
 https?:\/\/([^\/]*\.)?promoz\.ipupdater\.com
+https?:\/\/([^\/]*\.)?propecia\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?propecia\.bump2me\.com
 https?:\/\/([^\/]*\.)?propecia\.chat\.ru
 https?:\/\/([^\/]*\.)?propecia\.rx4\.org
@@ -3997,6 +4077,7 @@ https?:\/\/([^\/]*\.)?reliablevicodin\.com
 https?:\/\/([^\/]*\.)?relpax\.rx4\.org
 https?:\/\/([^\/]*\.)?remeron\.rx4\.org
 https?:\/\/([^\/]*\.)?renliziyuancn\.51\.net
+https?:\/\/([^\/]*\.)?renova\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?renova\.rbcmail\.ru
 https?:\/\/([^\/]*\.)?renova\.rx4\.org
 https?:\/\/([^\/]*\.)?rentersinsurance\.chat\.ru
@@ -4014,6 +4095,7 @@ https?:\/\/([^\/]*\.)?restaurant-eq\.boom\.ru
 https?:\/\/([^\/]*\.)?restoril\.rx4\.org
 https?:\/\/([^\/]*\.)?rethyassociates\.net
 https?:\/\/([^\/]*\.)?rethyassociates\.org
+https?:\/\/([^\/]*\.)?retin-a\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?retin\.rx4\.org
 https?:\/\/([^\/]*\.)?rezeptfrei\.rx4\.org
 https?:\/\/([^\/]*\.)?rhinocort\.rx4\.org
@@ -4126,6 +4208,7 @@ https?:\/\/([^\/]*\.)?se4u\.net
 https?:\/\/([^\/]*\.)?seamaxinc\.com
 https?:\/\/([^\/]*\.)?search88\.net
 https?:\/\/([^\/]*\.)?searcher\.cn
+https?:\/\/([^\/]*\.)?seasonale\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?seasonale\.rx4\.org
 https?:\/\/([^\/]*\.)?sec66\.com
 https?:\/\/([^\/]*\.)?secure-network\.info
@@ -4287,6 +4370,8 @@ https?:\/\/([^\/]*\.)?sildenafil\.yoll\.net
 https?:\/\/([^\/]*\.)?siliconpulse\.info
 https?:\/\/([^\/]*\.)?simplyupside\.de
 https?:\/\/([^\/]*\.)?simvastatin\.rx4\.org
+https?:\/\/([^\/]*\.)?sindyhalliday\.com
+https?:\/\/([^\/]*\.)?sineto\.net
 https?:\/\/([^\/]*\.)?single-cruises\.hotmail\.ru
 https?:\/\/([^\/]*\.)?single4cruises\.chat\.ru
 https?:\/\/([^\/]*\.)?sinoart\.com\.cn
@@ -4295,9 +4380,11 @@ https?:\/\/([^\/]*\.)?sinosyn\.com
 https?:\/\/([^\/]*\.)?sitit\.com
 https?:\/\/([^\/]*\.)?sjdd\.com\.cn
 https?:\/\/([^\/]*\.)?sjzyxh\.com
+https?:\/\/([^\/]*\.)?skelaxin\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?skelaxin\.chat\.ru
 https?:\/\/([^\/]*\.)?skelaxin\.rx4\.org
 https?:\/\/([^\/]*\.)?skf-baijia\.com
+https?:\/\/([^\/]*\.)?skin-care\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?skin-disease\.boom\.ru
 https?:\/\/([^\/]*\.)?skin-disease\.newmail\.ru
 https?:\/\/([^\/]*\.)?skin-treat\.boom\.ru
@@ -4312,6 +4399,7 @@ https?:\/\/([^\/]*\.)?skincare\.freewebpage\.org
 https?:\/\/([^\/]*\.)?skivacation\.chat\.ru
 https?:\/\/([^\/]*\.)?skytv\.linkdata\.cn
 https?:\/\/([^\/]*\.)?slatersdvds\.co\.uk
+https?:\/\/([^\/]*\.)?sleep-aids\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?slot-machine\.hotmail\.ru
 https?:\/\/([^\/]*\.)?slot_machine\.chat\.ru
 https?:\/\/([^\/]*\.)?slots\.cjb\.net
@@ -4335,12 +4423,14 @@ https?:\/\/([^\/]*\.)?software-engine\.org
 https?:\/\/([^\/]*\.)?software2network\.chat\.ru
 https?:\/\/([^\/]*\.)?soma-i\.6x\.to
 https?:\/\/([^\/]*\.)?soma-i\.freeservers\.com
+https?:\/\/([^\/]*\.)?soma\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?soma\.chat\.ru
 https?:\/\/([^\/]*\.)?soma\.cjb\.net
 https?:\/\/([^\/]*\.)?soma\.homelinux\.com
 https?:\/\/([^\/]*\.)?soma\.rx4\.org
 https?:\/\/([^\/]*\.)?soma\.smtp\.ru
 https?:\/\/([^\/]*\.)?somee\.com
+https?:\/\/([^\/]*\.)?sonata\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?sonata\.chat\.ru
 https?:\/\/([^\/]*\.)?sonata\.rx4\.org
 https?:\/\/([^\/]*\.)?songshangroup\.com
@@ -4350,6 +4440,7 @@ https?:\/\/([^\/]*\.)?sooson\.com
 https?:\/\/([^\/]*\.)?sooyi\.com
 https?:\/\/([^\/]*\.)?sosdata\.freewebpage\.org
 https?:\/\/([^\/]*\.)?soundandmossl\.com
+https?:\/\/([^\/]*\.)?southtecrepair\.com
 https?:\/\/([^\/]*\.)?spam--sex\.com
 https?:\/\/([^\/]*\.)?spam\.buyphentermine\.frwh\.net
 https?:\/\/([^\/]*\.)?spavacation\.chat\.ru
@@ -4393,6 +4484,7 @@ https?:\/\/([^\/]*\.)?steroids\.rx4\.org
 https?:\/\/([^\/]*\.)?stilnox\.rx4\.org
 https?:\/\/([^\/]*\.)?stmaryonline\.org
 https?:\/\/([^\/]*\.)?stock-cn\.com
+https?:\/\/([^\/]*\.)?stop-smoking\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?stop-spyware\.fateback\.com
 https?:\/\/([^\/]*\.)?stories-on-cd\.net
 https?:\/\/([^\/]*\.)?stories-on-cd\.org
@@ -4419,6 +4511,7 @@ https?:\/\/([^\/]*\.)?sunsetdreamscondo\.com
 https?:\/\/([^\/]*\.)?sunup\.com\.cn
 https?:\/\/([^\/]*\.)?suolide\.googlebaidu\.com
 https?:\/\/([^\/]*\.)?super-celebs\.com
+https?:\/\/([^\/]*\.)?supplements\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?surior\.za\.pl
 https?:\/\/([^\/]*\.)?surv-equipment\.boom\.ru
 https?:\/\/([^\/]*\.)?suttonjames\.net
@@ -4517,6 +4610,7 @@ https?:\/\/([^\/]*\.)?sz-xwf\.com
 https?:\/\/([^\/]*\.)?sz686\.com
 https?:\/\/([^\/]*\.)?szgoldad\.com
 https?:\/\/([^\/]*\.)?szhx\.net
+https?:\/\/([^\/]*\.)?szhxseo\.com
 https?:\/\/([^\/]*\.)?szlongshine\.com
 https?:\/\/([^\/]*\.)?szshinerich\.com
 https?:\/\/([^\/]*\.)?szsuun\.com
@@ -4560,6 +4654,7 @@ https?:\/\/([^\/]*\.)?telfast\.rx4\.org
 https?:\/\/([^\/]*\.)?temazepam\.rx4\.org
 https?:\/\/([^\/]*\.)?tempurpedic\.vladimir\.su
 https?:\/\/([^\/]*\.)?tennesseevac\.chat\.ru
+https?:\/\/([^\/]*\.)?tenuate\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?tenuate\.chat\.ru
 https?:\/\/([^\/]*\.)?tenuate\.rx4\.org
 https?:\/\/([^\/]*\.)?terazosin\.rx4\.org
@@ -4582,7 +4677,9 @@ https?:\/\/([^\/]*\.)?texas-holdem-play\.com
 https?:\/\/([^\/]*\.)?texas-holdem-play\.us
 https?:\/\/([^\/]*\.)?texas-holdem-poker\.fm\.interia\.pl
 https?:\/\/([^\/]*\.)?texas-holdem-poker\.tripod\.com
+https?:\/\/([^\/]*\.)?texas-holdem-poker\.us\.com
 https?:\/\/([^\/]*\.)?texas-holdem-site\.tripod\.com
+https?:\/\/([^\/]*\.)?texas-holdem-winner\.com
 https?:\/\/([^\/]*\.)?texas-holdem\.freeservers\.com
 https?:\/\/([^\/]*\.)?texas-holdem\.here\.ws
 https?:\/\/([^\/]*\.)?texas-holdem\.k9\.pl
@@ -4635,6 +4732,7 @@ https?:\/\/([^\/]*\.)?tire-wheels\.boom\.ru
 https?:\/\/([^\/]*\.)?tires\.newmail\.ru
 https?:\/\/([^\/]*\.)?titanautoinsurance\.uni\.cc
 https?:\/\/([^\/]*\.)?title-loans\.6x\.to
+https?:\/\/([^\/]*\.)?tizanidine\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?tizanidine\.rx4\.org
 https?:\/\/([^\/]*\.)?tjwatch\.com
 https?:\/\/([^\/]*\.)?tlifeinsuranceq\.chat\.ru
@@ -4652,6 +4750,9 @@ https?:\/\/([^\/]*\.)?tools-manufacturer\.org
 https?:\/\/([^\/]*\.)?top-adipex\.com
 https?:\/\/([^\/]*\.)?top-ambien\.com
 https?:\/\/([^\/]*\.)?top-firoicet\.com
+https?:\/\/([^\/]*\.)?top-hold-em\.us
+https?:\/\/([^\/]*\.)?top-holdem\.com
+https?:\/\/([^\/]*\.)?top-holdem\.us
 https?:\/\/([^\/]*\.)?top-point\.net
 https?:\/\/([^\/]*\.)?top-poker-21\.com
 https?:\/\/([^\/]*\.)?top-poker-tables\.com
@@ -4681,6 +4782,7 @@ https?:\/\/([^\/]*\.)?tragency\.boom\.ru
 https?:\/\/([^\/]*\.)?trailer-tire\.boom\.ru
 https?:\/\/([^\/]*\.)?tramadol-for-depression\.pt\.gs
 https?:\/\/([^\/]*\.)?tramadol-i\.freeservers\.com
+https?:\/\/([^\/]*\.)?tramadol\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?tramadol\.chat\.ru
 https?:\/\/([^\/]*\.)?tramadol\.cjb\.net
 https?:\/\/([^\/]*\.)?tramadol\.esmartbuyer\.com
@@ -4735,6 +4837,7 @@ https?:\/\/([^\/]*\.)?trileptal\.rx4\.org
 https?:\/\/([^\/]*\.)?trimox\.rx4\.org
 https?:\/\/([^\/]*\.)?trimspa\.rx4\.org
 https?:\/\/([^\/]*\.)?tripak\.za\.pl
+https?:\/\/([^\/]*\.)?triphasil\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?tropical-cruise\.boom\.ru
 https?:\/\/([^\/]*\.)?tropical-cruise\.hotmail\.ru
 https?:\/\/([^\/]*\.)?tropicalvacation\.chat\.ru
@@ -4774,9 +4877,11 @@ https?:\/\/([^\/]*\.)?ultimate-bet\.biz
 https?:\/\/([^\/]*\.)?ultimate-bet\.us
 https?:\/\/([^\/]*\.)?ultimate-betsite\.com
 https?:\/\/([^\/]*\.)?ultra-sex-videos\.com
+https?:\/\/([^\/]*\.)?ultracet\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?ultracet\.rx4\.org
 https?:\/\/([^\/]*\.)?ultram-tramadol\.grozny\.ru
 https?:\/\/([^\/]*\.)?ultram-tramadol\.mordovia\.ru
+https?:\/\/([^\/]*\.)?ultram\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?ultram\.b6\.to
 https?:\/\/([^\/]*\.)?ultram\.chat\.ru
 https?:\/\/([^\/]*\.)?ultram\.cjb\.net
@@ -4850,10 +4955,12 @@ https?:\/\/([^\/]*\.)?valium\.webzdarma\.cz
 https?:\/\/([^\/]*\.)?valiumpharm\.home\.ro
 https?:\/\/([^\/]*\.)?valiumsource\.com
 https?:\/\/([^\/]*\.)?valoan\.chat\.ru
+https?:\/\/([^\/]*\.)?valtrex\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?valtrex\.chat\.ru
 https?:\/\/([^\/]*\.)?valtrex\.noneto\.com
 https?:\/\/([^\/]*\.)?valtrex\.rx4\.org
 https?:\/\/([^\/]*\.)?vancomycin\.rx4\.org
+https?:\/\/([^\/]*\.)?vaniqa\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?vaniqa\.chat\.ru
 https?:\/\/([^\/]*\.)?vaniqa\.rx4\.org
 https?:\/\/([^\/]*\.)?vardenafil\.rx4\.org
@@ -4879,8 +4986,10 @@ https?:\/\/([^\/]*\.)?viagra-mail\.iredirector\.com
 https?:\/\/([^\/]*\.)?viagra-order\.iredirector\.com
 https?:\/\/([^\/]*\.)?viagra-pfizer\.iredirector\.com
 https?:\/\/([^\/]*\.)?viagra-site\.tripod\.com
+https?:\/\/([^\/]*\.)?viagra-soft-tabs\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?viagra-verkauf\.iredirector\.com
 https?:\/\/([^\/]*\.)?viagra-wirkung\.iredirector\.com
+https?:\/\/([^\/]*\.)?viagra\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?viagra\.b6\.to
 https?:\/\/([^\/]*\.)?viagra\.chat\.ru
 https?:\/\/([^\/]*\.)?viagra\.esmartbuyer\.com
@@ -4906,14 +5015,17 @@ https?:\/\/([^\/]*\.)?vicodin\.za\.pl
 https?:\/\/([^\/]*\.)?vicodinonline\.home\.ro
 https?:\/\/([^\/]*\.)?vicoprofen\.rx4\.org
 https?:\/\/([^\/]*\.)?video-poker\.cjb\.net
+https?:\/\/([^\/]*\.)?vietnamparadisetravel\.com
 https?:\/\/([^\/]*\.)?view--sex\.com
 https?:\/\/([^\/]*\.)?vigrx\.rx4\.org
 https?:\/\/([^\/]*\.)?vimax\.rx4\.org
 https?:\/\/([^\/]*\.)?violent--sex\.com
+https?:\/\/([^\/]*\.)?vioxx\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?vioxx\.3d-game\.com
 https?:\/\/([^\/]*\.)?vioxx\.chat\.ru
 https?:\/\/([^\/]*\.)?vioxx\.rx4\.org
 https?:\/\/([^\/]*\.)?virgin-sexy\.com
+https?:\/\/([^\/]*\.)?vitalitymax\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?vitamin\.chat\.ru
 https?:\/\/([^\/]*\.)?vivaful\.com
 https?:\/\/([^\/]*\.)?vod-solutions\.com
@@ -4972,7 +5084,9 @@ https?:\/\/([^\/]*\.)?webuspharmacy\.lidonet\.net
 https?:\/\/([^\/]*\.)?wecony\.com
 https?:\/\/([^\/]*\.)?wedding-knot\.com
 https?:\/\/([^\/]*\.)?weekly-pay\.com
+https?:\/\/([^\/]*\.)?weight-loss\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?welded-wire-mesh\.com
+https?:\/\/([^\/]*\.)?wellbutrin\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?wellbutrin\.chat\.ru
 https?:\/\/([^\/]*\.)?wellbutrin\.fromru\.com
 https?:\/\/([^\/]*\.)?wellbutrin\.rx4\.org
@@ -5216,6 +5330,7 @@ https?:\/\/([^\/]*\.)?xanaxreliable\.com
 https?:\/\/([^\/]*\.)?xanex\.chat\.ru
 https?:\/\/([^\/]*\.)?xeboo\.com
 https?:\/\/([^\/]*\.)?xenadrine\.rx4\.org
+https?:\/\/([^\/]*\.)?xenical\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?xenical\.rx4\.org
 https?:\/\/([^\/]*\.)?xenical\.undonet\.com
 https?:\/\/([^\/]*\.)?xenical\.za\.pl
@@ -5241,6 +5356,7 @@ https?:\/\/([^\/]*\.)?xnan2\.91x\.net
 https?:\/\/([^\/]*\.)?xolair\.rx4\.org
 https?:\/\/([^\/]*\.)?xrnet\.cn
 https?:\/\/([^\/]*\.)?xsjby\.cn
+https?:\/\/([^\/]*\.)?xt168\.com
 https?:\/\/([^\/]*\.)?xudianchi\.sinoar\.com\.cn
 https?:\/\/([^\/]*\.)?xunizhuji\.51\.net
 https?:\/\/([^\/]*\.)?xuzhouren\.com
@@ -5254,6 +5370,7 @@ https?:\/\/([^\/]*\.)?ya-ke\.net
 https?:\/\/([^\/]*\.)?yanchanghui\.51\.net
 https?:\/\/([^\/]*\.)?yasicn\.51\.net
 https?:\/\/([^\/]*\.)?yasipeixun\.51\.net
+https?:\/\/([^\/]*\.)?yasmin\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?yasmin\.rx4\.org
 https?:\/\/([^\/]*\.)?ychzn\.com
 https?:\/\/([^\/]*\.)?yeeyoo\.com
@@ -5288,6 +5405,7 @@ https?:\/\/([^\/]*\.)?yokohama-tire\.boom\.ru
 https?:\/\/([^\/]*\.)?yomilf\.com
 https?:\/\/([^\/]*\.)?youll\.com\.cn
 https?:\/\/([^\/]*\.)?young--fuckers\.com
+https?:\/\/([^\/]*\.)?youngshemalesex\.com
 https?:\/\/([^\/]*\.)?youqicn\.51\.net
 https?:\/\/([^\/]*\.)?your--sex\.com
 https?:\/\/([^\/]*\.)?your-onlinepharmacy\.com
@@ -5301,7 +5419,9 @@ https?:\/\/([^\/]*\.)?yuzhiguang\.com
 https?:\/\/([^\/]*\.)?yx-colorweaving\.com
 https?:\/\/([^\/]*\.)?z--sex\.com
 https?:\/\/([^\/]*\.)?z100\.boom\.ru
+https?:\/\/([^\/]*\.)?z411\.net
 https?:\/\/([^\/]*\.)?zalaszentgrot\.com
+https?:\/\/([^\/]*\.)?zanaflex\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?zanaflex\.chat\.ru
 https?:\/\/([^\/]*\.)?zanaflex\.rx4\.org
 https?:\/\/([^\/]*\.)?zantac\.rx4\.org
@@ -5310,6 +5430,7 @@ https?:\/\/([^\/]*\.)?zaraza\.za\.pl
 https?:\/\/([^\/]*\.)?zcfounder\.com
 https?:\/\/([^\/]*\.)?zchb\.com
 https?:\/\/([^\/]*\.)?zctq\.com
+https?:\/\/([^\/]*\.)?zebutal\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?zebutal\.chat\.ru
 https?:\/\/([^\/]*\.)?zelnorm\.rx4\.org
 https?:\/\/([^\/]*\.)?zenical\.rx4\.org
@@ -5360,6 +5481,7 @@ https?:\/\/([^\/]*\.)?znpp\.com
 https?:\/\/([^\/]*\.)?zocor\.chat\.ru
 https?:\/\/([^\/]*\.)?zocor\.rx4\.org
 https?:\/\/([^\/]*\.)?zocor\.sinfree\.net
+https?:\/\/([^\/]*\.)?zoloft\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?zoloft\.bebto\.com
 https?:\/\/([^\/]*\.)?zoloft\.chat\.ru
 https?:\/\/([^\/]*\.)?zoloft\.rx4\.org
@@ -5386,12 +5508,14 @@ https?:\/\/([^\/]*\.)?zyban-buy-8\.atspace\.com
 https?:\/\/([^\/]*\.)?zyban-order-6\.atspace\.com
 https?:\/\/([^\/]*\.)?zyban-pills-6\.atspace\.com
 https?:\/\/([^\/]*\.)?zyban-pills-8\.atspace\.com
+https?:\/\/([^\/]*\.)?zyban\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?zyban\.chat\.ru
 https?:\/\/([^\/]*\.)?zyban\.rx4\.org
 https?:\/\/([^\/]*\.)?zydone\.rx4\.org
 https?:\/\/([^\/]*\.)?zygua\.com
 https?:\/\/([^\/]*\.)?zyname\.com
 https?:\/\/([^\/]*\.)?zyprexa\.rx4\.org
+https?:\/\/([^\/]*\.)?zyrtec\.1\.p2l\.info
 https?:\/\/([^\/]*\.)?zyrtec\.chat\.ru
 https?:\/\/([^\/]*\.)?zyrtec\.rx4\.org
 https?:\/\/([^\/]*\.)?zytemp\.com\.cn
diff --git a/data/.htaccess b/data/media/.htaccess
index 9c96d3742..9c96d3742 100644
--- a/data/.htaccess
+++ b/data/media/.htaccess
diff --git a/media/wiki/dokuwiki-128.png b/data/media/wiki/dokuwiki-128.png
index b2306ac95..b2306ac95 100644
--- a/media/wiki/dokuwiki-128.png
+++ b/data/media/wiki/dokuwiki-128.png
diff --git a/media/.htaccess b/data/pages/.htaccess
index 9c96d3742..9c96d3742 100644
--- a/media/.htaccess
+++ b/data/pages/.htaccess
diff --git a/data/wiki/dokuwiki.txt b/data/pages/wiki/dokuwiki.txt
index 658a08007..ba3b429cd 100644
--- a/data/wiki/dokuwiki.txt
+++ b/data/pages/wiki/dokuwiki.txt
@@ -8,7 +8,7 @@ DokuWiki is available at http://www.splitbrain.org/go/dokuwiki
 
 ===== Read More =====
 
-All documentation and additional information besides the [[syntax|syntax description]] is now maintained in the DokuWiki at [[doku>wiki:dokuwiki|splitbrain]] only and not included in the releases anymore.
+All documentation and additional information besides the [[syntax|syntax description]] is maintained in the DokuWiki at [[doku>wiki:dokuwiki|wiki.splitbrain.org]].
 
   * [[doku>wiki:news|News and Announcements]]
   * [[doku>wiki:features|Features]]
@@ -29,7 +29,7 @@ All documentation and additional information besides the [[syntax|syntax descrip
   * [[doku>wiki:mailinglist|Mailing List]]
 
   * [[doku>wiki:todo|ToDo List]]
-  * [[doku>wiki:development|Development Ressources]]
+  * [[doku>wiki:development|Development Resources]]
   * [[doku>wiki:changes|Change Log]]
   * [[doku>wiki:thanks|Thanks]]
 
diff --git a/data/wiki/syntax.txt b/data/pages/wiki/syntax.txt
index 6ae657568..924eed449 100644
--- a/data/wiki/syntax.txt
+++ b/data/pages/wiki/syntax.txt
@@ -68,9 +68,9 @@ Notes:
 
 ==== Interwiki ====
 
-DokuWiki supports [[doku>wiki:interwiki]] links. These are quick links to other Wikis. For example this is a link to Wikipedia's page about Wikis: [[wp>Wiki]].
+DokuWiki supports [[doku>wiki:interwiki|Interwiki]] links. These are quick links to other Wikis. For example this is a link to Wikipedia's page about Wikis: [[wp>Wiki]].
 
-  DokuWiki supports [[doku>wiki:interwiki]] links. These are quick links to other Wikis.
+  DokuWiki supports [[doku>wiki:interwiki|Interwiki]] links. These are quick links to other Wikis.
   For example this is a link to Wikipedia's page about Wikis: [[wp>Wiki]].
 
 ==== Windows Shares ====
diff --git a/feed.php b/feed.php
index 8b24d2d28..96263c5b8 100644
--- a/feed.php
+++ b/feed.php
@@ -51,12 +51,12 @@
   $rss = new DokuWikiFeedCreator();
   $rss->title = $conf['title'];
   $rss->link  = DOKU_URL;
-  $rss->syndicationURL = DOKU_URL.'/feed.php';
-  $rss->cssStyleSheet  = DOKU_URL.'/feed.css';
+  $rss->syndicationURL = DOKU_URL.'feed.php';
+  $rss->cssStyleSheet  = DOKU_URL.'lib/styles/feed.css';
 
   $image = new FeedImage();
   $image->title = $conf['title'];
-  $image->url = DOKU_URL."images/favicon.ico";
+  $image->url = DOKU_URL."lib/images/favicon.ico";
   $image->link = DOKU_URL;
   $rss->image = $image;
 
@@ -77,7 +77,14 @@
  * @author Andreas Gohr <andi@splitbrain.org>
  */
 function rssRecentChanges(&$rss,$num,$ltype){
+  global $conf;
+	if(!$num) $num = $conf['recent'];
+
   $recents = getRecents(0,$num);
+
+  //this can take some time if a lot of recaching has to be done
+  @set_time_limit(90); // set max execution time
+
   foreach(array_keys($recents) as $id){
     $desc = cleanDesc(p_wiki_xhtml($id,'',false));
     $item = new FeedItem();
@@ -109,9 +116,6 @@ function rssRecentChanges(&$rss,$num,$ltype){
     }
     $item->author  .= $recents[$id]['ip'];
     $rss->addItem($item);
-
-    //this can take some time if a lot of recaching has to be done
-    @set_time_limit(30); //reset execution time
   }
 }
 
@@ -121,7 +125,7 @@ function rssRecentChanges(&$rss,$num,$ltype){
  * @author Andreas Gohr <andi@splitbrain.org>
  */
 function rssListNamespace(&$rss,$ns){
-  require_once("inc/search.php");
+  require_once(DOKU_INC.'inc/search.php');
   global $conf;
 
   $ns=':'.cleanID($ns);
diff --git a/inc/actions.php b/inc/actions.php
index 25a2e14c2..aef63b94c 100644
--- a/inc/actions.php
+++ b/inc/actions.php
@@ -69,7 +69,7 @@ function act_dispatch(){
 
   //call template FIXME: all needed vars available?
   header('Content-Type: text/html; charset=utf-8'); 
-  include(DOKU_INC.'tpl/'.$conf['template'].'/main.php');
+  include(DOKU_INC.'lib/tpl/'.$conf['template'].'/main.php');
   // output for the commands is now handled in inc/templates.php
   // in function tpl_content()
 }
diff --git a/inc/admin_acl.php b/inc/admin_acl.php
index fcf9d9ae3..15332b3b4 100644
--- a/inc/admin_acl.php
+++ b/inc/admin_acl.php
@@ -43,7 +43,7 @@ function admin_acl_handler(){
   }
 
   // reload ACL config
-  $AUTH_ACL = file('conf/acl.auth.php');
+  $AUTH_ACL = file(DOKU_INC.'conf/acl.auth.php');
 }
 
 /**
@@ -117,7 +117,7 @@ function get_acl_config($id){
  * @author  Frank Schubert <frank@schokilade.de>
  */
 function admin_acl_add($acl_scope, $acl_user, $acl_level){
-  $acl_config = join("",file('conf/acl.auth.php'));
+  $acl_config = join("",file(DOKU_INC.'conf/acl.auth.php'));
   
   // max level for pagenames is edit
   if(strpos($acl_scope,'*') === false) {
@@ -128,7 +128,7 @@ function admin_acl_add($acl_scope, $acl_user, $acl_level){
   
   $new_config = $acl_config.$new_acl;
   
-  return io_saveFile("conf/acl.auth.php", $new_config);
+  return io_saveFile(DOKU_INC.'conf/acl.auth.php', $new_config);
 }
 
 /**
@@ -137,14 +137,14 @@ function admin_acl_add($acl_scope, $acl_user, $acl_level){
  * @author  Frank Schubert <frank@schokilade.de>
  */
 function admin_acl_del($acl_scope, $acl_user){
-  $acl_config = file('conf/acl.auth.php');
+  $acl_config = file(DOKU_INC.'conf/acl.auth.php');
 
   $acl_pattern = '^'.preg_quote($acl_scope,'/').'\s+'.$acl_user.'\s+[0-8].*$';
   
   // save all non!-matching #FIXME invert is available from 4.2.0 only!
   $new_config = preg_grep("/$acl_pattern/", $acl_config, PREG_GREP_INVERT);
   
-  return io_saveFile("conf/acl.auth.php", join("",$new_config));
+  return io_saveFile(DOKU_INC.'conf/acl.auth.php', join('',$new_config));
 }
 
 // --- HTML OUTPUT FUNCTIONS BELOW --- //
diff --git a/inc/auth.php b/inc/auth.php
index a55cfbc51..863bb3c49 100644
--- a/inc/auth.php
+++ b/inc/auth.php
@@ -15,7 +15,7 @@
   require_once(DOKU_INC.'inc/blowfish.php');
   require_once(DOKU_INC.'inc/mail.php');
   // load the the auth functions
-  require_once(DOKU_INC.'inc/auth_'.$conf['authtype'].'.php');
+  require_once(DOKU_INC.'inc/auth/'.$conf['authtype'].'.php');
 
   // some ACL level defines
   define('AUTH_NONE',0);
@@ -29,7 +29,7 @@
   if($conf['useacl']){
     auth_login($_REQUEST['u'],$_REQUEST['p'],$_REQUEST['r']);
     //load ACL into a global array
-    $AUTH_ACL = file('conf/acl.auth.php');
+    $AUTH_ACL = file(DOKU_INC.'conf/acl.auth.php');
   }
 
 /**
diff --git a/inc/auth_ldap.php b/inc/auth/ldap.php
index 2f0f4f1ff..2f0f4f1ff 100644
--- a/inc/auth_ldap.php
+++ b/inc/auth/ldap.php
diff --git a/inc/auth_mysql.php b/inc/auth/mysql.php
index 758fe3b77..758fe3b77 100644
--- a/inc/auth_mysql.php
+++ b/inc/auth/mysql.php
diff --git a/inc/auth_pgsql.php b/inc/auth/pgsql.php
index b063f405e..b063f405e 100644
--- a/inc/auth_pgsql.php
+++ b/inc/auth/pgsql.php
diff --git a/inc/auth_plain.php b/inc/auth/plain.php
index 55e1fa9f6..eaa01b79d 100644
--- a/inc/auth_plain.php
+++ b/inc/auth/plain.php
@@ -73,7 +73,7 @@ function auth_createUser($user,$pass,$name,$mail){
                              $mail,
                              $conf['defaultgroup']));
   $userline .= "\n";
-  $fh = fopen('conf/users.auth.php','a');
+  $fh = fopen(DOKU_INC.'conf/users.auth.php','a');
   if($fh){
     fwrite($fh,$userline);
     fclose($fh);
@@ -93,7 +93,7 @@ function auth_createUser($user,$pass,$name,$mail){
  */
 function auth_plain_loadUserData(){
   $data = array();
-  $lines = file('conf/users.auth.php');
+  $lines = file(DOKU_INC.'conf/users.auth.php');
   foreach($lines as $line){
     $line = preg_replace('/#.*$/','',$line); //ignore comments
     $line = trim($line);
diff --git a/inc/common.php b/inc/common.php
index 162a1a8e4..99cec10a9 100644
--- a/inc/common.php
+++ b/inc/common.php
@@ -105,7 +105,11 @@ function msg($message,$lvl=0){
   }else{
     $MSG = array();
     $MSG[]=array('lvl' => $errors[$lvl], 'msg' => $message);
-    html_msgarea();
+    if(function_exists('html_msgarea')){
+      html_msgarea();
+    }else{
+      print "ERROR($lvl) $message";
+    }
   }
 }
 
@@ -244,7 +248,7 @@ function checkwordblock(){
 
   if(!$conf['usewordblock']) return false;
 
-  $blockfile = file('conf/wordblock.conf');
+  $blockfile = file(DOKU_INC.'conf/wordblock.conf');
   //how many lines to read at once (to work around some PCRE limits)
   if(version_compare(phpversion(),'4.3.0','<')){
     //old versions of PCRE define a maximum of parenthesises even if no
@@ -799,7 +803,7 @@ function check(){
     msg('Mediadir is not writable',-1);
   }
 
-  if(is_writable('conf/users.auth.php')){
+  if(is_writable(DOKU_INC.'conf/users.auth.php')){
     msg('conf/users.auth.php is writable',1);
   }else{
     msg('conf/users.auth.php is not writable',0);
diff --git a/inc/html.php b/inc/html.php
index 411e230c7..acdfaecba 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -364,7 +364,7 @@ function html_revisions(){
 
     print $date;
 
-    print ' <img src="'.DOKU_BASE.'images/blank.gif" border="0" width="15" height="11" alt="" /> ';
+    print ' <img src="'.DOKU_BASE.'lib/images/blank.gif" border="0" width="15" height="11" alt="" /> ';
 
     print '<a class="wikilink1" href="'.wl($ID).'">'.$ID.'</a> ';
 
@@ -386,7 +386,7 @@ function html_revisions(){
     print $date;
 
     print ' <a href="'.wl($ID,"rev=$rev,do=diff").'">';
-    print '<img src="'.DOKU_BASE.'images/diff.png" border="0" width="15" height="11" title="'.$lang['diff'].'" />';
+    print '<img src="'.DOKU_BASE.'lib/images/diff.png" border="0" width="15" height="11" title="'.$lang['diff'].'" />';
     print '</a> ';
 
     print '<a class="wikilink1" href="'.wl($ID,"rev=$rev").'">'.$ID.'</a> ';
@@ -438,11 +438,11 @@ function html_recent($first=0){
     print $date.' ';
 
     print '<a href="'.wl($id,"do=diff").'">';
-    print '<img src="'.DOKU_BASE.'images/diff.png" border="0" width="15" height="11" title="'.$lang['diff'].'" />';
+    print '<img src="'.DOKU_BASE.'lib/images/diff.png" border="0" width="15" height="11" title="'.$lang['diff'].'" />';
     print '</a> ';
 
     print '<a href="'.wl($id,"do=revisions").'">';
-    print '<img src="'.DOKU_BASE.'images/history.png" border="0" width="12" height="14" title="'.$lang['btn_revs'].'" />';
+    print '<img src="'.DOKU_BASE.'lib/images/history.png" border="0" width="12" height="14" title="'.$lang['btn_revs'].'" />';
     print '</a> ';
 
     print html_wikilink($id,$id);
@@ -848,29 +848,29 @@ function html_edit($text=null,$include='edit'){ //FIXME: include needed?
           <?/* sets changed to true when previewed */?>
           textChanged = <? ($pr) ? print 'true' : print 'false' ?>;
           
-          formatButton('images/bold.png','<?=$lang['qb_bold']?>','**','**','<?=$lang['qb_bold']?>','b');
-          formatButton('images/italic.png','<?=$lang['qb_italic']?>',"\/\/","\/\/",'<?=$lang['qb_italic']?>','i');
-          formatButton('images/underline.png','<?=$lang['qb_underl']?>','__','__','<?=$lang['qb_underl']?>','u');
-          formatButton('images/code.png','<?=$lang['qb_code']?>','\'\'','\'\'','<?=$lang['qb_code']?>','c');
+          formatButton('bold.png','<?=$lang['qb_bold']?>','**','**','<?=$lang['qb_bold']?>','b');
+          formatButton('italic.png','<?=$lang['qb_italic']?>',"\/\/","\/\/",'<?=$lang['qb_italic']?>','i');
+          formatButton('underline.png','<?=$lang['qb_underl']?>','__','__','<?=$lang['qb_underl']?>','u');
+          formatButton('code.png','<?=$lang['qb_code']?>','\'\'','\'\'','<?=$lang['qb_code']?>','c');
 
-          formatButton('images/fonth1.png','<?=$lang['qb_h1']?>','====== ',' ======\n','<?=$lang['qb_h1']?>','1');
-          formatButton('images/fonth2.png','<?=$lang['qb_h2']?>','===== ',' =====\n','<?=$lang['qb_h2']?>','2');
-          formatButton('images/fonth3.png','<?=$lang['qb_h3']?>','==== ',' ====\n','<?=$lang['qb_h3']?>','3');
-          formatButton('images/fonth4.png','<?=$lang['qb_h4']?>','=== ',' ===\n','<?=$lang['qb_h4']?>','4');
-          formatButton('images/fonth5.png','<?=$lang['qb_h5']?>','== ',' ==\n','<?=$lang['qb_h5']?>','5');
+          formatButton('fonth1.png','<?=$lang['qb_h1']?>','====== ',' ======\n','<?=$lang['qb_h1']?>','1');
+          formatButton('fonth2.png','<?=$lang['qb_h2']?>','===== ',' =====\n','<?=$lang['qb_h2']?>','2');
+          formatButton('fonth3.png','<?=$lang['qb_h3']?>','==== ',' ====\n','<?=$lang['qb_h3']?>','3');
+          formatButton('fonth4.png','<?=$lang['qb_h4']?>','=== ',' ===\n','<?=$lang['qb_h4']?>','4');
+          formatButton('fonth5.png','<?=$lang['qb_h5']?>','== ',' ==\n','<?=$lang['qb_h5']?>','5');
 
-          formatButton('images/link.png','<?=$lang['qb_link']?>','[[',']]','<?=$lang['qb_link']?>','l');
-          formatButton('images/extlink.png','<?=$lang['qb_extlink']?>','[[',']]','http://www.example.com|<?=$lang['qb_extlink']?>');
+          formatButton('link.png','<?=$lang['qb_link']?>','[[',']]','<?=$lang['qb_link']?>','l');
+          formatButton('extlink.png','<?=$lang['qb_extlink']?>','[[',']]','http://www.example.com|<?=$lang['qb_extlink']?>');
 
-          formatButton('images/list.png','<?=$lang['qb_ol']?>','  - ','\n','<?=$lang['qb_ol']?>');
-          formatButton('images/list_ul.png','<?=$lang['qb_ul']?>','  * ','\n','<?=$lang['qb_ul']?>');
+          formatButton('list.png','<?=$lang['qb_ol']?>','  - ','\n','<?=$lang['qb_ol']?>');
+          formatButton('list_ul.png','<?=$lang['qb_ul']?>','  * ','\n','<?=$lang['qb_ul']?>');
 
-          insertButton('images/rule.png','<?=$lang['qb_hr']?>','----\n');
-          mediaButton('images/image.png','<?=$lang['qb_media']?>','m','<?=$INFO['namespace']?>');
+          insertButton('rule.png','<?=$lang['qb_hr']?>','----\n');
+          mediaButton('image.png','<?=$lang['qb_media']?>','m','<?=$INFO['namespace']?>');
 
           <?
           if($conf['useacl'] && $_SERVER['REMOTE_USER']){
-            echo "insertButton('images/sig.png','".$lang['qb_sig']."','".html_signature()."','y');";
+            echo "insertButton('sig.png','".$lang['qb_sig']."','".html_signature()."','y');";
           }
           ?>
         </script>
diff --git a/inc/init.php b/inc/init.php
index 363518b65..dd5614d42 100644
--- a/inc/init.php
+++ b/inc/init.php
@@ -30,14 +30,14 @@
   if(!defined('DOKU_URL'))  define('DOKU_URL',getBaseURL(true));
 
   // define Plugin dir
-  if(!defined('DOKU_PLUGIN'))  define('DOKU_PLUGIN',DOKU_INC.'inc/plugins/');
+  if(!defined('DOKU_PLUGIN'))  define('DOKU_PLUGIN',DOKU_INC.'lib/plugins/');
 
   // define main script
   if(!defined('DOKU_SCRIPT')) define('DOKU_SCRIPT','doku.php');
 
   // define Template baseURL
   if(!defined('DOKU_TPL')) define('DOKU_TPL',
-                                  DOKU_BASE.'tpl/'.$conf['template'].'/');
+                                  DOKU_BASE.'lib/tpl/'.$conf['template'].'/');
 
   // make session rewrites XHTML compliant
   @ini_set('arg_separator.output', '&amp;');
@@ -72,16 +72,29 @@
   }
 
   // make real paths and check them
-  $conf['datadir']       = realpath($conf['datadir']);
+  $conf['datadir']       = init_path($conf['datadir']);
   if(!$conf['datadir'])    die('Wrong datadir! Check config!');
-  $conf['olddir']        = realpath($conf['olddir']);
+  $conf['olddir']        = init_path($conf['olddir']);
   if(!$conf['olddir'])     die('Wrong olddir! Check config!');
-  $conf['mediadir']      = realpath($conf['mediadir']);
+  $conf['mediadir']      = init_path($conf['mediadir']);
   if(!$conf['mediadir'])   die('Wrong mediadir! Check config!');
 
   // automatic upgrade to script versions of certain files
-  scriptify('conf/users.auth');
-  scriptify('conf/acl.auth');
+  scriptify(DOKU_INC.'conf/users.auth');
+  scriptify(DOKU_INC.'conf/acl.auth');
+
+
+/**
+ * returns absolute path
+ *
+ * This tries the given past first, then checks in DOKU_INC
+ */
+function init_path($path){
+  $p = realpath($path);
+  if($p) return $p;
+  $p = realpath(DOKU_INC.$path);
+  return $p;
+}
 
 /**
  * remove magic quotes recursivly
@@ -123,6 +136,9 @@ function getBaseURL($abs=false){
 
   $dir = str_replace('\\','/',$dir); #bugfix for weird WIN behaviour
   $dir = preg_replace('#//+#','/',$dir);
+  
+  //handle script in lib/exe dir
+  $dir = preg_replace('!lib/exe/$!','',$dir);
 
   //finish here for relative URLs
   if(!$abs) return $dir;
diff --git a/inc/io.php b/inc/io.php
index 3981757da..a3e5f85c4 100644
--- a/inc/io.php
+++ b/inc/io.php
@@ -10,55 +10,6 @@
   require_once(DOKU_INC.'inc/common.php');
 
 /**
- * Returns the parsed text from the given sourcefile. Uses cache
- * if exists. Creates it if not.
- *
- * @author  Andreas Gohr <andi@splitbrain.org>
- * @deprecated -> parserutils
- */
-function io_cacheParse($file){
-  trigger_error("deprecated io_cacheParse called");
-
-  global $conf;
-  global $CACHEGROUP;
-  global $parser; //we read parser options
-  $parsed = '';
-  $cache  = $conf['datadir'].'/_cache/';
-  $cache .= md5($file.$_SERVER['HTTP_HOST'].$_SERVER['SERVER_PORT'].$CACHEGROUP);
-  $purge  = $conf['datadir'].'/_cache/purgefile';
-
-  // check if cache can be used
-  $cachetime = @filemtime($cache);
-
-  if(   @file_exists($cache)                          // does the cachefile exist
-     && @file_exists($file)                           // and does the source exist
-     && !isset($_REQUEST['purge'])                    // no purge param was set
-     && filesize($cache)                              // and contains the cachefile any data
-     && ((time() - $cachetime) < $conf['cachetime'])  // and is cachefile young enough
-     && ($cachetime > filemtime($file))               // and newer than the source
-     && ($cachetime > @filemtime($purge))             // and newer than the purgefile
-     && ($cachetime > filemtime('conf/dokuwiki.php')) // and newer than the config file
-     && ($cachetime > @filemtime('conf/local.php'))   // and newer than the local config file
-     && ($cachetime > filemtime('inc/parser.php'))    // and newer than the parser
-     && ($cachetime > filemtime('inc/format.php')))   // and newer than the formating functions
-  {
-    $parsed  = io_readFile($cache); //give back cache
-    $parsed .= "\n<!-- cachefile $cache used -->\n";
-  }elseif(@file_exists($file)){
-    $parsed = parse(io_readFile($file)); //sets global parseroptions
-    if($parser['cache']){
-      io_saveFile($cache,$parsed); //save cachefile
-      $parsed .= "\n<!-- no cachefile used, but created -->\n";
-    }else{
-      @unlink($cache); //try to delete cachefile
-      $parsed .= "\n<!-- no cachefile used, caching forbidden -->\n";
-    }
-  }
-
-  return $parsed;
-}
-
-/**
  * Removes empty directories
  *
  * @todo use safemode hack
diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php
index 5c3c8f86e..dde735b2f 100644
--- a/inc/parser/xhtml.php
+++ b/inc/parser/xhtml.php
@@ -73,8 +73,8 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
 /*      The (+/-) version will work too but needs some CSS tweaking to look fine */
 /*      $this->doc .= ' <script type="text/javascript">showTocToggle("+","-")';*/
         $this->doc .=  '<script type="text/javascript">showTocToggle(';
-        $this->doc .=    '\'<img src="'.DOKU_BASE.'images/arrow_down.png">\',';
-        $this->doc .=    '\'<img src="'.DOKU_BASE.'images/arrow_up.png">\')';
+        $this->doc .=    '\'<img src="'.DOKU_BASE.'lib/images/arrow_down.png">\',';
+        $this->doc .=    '\'<img src="'.DOKU_BASE.'lib/images/arrow_up.png">\')';
         $this->doc .=  '</script>';
         $this->doc .= $lang['toc'];
         $this->doc .= '</div>'.DOKU_LF;
@@ -376,12 +376,10 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
         }
     }
     
-    /**
-    */
     function smiley($smiley) {
         if ( array_key_exists($smiley, $this->smileys) ) {
             $title = $this->_xmlEntities($this->smileys[$smiley]);
-            $this->doc .= '<img src="'.DOKU_BASE.'smileys/'.$this->smileys[$smiley].
+            $this->doc .= '<img src="'.DOKU_BASE.'lib/images/smileys/'.$this->smileys[$smiley].
                 '" align="middle" alt="'.
                     $this->_xmlEntities($smiley).'" />';
         } else {
@@ -389,7 +387,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
         }
     }
     
-    /**
+    /*
     * not used
     function wordblock($word) {
         if ( array_key_exists($word, $this->badwords) ) {
@@ -566,10 +564,10 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
        
         if(!$isImage){
             //if ico exists set additional style
-            if(@file_exists(DOKU_INC.'interwiki/'.$wikiName.'.png')){
-                $link['style']='background-image: url('.DOKU_BASE.'interwiki/'.$wikiName.'.png)';
+            if(@file_exists(DOKU_INC.'lib/images/interwiki/'.$wikiName.'.png')){
+                $link['style']='background-image: url('.DOKU_BASE.'lib/images/interwiki/'.$wikiName.'.png)';
             }elseif(@file_exists(DOKU_INC.'interwiki/'.$wikiName.'.gif')){
-                $link['style']='background-image: url('.DOKU_BASE.'interwiki/'.$wikiName.'.gif)';
+                $link['style']='background-image: url('.DOKU_BASE.'lib/images/interwiki/'.$wikiName.'.gif)';
             }
         }
 
@@ -714,7 +712,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
         $link['target'] = $conf['target']['media'];
 
         $link['title']  = $this->_xmlEntities($src);
-        $link['url']    = DOKU_BASE.'fetch.php?cache='.$cache.'&amp;media='.urlencode($src);
+        $link['url']    = DOKU_BASE.'lib/exe/fetch.php?cache='.$cache.'&amp;media='.urlencode($src);
         $link['name']   = $this->_media ($src, $title, $align, $width, $height, $cache);
 
 
@@ -738,7 +736,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
         $link['target'] = $conf['target']['media'];
 
         $link['title']  = $this->_xmlEntities($src);
-        $link['url']    = DOKU_BASE.'fetch.php?cache='.$cache.'&amp;media='.urlencode($src);
+        $link['url']    = DOKU_BASE.'lib/exe/fetch.php?cache='.$cache.'&amp;media='.urlencode($src);
         $link['name']   = $this->_media ($src, $title, $align, $width, $height, $cache);
 
 
@@ -893,7 +891,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
         list($ext,$mime) = mimetype($src);
         if(substr($mime,0,5) == 'image'){
             //add image tag
-            $ret .= '<img src="'.DOKU_BASE.'fetch.php?w='.$width.'&amp;h='.$height.
+            $ret .= '<img src="'.DOKU_BASE.'lib/exe/fetch.php?w='.$width.'&amp;h='.$height.
                     '&amp;cache='.$cache.'&amp;media='.urlencode($src).'"';
             
             $ret .= ' class="media'.$align.'"';
@@ -919,9 +917,9 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
             if ( !is_null($width) ) $ret .= ' width="'.$this->_xmlEntities($width).'"';
             if ( !is_null($height) ) $ret .= ' height="'.$this->_xmlEntities($height).'"';
             $ret .= '>'.DOKU_LF;
-            $ret .= '<param name="movie" value="'.DOKU_BASE.'fetch.php?media='.urlencode($src).'" />'.DOKU_LF;
+            $ret .= '<param name="movie" value="'.DOKU_BASE.'lib/exe/fetch.php?media='.urlencode($src).'" />'.DOKU_LF;
             $ret .= '<param name="quality" value="high" />'.DOKU_LF;
-            $ret .= '<embed src="'.DOKU_BASE.'fetch.php?media='.urlencode($src).'"'.
+            $ret .= '<embed src="'.DOKU_BASE.'lib/exe/fetch.php?media='.urlencode($src).'"'.
                     ' quality="high"';
             if ( !is_null($width) ) $ret .= ' width="'.$this->_xmlEntities($width).'"';
             if ( !is_null($height) ) $ret .= ' height="'.$this->_xmlEntities($height).'"';
diff --git a/inc/template.php b/inc/template.php
index 11a1112d0..43c224926 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -145,7 +145,7 @@ function tpl_metaheaders(){
   ptln('<link rel="alternate" type="application/rss+xml" title="Current Namespace" href="'.DOKU_BASE.'feed.php?mode=list&amp;ns='.$INFO['namespace'].'" />',$it);
   ptln('<link rel="alternate" type="text/html" title="Plain HTML" href="'.wl($ID,'do=export_html').'" />',$it);
   ptln('<link rel="alternate" type="text/plain" title="Wiki Markup" href="'.wl($ID, 'do=export_raw').'" />',$it);
-  ptln('<link rel="stylesheet" media="screen" type="text/css" href="'.DOKU_BASE.'style.css" />',$it);
+  ptln('<link rel="stylesheet" media="screen" type="text/css" href="'.DOKU_BASE.'lib/styles/style.css" />',$it);
 
   // setup robot tags apropriate for different modes
   if( ($ACT=='show' || $ACT=='export_html') && !$REV){
@@ -172,9 +172,12 @@ function tpl_metaheaders(){
   ptln('</script>',$it);
  
   // load the default JavaScript files
-  ptln('<script language="JavaScript" type="text/javascript" src="'.DOKU_BASE.'script.js"></script>',$it);
-  ptln('<script language="JavaScript" type="text/javascript" src="'.DOKU_BASE.'tw-sack.js"></script>',$it);
-  ptln('<script language="JavaScript" type="text/javascript" src="'.DOKU_BASE.'ajax.js"></script>',$it);
+  ptln('<script language="JavaScript" type="text/javascript" src="'.
+       DOKU_BASE.'lib/scripts/script.js"></script>',$it);
+  ptln('<script language="JavaScript" type="text/javascript" src="'.
+       DOKU_BASE.'lib/scripts/tw-sack.js"></script>',$it);
+  ptln('<script language="JavaScript" type="text/javascript" src="'.
+       DOKU_BASE.'lib/scripts/ajax.js"></script>',$it);
 
   //FIXME include some default CSS ? IE FIX?
 }
@@ -571,9 +574,9 @@ function tpl_mediafilelist(){
       $ask  = $lang['del_confirm'].'\\n';
       $ask .= $item['id'];
 
-      $del = '<a href="media.php?delete='.urlencode($item['id']).'" '.
+      $del = '<a href="'.DOKU_BASE.'lib/exe/media.php?delete='.urlencode($item['id']).'" '.
              'onclick="return confirm(\''.$ask.'\')" onkeypress="return confirm(\''.$ask.'\')">'.
-             '<img src="'.DOKU_BASE.'images/del.png" alt="'.$lang['btn_delete'].'" '.
+             '<img src="'.DOKU_BASE.'lib/images/del.png" alt="'.$lang['btn_delete'].'" '.
              'align="bottom" title="'.$lang['btn_delete'].'" /></a>';
     }else{
       $del = '';
@@ -589,9 +592,9 @@ function tpl_mediafilelist(){
       ptln('<a href="javascript:mediaSelect(\''.$item['id'].'\')">');
 
       if($w>120){
-        print '<img src="'.DOKU_BASE.'fetch.php?w=120&amp;media='.urlencode($item['id']).'" width="120" />';
+        print '<img src="'.DOKU_BASE.'lib/exe/fetch.php?w=120&amp;media='.urlencode($item['id']).'" width="120" />';
       }else{
-        print '<img src="'.DOKU_BASE.'fetch.php?media='.urlencode($item['id']).'" width="'.$w.'" height="'.$h.'" />';
+        print '<img src="'.DOKU_BASE.'lib/exe/fetch.php?media='.urlencode($item['id']).'" width="'.$w.'" height="'.$h.'" />';
       }
       print '</a>';
 
diff --git a/ajax.php b/lib/exe/ajax.php
index 2336c314d..dfe0d2ceb 100644
--- a/ajax.php
+++ b/lib/exe/ajax.php
@@ -11,7 +11,7 @@ if(!count($_POST) && $HTTP_RAW_POST_DATA){
   parse_str($HTTP_RAW_POST_DATA, $_POST);
 }
 
-if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__)).'/');
+if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../../').'/');
 require_once(DOKU_INC.'inc/init.php');
 require_once(DOKU_INC.'inc/common.php');
 require_once(DOKU_INC.'inc/pageutils.php');
diff --git a/fetch.php b/lib/exe/fetch.php
index 3fa8777f1..3fa8777f1 100644
--- a/fetch.php
+++ b/lib/exe/fetch.php
diff --git a/media.php b/lib/exe/media.php
index 3340bae4e..5ca3bd360 100644
--- a/media.php
+++ b/lib/exe/media.php
@@ -43,7 +43,7 @@
 
   //start output and load template
   header('Content-Type: text/html; charset=utf-8');
-  include(DOKU_INC.'tpl/'.$conf['template'].'/media.php');
+  include(DOKU_INC.'lib/tpl/'.$conf['template'].'/lib/exe/media.php');
 
   //restore old umask
   umask($conf['oldumask']);
@@ -123,7 +123,7 @@ function media_upload($NS,$AUTH){
  */
 function media_html_list_namespaces($item){
   $ret  = '';
-  $ret .= '<a href="'.DOKU_BASE.'media.php?ns='.idfilter($item['id']).'" class="idx_dir">';
+  $ret .= '<a href="'.DOKU_BASE.'lib/exe/media.php?ns='.idfilter($item['id']).'" class="idx_dir">';
   $pos = strrpos($item['id'], ':');
   $ret .= substr($item['id'], $pos > 0 ? $pos + 1 : 0);
   $ret .= '</a>';
diff --git a/images/arrow_down.png b/lib/images/arrow_down.png
index cc0ab149c..cc0ab149c 100644
--- a/images/arrow_down.png
+++ b/lib/images/arrow_down.png
diff --git a/images/arrow_up.png b/lib/images/arrow_up.png
index 3031122e5..3031122e5 100644
--- a/images/arrow_up.png
+++ b/lib/images/arrow_up.png
diff --git a/images/blank.gif b/lib/images/blank.gif
index 9935f8210..9935f8210 100644
--- a/images/blank.gif
+++ b/lib/images/blank.gif
diff --git a/images/del.png b/lib/images/del.png
index a3260d718..a3260d718 100644
--- a/images/del.png
+++ b/lib/images/del.png
diff --git a/images/diff.png b/lib/images/diff.png
index 0b98d79ac..0b98d79ac 100644
--- a/images/diff.png
+++ b/lib/images/diff.png
diff --git a/images/error.png b/lib/images/error.png
index ad2ca6ee2..ad2ca6ee2 100644
--- a/images/error.png
+++ b/lib/images/error.png
diff --git a/images/favicon.ico b/lib/images/favicon.ico
index 8b9616abb..8b9616abb 100644
--- a/images/favicon.ico
+++ b/lib/images/favicon.ico
diff --git a/images/history.png b/lib/images/history.png
index ef9e311d3..ef9e311d3 100644
--- a/images/history.png
+++ b/lib/images/history.png
diff --git a/images/info.png b/lib/images/info.png
index ee5f3f5ad..ee5f3f5ad 100644
--- a/images/info.png
+++ b/lib/images/info.png
diff --git a/interwiki/amazon.de.gif b/lib/images/interwiki/amazon.de.gif
index f52c1c581..f52c1c581 100644
--- a/interwiki/amazon.de.gif
+++ b/lib/images/interwiki/amazon.de.gif
diff --git a/interwiki/amazon.gif b/lib/images/interwiki/amazon.gif
index f52c1c581..f52c1c581 100644
--- a/interwiki/amazon.gif
+++ b/lib/images/interwiki/amazon.gif
diff --git a/interwiki/amazon.uk.gif b/lib/images/interwiki/amazon.uk.gif
index f52c1c581..f52c1c581 100644
--- a/interwiki/amazon.uk.gif
+++ b/lib/images/interwiki/amazon.uk.gif
diff --git a/interwiki/bug.gif b/lib/images/interwiki/bug.gif
index 3432b8d57..3432b8d57 100644
--- a/interwiki/bug.gif
+++ b/lib/images/interwiki/bug.gif
diff --git a/interwiki/coral.gif b/lib/images/interwiki/coral.gif
index 0f9f67587..0f9f67587 100644
--- a/interwiki/coral.gif
+++ b/lib/images/interwiki/coral.gif
diff --git a/interwiki/doku.gif b/lib/images/interwiki/doku.gif
index 7dc4248e8..7dc4248e8 100644
--- a/interwiki/doku.gif
+++ b/lib/images/interwiki/doku.gif
diff --git a/interwiki/google.gif b/lib/images/interwiki/google.gif
index fb39f6152..fb39f6152 100644
--- a/interwiki/google.gif
+++ b/lib/images/interwiki/google.gif
diff --git a/interwiki/meatball.gif b/lib/images/interwiki/meatball.gif
index 7ac545436..7ac545436 100644
--- a/interwiki/meatball.gif
+++ b/lib/images/interwiki/meatball.gif
diff --git a/interwiki/phpfn.gif b/lib/images/interwiki/phpfn.gif
index 638d4c450..638d4c450 100644
--- a/interwiki/phpfn.gif
+++ b/lib/images/interwiki/phpfn.gif
diff --git a/interwiki/sb.gif b/lib/images/interwiki/sb.gif
index e272a29b7..e272a29b7 100644
--- a/interwiki/sb.gif
+++ b/lib/images/interwiki/sb.gif
diff --git a/interwiki/wiki.gif b/lib/images/interwiki/wiki.gif
index e8dc5d274..e8dc5d274 100644
--- a/interwiki/wiki.gif
+++ b/lib/images/interwiki/wiki.gif
diff --git a/interwiki/wp.gif b/lib/images/interwiki/wp.gif
index ca853b8c9..ca853b8c9 100644
--- a/interwiki/wp.gif
+++ b/lib/images/interwiki/wp.gif
diff --git a/interwiki/wpde.gif b/lib/images/interwiki/wpde.gif
index ca853b8c9..ca853b8c9 100644
--- a/interwiki/wpde.gif
+++ b/lib/images/interwiki/wpde.gif
diff --git a/interwiki/wpmeta.gif b/lib/images/interwiki/wpmeta.gif
index ca853b8c9..ca853b8c9 100644
--- a/interwiki/wpmeta.gif
+++ b/lib/images/interwiki/wpmeta.gif
diff --git a/images/larger.gif b/lib/images/larger.gif
index e137c92fa..e137c92fa 100644
--- a/images/larger.gif
+++ b/lib/images/larger.gif
diff --git a/images/loading.gif b/lib/images/loading.gif
index 240bd88c5..240bd88c5 100644
--- a/images/loading.gif
+++ b/lib/images/loading.gif
diff --git a/images/smaller.gif b/lib/images/smaller.gif
index 66d3a51e7..66d3a51e7 100644
--- a/images/smaller.gif
+++ b/lib/images/smaller.gif
diff --git a/smileys/delete.gif b/lib/images/smileys/delete.gif
index d668348b9..d668348b9 100644
--- a/smileys/delete.gif
+++ b/lib/images/smileys/delete.gif
diff --git a/smileys/fixme.gif b/lib/images/smileys/fixme.gif
index b66ea99d6..b66ea99d6 100644
--- a/smileys/fixme.gif
+++ b/lib/images/smileys/fixme.gif
diff --git a/smileys/icon_arrow.gif b/lib/images/smileys/icon_arrow.gif
index 2880055cc..2880055cc 100644
--- a/smileys/icon_arrow.gif
+++ b/lib/images/smileys/icon_arrow.gif
diff --git a/smileys/icon_biggrin.gif b/lib/images/smileys/icon_biggrin.gif
index d3527723c..d3527723c 100644
--- a/smileys/icon_biggrin.gif
+++ b/lib/images/smileys/icon_biggrin.gif
diff --git a/smileys/icon_confused.gif b/lib/images/smileys/icon_confused.gif
index 0c49e0698..0c49e0698 100644
--- a/smileys/icon_confused.gif
+++ b/lib/images/smileys/icon_confused.gif
diff --git a/smileys/icon_cool.gif b/lib/images/smileys/icon_cool.gif
index cead0306c..cead0306c 100644
--- a/smileys/icon_cool.gif
+++ b/lib/images/smileys/icon_cool.gif
diff --git a/smileys/icon_cry.gif b/lib/images/smileys/icon_cry.gif
index 7d54b1f99..7d54b1f99 100644
--- a/smileys/icon_cry.gif
+++ b/lib/images/smileys/icon_cry.gif
diff --git a/smileys/icon_doubt.gif b/lib/images/smileys/icon_doubt.gif
index fd7903b19..fd7903b19 100644
--- a/smileys/icon_doubt.gif
+++ b/lib/images/smileys/icon_doubt.gif
diff --git a/smileys/icon_doubt2.gif b/lib/images/smileys/icon_doubt2.gif
index eb4b70b66..eb4b70b66 100644
--- a/smileys/icon_doubt2.gif
+++ b/lib/images/smileys/icon_doubt2.gif
diff --git a/smileys/icon_eek.gif b/lib/images/smileys/icon_eek.gif
index 5d3978106..5d3978106 100644
--- a/smileys/icon_eek.gif
+++ b/lib/images/smileys/icon_eek.gif
diff --git a/smileys/icon_evil.gif b/lib/images/smileys/icon_evil.gif
index ab1aa8e12..ab1aa8e12 100644
--- a/smileys/icon_evil.gif
+++ b/lib/images/smileys/icon_evil.gif
diff --git a/smileys/icon_exclaim.gif b/lib/images/smileys/icon_exclaim.gif
index 6e50e2eec..6e50e2eec 100644
--- a/smileys/icon_exclaim.gif
+++ b/lib/images/smileys/icon_exclaim.gif
diff --git a/smileys/icon_frown.gif b/lib/images/smileys/icon_frown.gif
index d2ac78c04..d2ac78c04 100644
--- a/smileys/icon_frown.gif
+++ b/lib/images/smileys/icon_frown.gif
diff --git a/smileys/icon_fun.gif b/lib/images/smileys/icon_fun.gif
index a8bb8a303..a8bb8a303 100644
--- a/smileys/icon_fun.gif
+++ b/lib/images/smileys/icon_fun.gif
diff --git a/smileys/icon_idea.gif b/lib/images/smileys/icon_idea.gif
index a40ae0d7e..a40ae0d7e 100644
--- a/smileys/icon_idea.gif
+++ b/lib/images/smileys/icon_idea.gif
diff --git a/smileys/icon_kaddi.gif b/lib/images/smileys/icon_kaddi.gif
index 1410f7f1e..1410f7f1e 100644
--- a/smileys/icon_kaddi.gif
+++ b/lib/images/smileys/icon_kaddi.gif
diff --git a/smileys/icon_lol.gif b/lib/images/smileys/icon_lol.gif
index 374ba150f..374ba150f 100644
--- a/smileys/icon_lol.gif
+++ b/lib/images/smileys/icon_lol.gif
diff --git a/smileys/icon_mrgreen.gif b/lib/images/smileys/icon_mrgreen.gif
index b54cd0f94..b54cd0f94 100644
--- a/smileys/icon_mrgreen.gif
+++ b/lib/images/smileys/icon_mrgreen.gif
diff --git a/smileys/icon_neutral.gif b/lib/images/smileys/icon_neutral.gif
index 4f311567e..4f311567e 100644
--- a/smileys/icon_neutral.gif
+++ b/lib/images/smileys/icon_neutral.gif
diff --git a/smileys/icon_question.gif b/lib/images/smileys/icon_question.gif
index 9d072265b..9d072265b 100644
--- a/smileys/icon_question.gif
+++ b/lib/images/smileys/icon_question.gif
diff --git a/smileys/icon_razz.gif b/lib/images/smileys/icon_razz.gif
index 29da2a2fc..29da2a2fc 100644
--- a/smileys/icon_razz.gif
+++ b/lib/images/smileys/icon_razz.gif
diff --git a/smileys/icon_redface.gif b/lib/images/smileys/icon_redface.gif
index ad7628320..ad7628320 100644
--- a/smileys/icon_redface.gif
+++ b/lib/images/smileys/icon_redface.gif
diff --git a/smileys/icon_rolleyes.gif b/lib/images/smileys/icon_rolleyes.gif
index d7f5f2f4b..d7f5f2f4b 100644
--- a/smileys/icon_rolleyes.gif
+++ b/lib/images/smileys/icon_rolleyes.gif
diff --git a/smileys/icon_sad.gif b/lib/images/smileys/icon_sad.gif
index d2ac78c04..d2ac78c04 100644
--- a/smileys/icon_sad.gif
+++ b/lib/images/smileys/icon_sad.gif
diff --git a/smileys/icon_silenced.gif b/lib/images/smileys/icon_silenced.gif
index 448399b2b..448399b2b 100644
--- a/smileys/icon_silenced.gif
+++ b/lib/images/smileys/icon_silenced.gif
diff --git a/smileys/icon_smile.gif b/lib/images/smileys/icon_smile.gif
index 7b1f6d304..7b1f6d304 100644
--- a/smileys/icon_smile.gif
+++ b/lib/images/smileys/icon_smile.gif
diff --git a/smileys/icon_smile2.gif b/lib/images/smileys/icon_smile2.gif
index 769639d32..769639d32 100644
--- a/smileys/icon_smile2.gif
+++ b/lib/images/smileys/icon_smile2.gif
diff --git a/smileys/icon_surprised.gif b/lib/images/smileys/icon_surprised.gif
index cb2142431..cb2142431 100644
--- a/smileys/icon_surprised.gif
+++ b/lib/images/smileys/icon_surprised.gif
diff --git a/smileys/icon_twisted.gif b/lib/images/smileys/icon_twisted.gif
index 502fe247e..502fe247e 100644
--- a/smileys/icon_twisted.gif
+++ b/lib/images/smileys/icon_twisted.gif
diff --git a/smileys/icon_wink.gif b/lib/images/smileys/icon_wink.gif
index d14828804..d14828804 100644
--- a/smileys/icon_wink.gif
+++ b/lib/images/smileys/icon_wink.gif
diff --git a/images/thumbup.gif b/lib/images/thumbup.gif
index c96d73c71..c96d73c71 100644
--- a/images/thumbup.gif
+++ b/lib/images/thumbup.gif
diff --git a/images/bold.png b/lib/images/toolbar/bold.png
index d12c5710e..d12c5710e 100644
--- a/images/bold.png
+++ b/lib/images/toolbar/bold.png
diff --git a/images/code.png b/lib/images/toolbar/code.png
index 8f74d8101..8f74d8101 100644
--- a/images/code.png
+++ b/lib/images/toolbar/code.png
diff --git a/images/empty.png b/lib/images/toolbar/empty.png
index e606cfd07..e606cfd07 100644
--- a/images/empty.png
+++ b/lib/images/toolbar/empty.png
diff --git a/images/extlink.png b/lib/images/toolbar/extlink.png
index 22971725c..22971725c 100644
--- a/images/extlink.png
+++ b/lib/images/toolbar/extlink.png
diff --git a/images/fonth1.png b/lib/images/toolbar/fonth1.png
index 13d52b979..13d52b979 100644
--- a/images/fonth1.png
+++ b/lib/images/toolbar/fonth1.png
diff --git a/images/fonth2.png b/lib/images/toolbar/fonth2.png
index 8e39a14de..8e39a14de 100644
--- a/images/fonth2.png
+++ b/lib/images/toolbar/fonth2.png
diff --git a/images/fonth3.png b/lib/images/toolbar/fonth3.png
index 80fd308e7..80fd308e7 100644
--- a/images/fonth3.png
+++ b/lib/images/toolbar/fonth3.png
diff --git a/images/fonth4.png b/lib/images/toolbar/fonth4.png
index e3a333535..e3a333535 100644
--- a/images/fonth4.png
+++ b/lib/images/toolbar/fonth4.png
diff --git a/images/fonth5.png b/lib/images/toolbar/fonth5.png
index e9fc8bb56..e9fc8bb56 100644
--- a/images/fonth5.png
+++ b/lib/images/toolbar/fonth5.png
diff --git a/images/image.png b/lib/images/toolbar/image.png
index f64493125..f64493125 100644
--- a/images/image.png
+++ b/lib/images/toolbar/image.png
diff --git a/images/italic.png b/lib/images/toolbar/italic.png
index f4ecd0ddf..f4ecd0ddf 100644
--- a/images/italic.png
+++ b/lib/images/toolbar/italic.png
diff --git a/images/link.png b/lib/images/toolbar/link.png
index 41fddbb28..41fddbb28 100644
--- a/images/link.png
+++ b/lib/images/toolbar/link.png
diff --git a/images/list.png b/lib/images/toolbar/list.png
index ffae5cfbf..ffae5cfbf 100644
--- a/images/list.png
+++ b/lib/images/toolbar/list.png
diff --git a/images/list_ul.png b/lib/images/toolbar/list_ul.png
index b86bcef7d..b86bcef7d 100644
--- a/images/list_ul.png
+++ b/lib/images/toolbar/list_ul.png
diff --git a/images/rule.png b/lib/images/toolbar/rule.png
index a432b206e..a432b206e 100644
--- a/images/rule.png
+++ b/lib/images/toolbar/rule.png
diff --git a/images/sig.png b/lib/images/toolbar/sig.png
index 2917048f6..2917048f6 100644
--- a/images/sig.png
+++ b/lib/images/toolbar/sig.png
diff --git a/images/underline.png b/lib/images/toolbar/underline.png
index db07038fd..db07038fd 100644
--- a/images/underline.png
+++ b/lib/images/toolbar/underline.png
diff --git a/inc/plugins/info/syntax.php b/lib/plugins/info/syntax.php
index bf45e5d11..f0afcf2ec 100644
--- a/inc/plugins/info/syntax.php
+++ b/lib/plugins/info/syntax.php
@@ -7,7 +7,7 @@
  */
 
 if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../../').'/');
-if(!defined('DOKU_PLUGIN')) define('DOKU_PLUGIN',DOKU_INC.'inc/plugins/');
+if(!defined('DOKU_PLUGIN')) define('DOKU_PLUGIN',DOKU_INC.'lib/plugins/');
 require_once(DOKU_PLUGIN.'syntax.php');
 
 /**
diff --git a/inc/plugins/syntax.php b/lib/plugins/syntax.php
index bb5680cd3..303c0de33 100644
--- a/inc/plugins/syntax.php
+++ b/lib/plugins/syntax.php
@@ -7,7 +7,7 @@
  */
 
 if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../').'/');
-if(!defined('DOKU_PLUGIN')) define('DOKU_PLUGIN',DOKU_INC.'inc/plugins/');
+if(!defined('DOKU_PLUGIN')) define('DOKU_PLUGIN',DOKU_INC.'lib/plugins/');
 require_once(DOKU_INC.'inc/parser/parser.php');
 
 /**
diff --git a/ajax.js b/lib/scripts/ajax.js
index f4c36baba..b3c32e950 100644
--- a/ajax.js
+++ b/lib/scripts/ajax.js
@@ -8,7 +8,7 @@ function ajax_qsearch_class(){
 
 //create global object and add functions
 var ajax_qsearch = new ajax_qsearch_class();
-ajax_qsearch.sack = new sack(DOKU_BASE + 'ajax.php');
+ajax_qsearch.sack = new sack(DOKU_BASE + 'lib/exe/ajax.php');
 ajax_qsearch.sack.AjaxFailedAlert = '';
 ajax_qsearch.sack.encodeURIString = false;
 
diff --git a/pngbehavior.htc b/lib/scripts/pngbehavior.htc
index ee974afe9..d1db8e765 100644
--- a/pngbehavior.htc
+++ b/lib/scripts/pngbehavior.htc
@@ -7,7 +7,7 @@
 
 var supported = /MSIE (5\.5)|[6789]/.test(navigator.userAgent) && navigator.platform == "Win32";
 var realSrc;
-var blankSrc = DOKU_BASE+"images/blank.gif";
+var blankSrc = DOKU_BASE+"lib/images/blank.gif";
 
 if (supported) fixImage();
 
diff --git a/script.js b/lib/scripts/script.js
index d25246c9c..5ad930281 100644
--- a/script.js
+++ b/lib/scripts/script.js
@@ -37,7 +37,7 @@ function escapeQuotes(text) {
  */
 function showLoadBar(){
   if(document.getElementById){
-    document.write('<img src="'+DOKU_BASE+'images/loading.gif" '+
+    document.write('<img src="'+DOKU_BASE+'lib/images/loading.gif" '+
                    'width="150" height="12" id="loading" />');
   }
 }
@@ -88,7 +88,7 @@ function formatButton(imageFile, speedTip, tagOpen, tagClose, sampleText, access
   document.write("('"+tagOpen+"','"+tagClose+"','"+sampleText+"');\">");
 
   document.write("<img width=\"24\" height=\"24\" src=\""+
-                DOKU_BASE+imageFile+"\" border=\"0\" alt=\""+
+                DOKU_BASE+'lib/images/toolbar/'+imageFile+"\" border=\"0\" alt=\""+
                 speedTip+"\" title=\""+speedTip+"\">");
   document.write("</a>");
   return;
@@ -111,7 +111,7 @@ function insertButton(imageFile, speedTip, value, accessKey) {
   document.write("(document.editform.wikitext,'"+value+"');\">");
 
   document.write("<img width=\"24\" height=\"24\" src=\""+
-                DOKU_BASE+imageFile+"\" border=\"0\" alt=\""+
+                DOKU_BASE+'lib/images/toolbar/'+imageFile+"\" border=\"0\" alt=\""+
                 speedTip+"\" title=\""+speedTip+"\">");
   document.write("</a>");
   return;
@@ -126,10 +126,10 @@ function mediaButton(imageFile, speedTip, accessKey, namespace) {
   if(accessKey){
     document.write("accesskey=\""+accessKey+"\" ");
   }
-  document.write("href=\"javascript:void(window.open('"+DOKU_BASE+"media.php?ns="+
+  document.write("href=\"javascript:void(window.open('"+DOKU_BASE+"lib/exe/media.php?ns="+
                  namespace+"','mediaselect','width=600,height=320,left=70,top=50,scrollbars=yes,resizable=yes'));\">");
   document.write("<img width=\"24\" height=\"24\" src=\""+
-                 DOKU_BASE+imageFile+"\" border=\"0\" alt=\""+
+                 DOKU_BASE+'lib/images/toolbar/'+imageFile+"\" border=\"0\" alt=\""+
                  speedTip+"\" title=\""+speedTip+"\">");
   document.write("</a>");
   return;
@@ -330,8 +330,8 @@ function showSizeCtl(){
     }else{
       textarea.style.height = hgt;
     }
-    document.writeln('<a href="javascript:sizeCtl(100)"><img src="'+DOKU_BASE+'images/larger.gif" width="20" height="20" border="0"></a>');
-    document.writeln('<a href="javascript:sizeCtl(-100)"><img src="'+DOKU_BASE+'images/smaller.gif" width="20" height="20" border="0"></a>');
+    document.writeln('<a href="javascript:sizeCtl(100)"><img src="'+DOKU_BASE+'lib/images/larger.gif" width="20" height="20" border="0"></a>');
+    document.writeln('<a href="javascript:sizeCtl(-100)"><img src="'+DOKU_BASE+'lib/images/smaller.gif" width="20" height="20" border="0"></a>');
   }
 }
 
diff --git a/tw-sack.js b/lib/scripts/tw-sack.js
index 8a9d12746..8a9d12746 100644
--- a/tw-sack.js
+++ b/lib/scripts/tw-sack.js
diff --git a/feed.css b/lib/styles/feed.css
index 1c53a5e88..0fcc222cd 100644
--- a/feed.css
+++ b/lib/styles/feed.css
@@ -16,8 +16,6 @@ category {
 
 item link, entry id {
   display: block;
-  background: transparent url(images/link_icon.gif) 0px 1px no-repeat;
-  padding: 1px 0px 1px 16px;
   color:#436976;
   text-decoration:underline;
 }
diff --git a/style.css b/lib/styles/style.css
index 4e19909bf..ff9bdf3ce 100644
--- a/style.css
+++ b/lib/styles/style.css
@@ -1,21 +1,21 @@
 div.clearer {clear: both; line-height: 0; height: 0;}
 
 div.error{
-  background: #ff6666 url(images/error.png) 0.5em 0px no-repeat;
+  background: #ff6666 url(../images/error.png) 0.5em 0px no-repeat;
   font-size: 90%;
   margin: 0px;
   padding-left: 3em;
 }
 
 div.info{
-  background: #ffff66 url(images/info.png) 0.5em 0px no-repeat;
+  background: #ffff66 url(../images/info.png) 0.5em 0px no-repeat;
   font-size: 90%;
   margin: 0;
   padding-left: 3em;
 }
 
 div.success{
-  background: #66ff66 url(images/thumbup.gif) 0.5em 0px no-repeat;
+  background: #66ff66 url(../images/thumbup.gif) 0.5em 0px no-repeat;
   font-size: 90%;
   margin: 0;
   padding-left: 3em;
diff --git a/tpl/default/design.css b/lib/tpl/default/design.css
index 14c419df4..14c419df4 100644
--- a/tpl/default/design.css
+++ b/lib/tpl/default/design.css
diff --git a/tpl/default/footer.html b/lib/tpl/default/footer.html
index 577bb3b3c..577bb3b3c 100644
--- a/tpl/default/footer.html
+++ b/lib/tpl/default/footer.html
diff --git a/tpl/default/images/bullet.gif b/lib/tpl/default/images/bullet.gif
index b43de48a4..b43de48a4 100644
--- a/tpl/default/images/bullet.gif
+++ b/lib/tpl/default/images/bullet.gif
diff --git a/tpl/default/images/button-cc.gif b/lib/tpl/default/images/button-cc.gif
index 5861d637f..5861d637f 100644
--- a/tpl/default/images/button-cc.gif
+++ b/lib/tpl/default/images/button-cc.gif
diff --git a/tpl/default/images/button-css.png b/lib/tpl/default/images/button-css.png
index 706325e1c..706325e1c 100644
--- a/tpl/default/images/button-css.png
+++ b/lib/tpl/default/images/button-css.png
diff --git a/tpl/default/images/button-donate.gif b/lib/tpl/default/images/button-donate.gif
index ec682c6b1..ec682c6b1 100644
--- a/tpl/default/images/button-donate.gif
+++ b/lib/tpl/default/images/button-donate.gif
diff --git a/tpl/default/images/button-dw.png b/lib/tpl/default/images/button-dw.png
index 39d5f56a9..39d5f56a9 100644
--- a/tpl/default/images/button-dw.png
+++ b/lib/tpl/default/images/button-dw.png
diff --git a/tpl/default/images/button-php.gif b/lib/tpl/default/images/button-php.gif
index 28f329aaa..28f329aaa 100644
--- a/tpl/default/images/button-php.gif
+++ b/lib/tpl/default/images/button-php.gif
diff --git a/tpl/default/images/button-rss.png b/lib/tpl/default/images/button-rss.png
index b036f7152..b036f7152 100644
--- a/tpl/default/images/button-rss.png
+++ b/lib/tpl/default/images/button-rss.png
diff --git a/tpl/default/images/button-xhtml.png b/lib/tpl/default/images/button-xhtml.png
index ec686442c..ec686442c 100644
--- a/tpl/default/images/button-xhtml.png
+++ b/lib/tpl/default/images/button-xhtml.png
diff --git a/tpl/default/images/closed.gif b/lib/tpl/default/images/closed.gif
index 8414d4d69..8414d4d69 100644
--- a/tpl/default/images/closed.gif
+++ b/lib/tpl/default/images/closed.gif
diff --git a/tpl/default/images/interwiki.png b/lib/tpl/default/images/interwiki.png
index 73d6f8d39..73d6f8d39 100644
--- a/tpl/default/images/interwiki.png
+++ b/lib/tpl/default/images/interwiki.png
diff --git a/tpl/default/images/link_icon.gif b/lib/tpl/default/images/link_icon.gif
index 815ccb1b1..815ccb1b1 100644
--- a/tpl/default/images/link_icon.gif
+++ b/lib/tpl/default/images/link_icon.gif
diff --git a/tpl/default/images/mail_icon.gif b/lib/tpl/default/images/mail_icon.gif
index 50a87a9a0..50a87a9a0 100644
--- a/tpl/default/images/mail_icon.gif
+++ b/lib/tpl/default/images/mail_icon.gif
diff --git a/tpl/default/images/open.gif b/lib/tpl/default/images/open.gif
index f5d5c7e56..f5d5c7e56 100644
--- a/tpl/default/images/open.gif
+++ b/lib/tpl/default/images/open.gif
diff --git a/tpl/default/images/tocdot2.gif b/lib/tpl/default/images/tocdot2.gif
index 3d39c2e73..3d39c2e73 100644
--- a/tpl/default/images/tocdot2.gif
+++ b/lib/tpl/default/images/tocdot2.gif
diff --git a/tpl/default/images/windows.gif b/lib/tpl/default/images/windows.gif
index 4f12acce1..4f12acce1 100644
--- a/tpl/default/images/windows.gif
+++ b/lib/tpl/default/images/windows.gif
diff --git a/tpl/default/layout.css b/lib/tpl/default/layout.css
index fea7c58ab..fea7c58ab 100644
--- a/tpl/default/layout.css
+++ b/lib/tpl/default/layout.css
diff --git a/tpl/default/main.php b/lib/tpl/default/main.php
index 35fd97713..28ad48f6f 100644
--- a/tpl/default/main.php
+++ b/lib/tpl/default/main.php
@@ -22,7 +22,7 @@
 
   <?tpl_metaheaders()?>
 
-  <link rel="shortcut icon" href="<?=DOKU_BASE?>images/favicon.ico" />
+  <link rel="shortcut icon" href="<?=DOKU_BASE?>lib/images/favicon.ico" />
   <link rel="stylesheet" media="screen" type="text/css" href="<?=DOKU_TPL?>layout.css" />
   <link rel="stylesheet" media="screen" type="text/css" href="<?=DOKU_TPL?>design.css" />
 
@@ -36,7 +36,7 @@
   <style type="text/css">
     /* that IE 5+ conditional comment makes this only visible in IE 5+ */
     /* IE bugfix for transparent PNGs */
-    //DISABLED   img { behavior: url("<?=DOKU_BASE?>/pngbehavior.htc"); }
+    //DISABLED   img { behavior: url("<?=DOKU_BASE?>lib/scripts/pngbehavior.htc"); }
   </style>
   <![endif]-->
 
diff --git a/tpl/default/media.php b/lib/tpl/default/media.php
index a781ec166..507717463 100644
--- a/tpl/default/media.php
+++ b/lib/tpl/default/media.php
@@ -20,7 +20,7 @@
 
   <?tpl_metaheaders()?>
 
-  <link rel="shortcut icon" href="<?=DOKU_BASE?>images/favicon.ico" />
+  <link rel="shortcut icon" href="<?=DOKU_BASE?>lib/images/favicon.ico" />
   <link rel="stylesheet" media="screen" type="text/css" href="<?=DOKU_TPL?>layout.css" />
   <link rel="stylesheet" media="screen" type="text/css" href="<?=DOKU_TPL?>design.css" />
 
@@ -28,7 +28,7 @@
   <style type="text/css">
     /* that IE 5+ conditional comment makes this only visible in IE 5+ */
     /* IE bugfix for transparent PNGs */
-    //img { behavior: url("<?=DOKU_BASE?>/pngbehavior.htc"); }
+    //DISABLED img { behavior: url("<?=DOKU_BASE?>lib/scripts/pngbehavior.htc"); }
   </style>
   <![endif]-->
 </head>
@@ -42,7 +42,7 @@
   <div class="mediaselect">
 
     <div class="mediaselect-left">
-      <b><a href="<?=DOKU_BASE?>/media.php?ns="><?=hsc($lang['namespaces'])?></a></b>
+      <b><a href="<?=DOKU_BASE?>/lib/exe/media.php?ns="><?=hsc($lang['namespaces'])?></a></b>
 
 			<?tpl_medianamespaces()?>
 		</div>
diff --git a/tpl/default/print.css b/lib/tpl/default/print.css
index 77c82a580..77c82a580 100644
--- a/tpl/default/print.css
+++ b/lib/tpl/default/print.css
diff --git a/tpl/default/rtl.css b/lib/tpl/default/rtl.css
index 9a8294774..9a8294774 100644
--- a/tpl/default/rtl.css
+++ b/lib/tpl/default/rtl.css