From a9218a356b4b4f25d9a6bc63b533dc016a241eaf Mon Sep 17 00:00:00 2001
From: dev <dev@welterde.de>
Date: Thu, 31 Jan 2008 20:38:37 +0000
Subject: [PATCH] imported my website-repo

---
 index.php                                     |  32 ----
 menu.ini                                      | 181 ------------------
 menu.php                                      |  48 -----
 mirror.i2p2/app.py                            |  33 ++++
 mirror.i2p2/mirrors                           |   1 +
 mtn.i2p2/keys.txt                             |  61 ++++++
 pages/.htaccess                               |   1 -
 pages/footer.html                             |   4 -
 pages/header.html                             |  28 ---
 pages/installation.html                       |   1 -
 routercheck.php                               |  53 -----
 www.i2p2/app.py                               |  53 +++++
 www.i2p2/generate.py                          |  26 +++
 www.i2p2/generate.sh                          |   5 +
 www.i2p2/pages/_config                        |   1 +
 www.i2p2/pages/_layout.html                   |  23 +++
 www.i2p2/pages/_menu.html                     |  30 +++
 {pages => www.i2p2/pages}/announcements.html  |   4 +
 {pages => www.i2p2/pages}/api.html            |   4 +
 {pages => www.i2p2/pages}/applications.html   |   4 +
 {pages => www.i2p2/pages}/bounties.html       |   4 +
 .../pages}/bounty_unittests.html              |   5 +-
 {pages => www.i2p2/pages}/cvs.html            |   5 +-
 {pages => www.i2p2/pages}/datagrams.html      |   6 +-
 {pages => www.i2p2/pages}/donate.html         |   5 +-
 {pages => www.i2p2/pages}/download.html       |  19 +-
 {pages => www.i2p2/pages}/faq.html            |   5 +-
 {pages => www.i2p2/pages}/getinvolved.html    |   5 +-
 {pages => www.i2p2/pages}/halloffame.html     |   5 +-
 {pages => www.i2p2/pages}/how.html            |   5 +-
 .../pages}/how_cryptography.html              |   6 +-
 {pages => www.i2p2/pages}/how_elgamalaes.html |   5 +-
 .../pages}/how_garlicrouting.html             |   6 +-
 {pages => www.i2p2/pages}/how_intro.html      |   5 +-
 .../pages}/how_networkcomparisons.html        |   5 +-
 .../pages}/how_networkdatabase.html           |   6 +-
 .../pages}/how_peerselection.html             |   6 +-
 .../pages}/how_threatmodel.html               |   5 +-
 .../pages}/how_tunnelrouting.html             |   6 +-
 {pages => www.i2p2/pages}/howto.html          |   6 +-
 {pages => www.i2p2/pages}/howto_blojsom.html  |   5 +-
 {pages => www.i2p2/pages}/i2cp.html           |   5 +-
 {pages => www.i2p2/pages}/i2ptunnel.html      |   5 +-
 .../pages}/i2ptunnel_migration.html           |   6 +-
 .../pages}/i2ptunnel_services.html            |   5 +-
 www.i2p2/pages/impressum.html                 |   8 +
 pages/home.html => www.i2p2/pages/index.html  |   4 +
 www.i2p2/pages/installation.html              |   3 +
 {pages => www.i2p2/pages}/intro.html          |   4 +
 {pages => www.i2p2/pages}/jbigi.html          |   5 +-
 {pages => www.i2p2/pages}/licenses.html       |   5 +-
 {pages => www.i2p2/pages}/links.html          |   5 +-
 {pages => www.i2p2/pages}/meeting100.html     |   5 +-
 {pages => www.i2p2/pages}/meeting101.html     |   5 +-
 {pages => www.i2p2/pages}/meeting102.html     |   5 +-
 {pages => www.i2p2/pages}/meeting103.html     |   5 +-
 {pages => www.i2p2/pages}/meeting104.html     |   5 +-
 {pages => www.i2p2/pages}/meeting105.html     |   5 +-
 {pages => www.i2p2/pages}/meeting106.html     |   5 +-
 {pages => www.i2p2/pages}/meeting107.html     |   5 +-
 {pages => www.i2p2/pages}/meeting108.html     |   5 +-
 {pages => www.i2p2/pages}/meeting109.html     |   5 +-
 {pages => www.i2p2/pages}/meeting110.html     |   5 +-
 {pages => www.i2p2/pages}/meeting111.html     |   5 +-
 {pages => www.i2p2/pages}/meeting112.html     |   5 +-
 {pages => www.i2p2/pages}/meeting113.html     |  13 +-
 {pages => www.i2p2/pages}/meeting114.html     |   5 +-
 {pages => www.i2p2/pages}/meeting115.html     |   5 +-
 {pages => www.i2p2/pages}/meeting116.html     |   5 +-
 {pages => www.i2p2/pages}/meeting117.html     |   5 +-
 {pages => www.i2p2/pages}/meeting118.html     |   5 +-
 {pages => www.i2p2/pages}/meeting119.html     |   5 +-
 {pages => www.i2p2/pages}/meeting120.html     |   5 +-
 {pages => www.i2p2/pages}/meeting121.html     |   5 +-
 {pages => www.i2p2/pages}/meeting122.html     |   5 +-
 {pages => www.i2p2/pages}/meeting123.html     |   5 +-
 {pages => www.i2p2/pages}/meeting124.html     |   5 +-
 {pages => www.i2p2/pages}/meeting125.html     |   5 +-
 {pages => www.i2p2/pages}/meeting126.html     |   5 +-
 {pages => www.i2p2/pages}/meeting127.html     |   5 +-
 {pages => www.i2p2/pages}/meeting128.html     |   5 +-
 {pages => www.i2p2/pages}/meeting129.html     |   5 +-
 {pages => www.i2p2/pages}/meeting130.html     |   5 +-
 {pages => www.i2p2/pages}/meeting131.html     |   7 +-
 {pages => www.i2p2/pages}/meeting132.html     |   5 +-
 {pages => www.i2p2/pages}/meeting133.html     |   5 +-
 {pages => www.i2p2/pages}/meeting134.html     |   5 +-
 {pages => www.i2p2/pages}/meeting135.html     |   5 +-
 {pages => www.i2p2/pages}/meeting136.html     |   5 +-
 {pages => www.i2p2/pages}/meeting137.html     |   5 +-
 {pages => www.i2p2/pages}/meeting138.html     |   5 +-
 {pages => www.i2p2/pages}/meeting139.html     |   5 +-
 {pages => www.i2p2/pages}/meeting140.html     |   5 +-
 {pages => www.i2p2/pages}/meeting141.html     |   9 +-
 {pages => www.i2p2/pages}/meeting142.html     |   5 +-
 {pages => www.i2p2/pages}/meeting143.html     |   5 +-
 {pages => www.i2p2/pages}/meeting144.html     |   5 +-
 {pages => www.i2p2/pages}/meeting145.html     |   5 +-
 {pages => www.i2p2/pages}/meeting146.html     |   7 +-
 {pages => www.i2p2/pages}/meeting147.html     |   5 +-
 {pages => www.i2p2/pages}/meeting148.html     |   5 +-
 {pages => www.i2p2/pages}/meeting149.html     |   5 +-
 {pages => www.i2p2/pages}/meeting150.html     |   5 +-
 {pages => www.i2p2/pages}/meeting151.html     |   5 +-
 {pages => www.i2p2/pages}/meeting152.html     |   5 +-
 {pages => www.i2p2/pages}/meeting153.html     |   5 +-
 {pages => www.i2p2/pages}/meeting154.html     |   5 +-
 {pages => www.i2p2/pages}/meeting155.html     |   5 +-
 {pages => www.i2p2/pages}/meeting156.html     |   5 +-
 {pages => www.i2p2/pages}/meeting157.html     |   5 +-
 {pages => www.i2p2/pages}/meeting158.html     |   5 +-
 {pages => www.i2p2/pages}/meeting159.html     |   5 +-
 {pages => www.i2p2/pages}/meeting160.html     |   5 +-
 {pages => www.i2p2/pages}/meeting161.html     |   5 +-
 {pages => www.i2p2/pages}/meeting162.html     |   5 +-
 {pages => www.i2p2/pages}/meeting163.html     |   5 +-
 {pages => www.i2p2/pages}/meeting164.html     |   5 +-
 {pages => www.i2p2/pages}/meeting165.html     |   5 +-
 {pages => www.i2p2/pages}/meeting166.html     |   5 +-
 {pages => www.i2p2/pages}/meeting167.html     |   5 +-
 {pages => www.i2p2/pages}/meeting168.html     |   5 +-
 {pages => www.i2p2/pages}/meeting170.html     |   5 +-
 {pages => www.i2p2/pages}/meeting171.html     |   5 +-
 {pages => www.i2p2/pages}/meeting172.html     |   5 +-
 {pages => www.i2p2/pages}/meeting173.html     |   5 +-
 {pages => www.i2p2/pages}/meeting174.html     |   5 +-
 {pages => www.i2p2/pages}/meeting175.html     |   5 +-
 {pages => www.i2p2/pages}/meeting176.html     |   5 +-
 {pages => www.i2p2/pages}/meeting177.html     |   5 +-
 {pages => www.i2p2/pages}/meeting178.html     |   5 +-
 {pages => www.i2p2/pages}/meeting179.html     |   5 +-
 {pages => www.i2p2/pages}/meeting180.html     |   5 +-
 {pages => www.i2p2/pages}/meeting181.html     |   5 +-
 {pages => www.i2p2/pages}/meeting182.html     |   5 +-
 {pages => www.i2p2/pages}/meeting183.html     |   5 +-
 {pages => www.i2p2/pages}/meeting184.html     |   5 +-
 {pages => www.i2p2/pages}/meeting185.html     |   5 +-
 {pages => www.i2p2/pages}/meeting186.html     |   5 +-
 {pages => www.i2p2/pages}/meeting187.html     |   5 +-
 {pages => www.i2p2/pages}/meeting188.html     |   5 +-
 {pages => www.i2p2/pages}/meeting189.html     |   5 +-
 {pages => www.i2p2/pages}/meeting190.html     |   5 +-
 {pages => www.i2p2/pages}/meeting191.html     |   5 +-
 {pages => www.i2p2/pages}/meeting192.html     |   5 +-
 {pages => www.i2p2/pages}/meeting193.html     |   5 +-
 {pages => www.i2p2/pages}/meeting194.html     |   5 +-
 {pages => www.i2p2/pages}/meeting195.html     |   5 +-
 {pages => www.i2p2/pages}/meeting196.html     |   5 +-
 {pages => www.i2p2/pages}/meeting197.html     |   5 +-
 {pages => www.i2p2/pages}/meeting198.html     |   5 +-
 {pages => www.i2p2/pages}/meeting199.html     |   5 +-
 {pages => www.i2p2/pages}/meeting200.html     |   5 +-
 {pages => www.i2p2/pages}/meeting201.html     |   5 +-
 {pages => www.i2p2/pages}/meeting202.html     |   5 +-
 {pages => www.i2p2/pages}/meeting203.html     |   7 +-
 {pages => www.i2p2/pages}/meeting204.html     |   5 +-
 {pages => www.i2p2/pages}/meeting205.html     |   5 +-
 {pages => www.i2p2/pages}/meeting206.html     |   5 +-
 {pages => www.i2p2/pages}/meeting47.html      |   5 +-
 {pages => www.i2p2/pages}/meeting48.html      |   5 +-
 {pages => www.i2p2/pages}/meeting49.html      |   5 +-
 {pages => www.i2p2/pages}/meeting50.html      |   5 +-
 {pages => www.i2p2/pages}/meeting51.html      |   5 +-
 {pages => www.i2p2/pages}/meeting52.html      |   5 +-
 {pages => www.i2p2/pages}/meeting53.html      |   5 +-
 {pages => www.i2p2/pages}/meeting54.html      |   5 +-
 {pages => www.i2p2/pages}/meeting55.html      |   5 +-
 {pages => www.i2p2/pages}/meeting56.html      |   5 +-
 {pages => www.i2p2/pages}/meeting57.html      |   5 +-
 {pages => www.i2p2/pages}/meeting58.html      |   5 +-
 {pages => www.i2p2/pages}/meeting59.html      |   6 +-
 {pages => www.i2p2/pages}/meeting60.html      |   5 +-
 {pages => www.i2p2/pages}/meeting61.html      |   5 +-
 {pages => www.i2p2/pages}/meeting62.html      |   6 +-
 {pages => www.i2p2/pages}/meeting63.html      |   5 +-
 {pages => www.i2p2/pages}/meeting64.html      |   5 +-
 {pages => www.i2p2/pages}/meeting65.html      |   5 +-
 {pages => www.i2p2/pages}/meeting66.html      |   5 +-
 {pages => www.i2p2/pages}/meeting68.html      |   5 +-
 {pages => www.i2p2/pages}/meeting69.html      |   5 +-
 {pages => www.i2p2/pages}/meeting70.html      |   5 +-
 {pages => www.i2p2/pages}/meeting71.html      |   5 +-
 {pages => www.i2p2/pages}/meeting72.html      |   5 +-
 {pages => www.i2p2/pages}/meeting73.html      |   5 +-
 {pages => www.i2p2/pages}/meeting74.html      |   5 +-
 {pages => www.i2p2/pages}/meeting75.html      |   5 +-
 {pages => www.i2p2/pages}/meeting76.html      |   5 +-
 {pages => www.i2p2/pages}/meeting77.html      |   5 +-
 {pages => www.i2p2/pages}/meeting78.html      |   5 +-
 {pages => www.i2p2/pages}/meeting79.html      |   5 +-
 {pages => www.i2p2/pages}/meeting80.html      |   5 +-
 {pages => www.i2p2/pages}/meeting81.html      |   5 +-
 {pages => www.i2p2/pages}/meeting82.html      |   5 +-
 {pages => www.i2p2/pages}/meeting90.html      |   5 +-
 {pages => www.i2p2/pages}/meeting92.html      |   5 +-
 {pages => www.i2p2/pages}/meeting93.html      |   5 +-
 {pages => www.i2p2/pages}/meeting95.html      |   5 +-
 {pages => www.i2p2/pages}/meeting99.html      |   5 +-
 {pages => www.i2p2/pages}/meetings.html       |   5 +-
 {pages => www.i2p2/pages}/ministreaming.html  |   6 +-
 {pages => www.i2p2/pages}/minwww.html         |   5 +-
 {pages => www.i2p2/pages}/myi2p.html          |   5 +-
 www.i2p2/pages/news.xml                       |  26 +++
 www.i2p2/pages/not_found.html                 |   5 +
 {pages => www.i2p2/pages}/performance.html    |   5 +-
 {pages => www.i2p2/pages}/roadmap.html        |   5 +-
 {pages => www.i2p2/pages}/sam.html            |   5 +-
 {pages => www.i2p2/pages}/team.html           |   5 +-
 {pages => www.i2p2/pages}/todo.html           |   5 +-
 favicon.ico => www.i2p2/static/favicon.ico    | Bin
 .../static/images}/endToEndEncryption.png     | Bin
 .../static/images}/i2plogo.png                | Bin
 {images => www.i2p2/static/images}/net.png    | Bin
 {images => www.i2p2/static/images}/plan.png   | Bin
 .../static/styles}/default.css                |   0
 215 files changed, 1043 insertions(+), 557 deletions(-)
 delete mode 100644 index.php
 delete mode 100644 menu.ini
 delete mode 100644 menu.php
 create mode 100644 mirror.i2p2/app.py
 create mode 100644 mirror.i2p2/mirrors
 create mode 100644 mtn.i2p2/keys.txt
 delete mode 100644 pages/.htaccess
 delete mode 100644 pages/footer.html
 delete mode 100644 pages/header.html
 delete mode 100644 pages/installation.html
 delete mode 100644 routercheck.php
 create mode 100644 www.i2p2/app.py
 create mode 100644 www.i2p2/generate.py
 create mode 100755 www.i2p2/generate.sh
 create mode 100644 www.i2p2/pages/_config
 create mode 100644 www.i2p2/pages/_layout.html
 create mode 100644 www.i2p2/pages/_menu.html
 rename {pages => www.i2p2/pages}/announcements.html (98%)
 rename {pages => www.i2p2/pages}/api.html (78%)
 rename {pages => www.i2p2/pages}/applications.html (99%)
 rename {pages => www.i2p2/pages}/bounties.html (96%)
 rename {pages => www.i2p2/pages}/bounty_unittests.html (91%)
 rename {pages => www.i2p2/pages}/cvs.html (84%)
 rename {pages => www.i2p2/pages}/datagrams.html (73%)
 rename {pages => www.i2p2/pages}/donate.html (97%)
 rename {pages => www.i2p2/pages}/download.html (80%)
 rename {pages => www.i2p2/pages}/faq.html (97%)
 rename {pages => www.i2p2/pages}/getinvolved.html (69%)
 rename {pages => www.i2p2/pages}/halloffame.html (97%)
 rename {pages => www.i2p2/pages}/how.html (83%)
 rename {pages => www.i2p2/pages}/how_cryptography.html (98%)
 rename {pages => www.i2p2/pages}/how_elgamalaes.html (96%)
 rename {pages => www.i2p2/pages}/how_garlicrouting.html (95%)
 rename {pages => www.i2p2/pages}/how_intro.html (98%)
 rename {pages => www.i2p2/pages}/how_networkcomparisons.html (98%)
 rename {pages => www.i2p2/pages}/how_networkdatabase.html (96%)
 rename {pages => www.i2p2/pages}/how_peerselection.html (96%)
 rename {pages => www.i2p2/pages}/how_threatmodel.html (99%)
 rename {pages => www.i2p2/pages}/how_tunnelrouting.html (97%)
 rename {pages => www.i2p2/pages}/howto.html (70%)
 rename {pages => www.i2p2/pages}/howto_blojsom.html (94%)
 rename {pages => www.i2p2/pages}/i2cp.html (90%)
 rename {pages => www.i2p2/pages}/i2ptunnel.html (98%)
 rename {pages => www.i2p2/pages}/i2ptunnel_migration.html (92%)
 rename {pages => www.i2p2/pages}/i2ptunnel_services.html (98%)
 create mode 100644 www.i2p2/pages/impressum.html
 rename pages/home.html => www.i2p2/pages/index.html (93%)
 create mode 100644 www.i2p2/pages/installation.html
 rename {pages => www.i2p2/pages}/intro.html (98%)
 rename {pages => www.i2p2/pages}/jbigi.html (93%)
 rename {pages => www.i2p2/pages}/licenses.html (98%)
 rename {pages => www.i2p2/pages}/links.html (86%)
 rename {pages => www.i2p2/pages}/meeting100.html (98%)
 rename {pages => www.i2p2/pages}/meeting101.html (99%)
 rename {pages => www.i2p2/pages}/meeting102.html (98%)
 rename {pages => www.i2p2/pages}/meeting103.html (99%)
 rename {pages => www.i2p2/pages}/meeting104.html (99%)
 rename {pages => www.i2p2/pages}/meeting105.html (99%)
 rename {pages => www.i2p2/pages}/meeting106.html (99%)
 rename {pages => www.i2p2/pages}/meeting107.html (99%)
 rename {pages => www.i2p2/pages}/meeting108.html (94%)
 rename {pages => www.i2p2/pages}/meeting109.html (98%)
 rename {pages => www.i2p2/pages}/meeting110.html (98%)
 rename {pages => www.i2p2/pages}/meeting111.html (99%)
 rename {pages => www.i2p2/pages}/meeting112.html (99%)
 rename {pages => www.i2p2/pages}/meeting113.html (98%)
 rename {pages => www.i2p2/pages}/meeting114.html (99%)
 rename {pages => www.i2p2/pages}/meeting115.html (99%)
 rename {pages => www.i2p2/pages}/meeting116.html (98%)
 rename {pages => www.i2p2/pages}/meeting117.html (97%)
 rename {pages => www.i2p2/pages}/meeting118.html (99%)
 rename {pages => www.i2p2/pages}/meeting119.html (98%)
 rename {pages => www.i2p2/pages}/meeting120.html (99%)
 rename {pages => www.i2p2/pages}/meeting121.html (99%)
 rename {pages => www.i2p2/pages}/meeting122.html (99%)
 rename {pages => www.i2p2/pages}/meeting123.html (98%)
 rename {pages => www.i2p2/pages}/meeting124.html (99%)
 rename {pages => www.i2p2/pages}/meeting125.html (99%)
 rename {pages => www.i2p2/pages}/meeting126.html (98%)
 rename {pages => www.i2p2/pages}/meeting127.html (98%)
 rename {pages => www.i2p2/pages}/meeting128.html (99%)
 rename {pages => www.i2p2/pages}/meeting129.html (99%)
 rename {pages => www.i2p2/pages}/meeting130.html (99%)
 rename {pages => www.i2p2/pages}/meeting131.html (99%)
 rename {pages => www.i2p2/pages}/meeting132.html (99%)
 rename {pages => www.i2p2/pages}/meeting133.html (99%)
 rename {pages => www.i2p2/pages}/meeting134.html (99%)
 rename {pages => www.i2p2/pages}/meeting135.html (98%)
 rename {pages => www.i2p2/pages}/meeting136.html (97%)
 rename {pages => www.i2p2/pages}/meeting137.html (99%)
 rename {pages => www.i2p2/pages}/meeting138.html (98%)
 rename {pages => www.i2p2/pages}/meeting139.html (97%)
 rename {pages => www.i2p2/pages}/meeting140.html (99%)
 rename {pages => www.i2p2/pages}/meeting141.html (96%)
 rename {pages => www.i2p2/pages}/meeting142.html (97%)
 rename {pages => www.i2p2/pages}/meeting143.html (95%)
 rename {pages => www.i2p2/pages}/meeting144.html (98%)
 rename {pages => www.i2p2/pages}/meeting145.html (98%)
 rename {pages => www.i2p2/pages}/meeting146.html (98%)
 rename {pages => www.i2p2/pages}/meeting147.html (95%)
 rename {pages => www.i2p2/pages}/meeting148.html (97%)
 rename {pages => www.i2p2/pages}/meeting149.html (99%)
 rename {pages => www.i2p2/pages}/meeting150.html (98%)
 rename {pages => www.i2p2/pages}/meeting151.html (99%)
 rename {pages => www.i2p2/pages}/meeting152.html (99%)
 rename {pages => www.i2p2/pages}/meeting153.html (99%)
 rename {pages => www.i2p2/pages}/meeting154.html (98%)
 rename {pages => www.i2p2/pages}/meeting155.html (97%)
 rename {pages => www.i2p2/pages}/meeting156.html (99%)
 rename {pages => www.i2p2/pages}/meeting157.html (98%)
 rename {pages => www.i2p2/pages}/meeting158.html (99%)
 rename {pages => www.i2p2/pages}/meeting159.html (99%)
 rename {pages => www.i2p2/pages}/meeting160.html (95%)
 rename {pages => www.i2p2/pages}/meeting161.html (98%)
 rename {pages => www.i2p2/pages}/meeting162.html (98%)
 rename {pages => www.i2p2/pages}/meeting163.html (98%)
 rename {pages => www.i2p2/pages}/meeting164.html (99%)
 rename {pages => www.i2p2/pages}/meeting165.html (98%)
 rename {pages => www.i2p2/pages}/meeting166.html (98%)
 rename {pages => www.i2p2/pages}/meeting167.html (98%)
 rename {pages => www.i2p2/pages}/meeting168.html (97%)
 rename {pages => www.i2p2/pages}/meeting170.html (98%)
 rename {pages => www.i2p2/pages}/meeting171.html (97%)
 rename {pages => www.i2p2/pages}/meeting172.html (96%)
 rename {pages => www.i2p2/pages}/meeting173.html (98%)
 rename {pages => www.i2p2/pages}/meeting174.html (97%)
 rename {pages => www.i2p2/pages}/meeting175.html (98%)
 rename {pages => www.i2p2/pages}/meeting176.html (99%)
 rename {pages => www.i2p2/pages}/meeting177.html (98%)
 rename {pages => www.i2p2/pages}/meeting178.html (95%)
 rename {pages => www.i2p2/pages}/meeting179.html (97%)
 rename {pages => www.i2p2/pages}/meeting180.html (97%)
 rename {pages => www.i2p2/pages}/meeting181.html (96%)
 rename {pages => www.i2p2/pages}/meeting182.html (97%)
 rename {pages => www.i2p2/pages}/meeting183.html (99%)
 rename {pages => www.i2p2/pages}/meeting184.html (99%)
 rename {pages => www.i2p2/pages}/meeting185.html (97%)
 rename {pages => www.i2p2/pages}/meeting186.html (98%)
 rename {pages => www.i2p2/pages}/meeting187.html (97%)
 rename {pages => www.i2p2/pages}/meeting188.html (97%)
 rename {pages => www.i2p2/pages}/meeting189.html (98%)
 rename {pages => www.i2p2/pages}/meeting190.html (98%)
 rename {pages => www.i2p2/pages}/meeting191.html (96%)
 rename {pages => www.i2p2/pages}/meeting192.html (96%)
 rename {pages => www.i2p2/pages}/meeting193.html (91%)
 rename {pages => www.i2p2/pages}/meeting194.html (99%)
 rename {pages => www.i2p2/pages}/meeting195.html (97%)
 rename {pages => www.i2p2/pages}/meeting196.html (98%)
 rename {pages => www.i2p2/pages}/meeting197.html (94%)
 rename {pages => www.i2p2/pages}/meeting198.html (97%)
 rename {pages => www.i2p2/pages}/meeting199.html (99%)
 rename {pages => www.i2p2/pages}/meeting200.html (97%)
 rename {pages => www.i2p2/pages}/meeting201.html (94%)
 rename {pages => www.i2p2/pages}/meeting202.html (97%)
 rename {pages => www.i2p2/pages}/meeting203.html (97%)
 rename {pages => www.i2p2/pages}/meeting204.html (97%)
 rename {pages => www.i2p2/pages}/meeting205.html (98%)
 rename {pages => www.i2p2/pages}/meeting206.html (95%)
 rename {pages => www.i2p2/pages}/meeting47.html (99%)
 rename {pages => www.i2p2/pages}/meeting48.html (99%)
 rename {pages => www.i2p2/pages}/meeting49.html (99%)
 rename {pages => www.i2p2/pages}/meeting50.html (99%)
 rename {pages => www.i2p2/pages}/meeting51.html (99%)
 rename {pages => www.i2p2/pages}/meeting52.html (99%)
 rename {pages => www.i2p2/pages}/meeting53.html (98%)
 rename {pages => www.i2p2/pages}/meeting54.html (99%)
 rename {pages => www.i2p2/pages}/meeting55.html (99%)
 rename {pages => www.i2p2/pages}/meeting56.html (99%)
 rename {pages => www.i2p2/pages}/meeting57.html (99%)
 rename {pages => www.i2p2/pages}/meeting58.html (99%)
 rename {pages => www.i2p2/pages}/meeting59.html (99%)
 rename {pages => www.i2p2/pages}/meeting60.html (99%)
 rename {pages => www.i2p2/pages}/meeting61.html (97%)
 rename {pages => www.i2p2/pages}/meeting62.html (99%)
 rename {pages => www.i2p2/pages}/meeting63.html (98%)
 rename {pages => www.i2p2/pages}/meeting64.html (98%)
 rename {pages => www.i2p2/pages}/meeting65.html (99%)
 rename {pages => www.i2p2/pages}/meeting66.html (99%)
 rename {pages => www.i2p2/pages}/meeting68.html (99%)
 rename {pages => www.i2p2/pages}/meeting69.html (99%)
 rename {pages => www.i2p2/pages}/meeting70.html (98%)
 rename {pages => www.i2p2/pages}/meeting71.html (99%)
 rename {pages => www.i2p2/pages}/meeting72.html (99%)
 rename {pages => www.i2p2/pages}/meeting73.html (98%)
 rename {pages => www.i2p2/pages}/meeting74.html (98%)
 rename {pages => www.i2p2/pages}/meeting75.html (98%)
 rename {pages => www.i2p2/pages}/meeting76.html (99%)
 rename {pages => www.i2p2/pages}/meeting77.html (99%)
 rename {pages => www.i2p2/pages}/meeting78.html (99%)
 rename {pages => www.i2p2/pages}/meeting79.html (98%)
 rename {pages => www.i2p2/pages}/meeting80.html (99%)
 rename {pages => www.i2p2/pages}/meeting81.html (99%)
 rename {pages => www.i2p2/pages}/meeting82.html (99%)
 rename {pages => www.i2p2/pages}/meeting90.html (99%)
 rename {pages => www.i2p2/pages}/meeting92.html (99%)
 rename {pages => www.i2p2/pages}/meeting93.html (99%)
 rename {pages => www.i2p2/pages}/meeting95.html (99%)
 rename {pages => www.i2p2/pages}/meeting99.html (99%)
 rename {pages => www.i2p2/pages}/meetings.html (98%)
 rename {pages => www.i2p2/pages}/ministreaming.html (90%)
 rename {pages => www.i2p2/pages}/minwww.html (96%)
 rename {pages => www.i2p2/pages}/myi2p.html (90%)
 create mode 100755 www.i2p2/pages/news.xml
 create mode 100644 www.i2p2/pages/not_found.html
 rename {pages => www.i2p2/pages}/performance.html (98%)
 rename {pages => www.i2p2/pages}/roadmap.html (84%)
 rename {pages => www.i2p2/pages}/sam.html (98%)
 rename {pages => www.i2p2/pages}/team.html (96%)
 rename {pages => www.i2p2/pages}/todo.html (99%)
 rename favicon.ico => www.i2p2/static/favicon.ico (100%)
 rename {images => www.i2p2/static/images}/endToEndEncryption.png (100%)
 rename {images => www.i2p2/static/images}/i2plogo.png (100%)
 rename {images => www.i2p2/static/images}/net.png (100%)
 rename {images => www.i2p2/static/images}/plan.png (100%)
 rename {styles => www.i2p2/static/styles}/default.css (100%)

diff --git a/index.php b/index.php
deleted file mode 100644
index c74590922..000000000
--- a/index.php
+++ /dev/null
@@ -1,32 +0,0 @@
-lkjasdflkajsl;kasjl;aksjlkajsl;kajslkasjlkasdflj<?php
-include('menu.php');
-
-define('MENU_FILE','menu.ini');
-define('PAGE_DIR','pages/');
-define('PAGE_EXT','.html');
-
-/* Filter out everything except alphanumerical characters and underscores */
-function form_dirty($data) {
-    return preg_match('/[^[:alnum:]_]/',$data);
-}
-
-$page = '';
-if(isset($_REQUEST['page'])) {
-    $page = urldecode($_REQUEST['page']);
-} else {
-    $page = 'home';
-}
-
-if(!form_dirty($page) and is_readable(PAGE_DIR.$page.PAGE_EXT)) {
-    $site_structure = parse_ini_file(MENU_FILE, true);
-    $pagetitle = getpagetitle($page);
-    include(PAGE_DIR.'header'.PAGE_EXT);
-    include(PAGE_DIR.$page.PAGE_EXT);
-    include(PAGE_DIR.'footer'.PAGE_EXT);
-} else {                                                                                            
-    header("HTTP/1.0 404 Not Found");
-    print "<h1>Error: Page not found</h1>\n";
-    print "<a href=\"javascript:history.back(1)\">Go back</a>";
-}
-
-?>
diff --git a/menu.ini b/menu.ini
deleted file mode 100644
index 0259589a1..000000000
--- a/menu.ini
+++ /dev/null
@@ -1,181 +0,0 @@
-[home]
-title = "Welcome to I2P"
-depth = 1
-
-
-[download]
-depth = 1
-
-[history]
-title = "Latest changes"
-depth = 2
-link = "http://dev.i2p.net/cgi-bin/cvsweb.cgi/i2p/history.txt?rev=HEAD"
-
-[news]
-depth = 1
-nolink = 1
-
-[announcements]
-depth = 2
-
-[mailinglist]
-depth = 2
-link = "http://dev.i2p.net/pipermail/i2p/"
-
-[meetings]
-depth = 2
-
-[roadmap]
-title = "Roadmap"
-depth = 2
-
-[todo]
-title = "Task list"
-depth = 2
-
-[intro]
-title = "About I2P"
-depth = 1
-
-[faq]
-title = "FAQ"
-depth = 2
-
-[forums]
-depth = 2
-link = "http://forum.i2p.net/"
-
-[bounties]
-depth = 2
-
-[getinvolved]
-title = "Get involved"
-depth = 2
-
-[donate]
-title = "Donate!"
-depth = 2
-
-[team]
-title = "I2P Team"
-depth = 2
-
-[halloffame]
-title = "Hall of Fame"
-depth = 2
-
-
-[documentation]
-depth = 1
-nolink = 1
-
-[how]
-title = "How does it work?"
-depth = 2
-
-[techintro]
-title = "Tech intro"
-depth = 2
-link = "http://dev.i2p.net/cgi-bin/cvsweb.cgi/i2p/router/doc/techintro.html?rev=HEAD"
-
-[how_intro]
-title = "Intro"
-
-[how_threatmodel]
-title = "Threat model"
-
-[how_tunnelrouting]
-title = "Tunnel routing"
-
-[how_garlicrouting]
-title = "Garlic routing"
-
-[how_networkdatabase]
-title = "Network database"
-
-[how_peerselection]
-title = "Peer selection"
-
-[how_cryptography]
-title = "Cryptography"
-
-[how_elgamalaes]
-title = "ElGamal/AES+SessionTag"
-
-[how_networkcomparisons]
-title = "Network comparisons"
-
-[howto]
-title = "Howto docs"
-depth = 2
-
-[applications]
-depth = 2
-
-[myi2p]
-title = "MyI2P"
-
-[i2ptunnel]
-title = "I2PTunnel"
-
-[i2ptunnel_services]
-title = "Setting up services"
-
-[i2ptunnel_tuning]
-title = "Tuning"
-
-[i2ptunnel_lan]
-title = "LAN setup"
-
-[minwww]
-title = "MinWWW"
-
-;[performance]
-;depth = 2
-
-;[jbigi]
-;title = "jbigi"
-;depth = 3
-
-;[jvm]
-;title = "JVM"
-;depth = 3
-
-;[config_tweaks]
-;depth = 3
-
-
-[development]
-depth = 1
-nolink = 1
-
-;[implementation]
-;depth = 2
-;link = "http://dev.i2p.net/javadoc/"
-
-;[bugzilla]
-;depth = 2
-;link = "http://dev.i2p.net/bugzilla/index.cgi"
-
-[api]
-title = "API"
-depth = 2
-
-[sam]
-title = "SAM"
-
-[ministreaming]
-title = "ministreaming"
-
-[i2cp]
-title = "I2CP"
-
-[licenses]
-depth = 2
-
-[cvs]
-title = "CVS"
-depth = 2
-
-[links]
-depth = 1
diff --git a/menu.php b/menu.php
deleted file mode 100644
index f05b7d317..000000000
--- a/menu.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-error_reporting(E_ALL);
-
-function getpagetitle($page) {
-        global $site_structure;
-        if (isset($site_structure[$page]['title'])) {
-                return $site_structure[$page]['title'];
-        }
-        $title = str_replace ('_', ' ', $page);
-        return ucfirst($title);
-}
-
-function buildmenu() {
-        global $site_structure;
-        foreach ($site_structure as $page=>$page_config) {
-                if (isset($page_config['depth'])) {
-                        $title = getpagetitle($page);
-                        $link = '';
-                        $uri = '';
-                        if (isset($page_config['link'])) {
-                                $uri = $page_config['link'];
-                        } else {
-                                $uri = $page;
-                        }
-                        if (isset($page_config['nolink'])) {
-                                $link = $title;
-                        } else {
-				$link = "<a href=\"$uri\">$title</a>";	
-			}
-
-                        switch ($page_config['depth']) {
-                                case 1:
-                                        print "<br /><b>$link</b><br />\n";
-                                        break;
-                                case 2:
-                                        print "&bull;&nbsp;$link<br />\n";
-                                        break;
-                                case 3:
-                                        print "&nbsp;&nbsp;-&nbsp;$link<br />\n";
-                                        break;
-                                default:
-                        }
-
-                }
-        }
-}
-?>
diff --git a/mirror.i2p2/app.py b/mirror.i2p2/app.py
new file mode 100644
index 000000000..7c7a9e7aa
--- /dev/null
+++ b/mirror.i2p2/app.py
@@ -0,0 +1,33 @@
+from werkzeug import BaseRequest, BaseResponse, run_simple
+from werkzeug.exceptions import HTTPException
+from werkzeug.routing import RequestRedirect
+from random import randint
+
+class Request(BaseRequest):
+    """Useful subclass of the default request that knows how to build urls."""
+
+    def __init__(self, environ):
+        BaseRequest.__init__(self, environ)
+
+
+class Response(BaseResponse):
+    """Subclass of base response that has a default mimetype of text/html."""
+    default_mimetype = 'text/html'
+
+def read_mirrors():
+    file = open('mirrors', 'r')
+    dat = file.read()
+    file.close()
+    return dat.split('\n')
+
+
+def app(environ, start_response):
+    """The WSGI application that connects all together."""
+    req = Request(environ)
+    mirrors = read_mirrors()
+    mirror = mirrors[randint(0, len(mirrors) - 1)]
+    resp = RequestRedirect(mirror % req.path)
+    return resp(environ, start_response)
+
+if __name__ == '__main__':
+    run_simple('localhost', 5008, app)
diff --git a/mirror.i2p2/mirrors b/mirror.i2p2/mirrors
new file mode 100644
index 000000000..9229e8803
--- /dev/null
+++ b/mirror.i2p2/mirrors
@@ -0,0 +1 @@
+http://i2p.googlecode.com/files%s
\ No newline at end of file
diff --git a/mtn.i2p2/keys.txt b/mtn.i2p2/keys.txt
new file mode 100644
index 000000000..cfd0a5e6d
--- /dev/null
+++ b/mtn.i2p2/keys.txt
@@ -0,0 +1,61 @@
+Complication
+============
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+Hello,
+
+I confirm that my Monotone public keys are:
+
+1) Commit key
+
+[pubkey complication@mail.i2p]
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCx1F6nwBUCIiCPVsogy/h/+2d8X3uMcEdn
+RIN+gxO+0pK+yrGZiFwi7TG/K3PjDfJWuxsPRKLeb9Q4NmfxrAePelGig9llalrDnRkIcRFu
+cnNUOJo9C0MjvzYR9D6bIS3+udPdl6ou94JX+ueo2jLXI1lGgtdWDWTetJx9I++EvwIDAQAB
+[end]
+
+2) Transport key
+
+[pubkey complication-transport@mail.i2p]
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDP55FmBUIZjamtDinVDrLmS9uU40KoNfLd
+iB+t/iEgEWHDPQxlwugh/aBQwsXKGGJMJSNURKwwjfrcr5y3oz9jpRjtLVqoZMBVLgp28WGA
+9KbzXi4/dYhdyNmr4gHc17mDSlhCfk/L5QxifSYwSaeeFPsoAAyBBB221Z3197bmVQIDAQAB
+[end]
+
+With best regards,
+Complication.
+
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFHniai+h38a3n8zjMRAtvJAJ9G8QJYjUQGYOdnerqAJphY/65TmQCbB+Ei
+bEqkKHWUuJpsyo3urNDaQeI=
+=fOnK
+-----END PGP SIGNATURE-----
+
+
+
+
+zzz
+===
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+[pubkey zzz-transport@mail.i2p]
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDa2uZI1BobxS4TapMqmf4Ws3nyL3GYgkfb
+MEawyWl0E1pfHJ4dLZkdxQdcLyCsN9OCY4jRNzmoYnDa2HtBLINq15BJmGJ0cfIDLXIB2GBO
+ViAPRkEKQTVoc7IpcjtPPjtSBVganD/AW78m9cgUYag86Lbm2ynUaXWpw9i4gpLdLQIDAQAB
+[end]
+[pubkey zzz@mail.i2p]
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCtgaWY0Wc1c8pFGIxASZx78pHpHZKQV8z6
+IRQkgy65gQMjpLquaQpy3Xk8rkpnfA+6h3TS6bjplsEhlaQoxvpGxacRYOt+y1HC/n20O3RI
+E1A/e3sGKHGDEQW+3ItF4WSNfeQ18DzLeun32vFknq2k9im6Ts4tiYfKs8CZ5KW0/QIDAQAB
+[end]
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFHnN51QVV2uqduC+0RAv8NAJ9B/7pWKLvqVI6HnAifs9oedsdWSACfYS1E
+sFwJiw4A+Sr9wQrtoO4X4ow=
+=SVDV
+-----END PGP SIGNATURE-----
diff --git a/pages/.htaccess b/pages/.htaccess
deleted file mode 100644
index e5cff122e..000000000
--- a/pages/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Options Indexes FollowSymLinks
diff --git a/pages/footer.html b/pages/footer.html
deleted file mode 100644
index aa5a7c3eb..000000000
--- a/pages/footer.html
+++ /dev/null
@@ -1,4 +0,0 @@
-</div>
-
-</body>
-</html>
diff --git a/pages/header.html b/pages/header.html
deleted file mode 100644
index 23fd2f0c4..000000000
--- a/pages/header.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
-    "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" >
-<head>
-<title><?=$pagetitle?></title>
-<style><?php
-include('styles/default.css');
-?></style>
-<link rel="shortcut icon" href="favicon.ico" />
-</head>
-
-<body>
-
-<div class="hide"><a href="#main" title="Skip navigation" accesskey="2">Skip navigation</a></div>
-
-<div class="logo">
-<a href="home"><img src="images/i2plogo.png" alt="I2P Logo" width="178" height="35" /></a>
-</div>
-<h1><?=$pagetitle?></h1>
-
-<div class="menu">
-<?php buildmenu(); ?>
-</div>
-
-<div class="main" id="main">
diff --git a/pages/installation.html b/pages/installation.html
deleted file mode 100644
index a7fbc0f33..000000000
--- a/pages/installation.html
+++ /dev/null
@@ -1 +0,0 @@
-Please see the <a href="download">download</a> page for installation details.
\ No newline at end of file
diff --git a/routercheck.php b/routercheck.php
deleted file mode 100644
index 2473d116c..000000000
--- a/routercheck.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-function guessIP() {
-    return $_SERVER['REMOTE_ADDR'];
-}
-
-function routercheck($hostname, $port) {
-    $fp = @fsockopen($hostname, $port, $errno, $errstr, 5);
-    if ($fp) {
-        socket_set_timeout($fp, 10);
-        $version = fread($fp, 1);
-        if ($version == 'B') {
-            return "OKAY looks like we found a router";
-        } else {
-            return "ERROR invalid service/version";
-        }
-        fclose($fp);
-    } else {
-        return "ERROR hostname/port not open";
-    }
-}
-
-$hostname = guessIP();
-$port = '8887';
-$msg = '';
-
-if(isset($_REQUEST['hostname']) and isset($_REQUEST['port'])) {
-    $hostname = $_REQUEST['hostname'];
-    $port = $_REQUEST['port'];
-    if (($port>0) && ($port<65536)) {
-        $msg = routercheck($hostname, $port);
-    } else {
-        $msg = "ERROR invalid port range";
-    }
-}
-
-?>
-<html>
-<head><title>I2P Router check</title></head>
-<body>
-<h1>I2P Router check</h1>
-<h2><?=$msg?></h2>
-<form method="post">
-<p>Host/Port: <br>
-<input name="hostname" value="<?=$hostname?>" type="text" size="30" maxlength="60">
-<input name="port" value="<?=$port?>" type="text" size="6" maxlength="5">
-</p>
-<input type="submit" value="submit">
-<input type="reset" value=" reset">
-</form>
-</body>
-</html>
-
diff --git a/www.i2p2/app.py b/www.i2p2/app.py
new file mode 100644
index 000000000..06af89458
--- /dev/null
+++ b/www.i2p2/app.py
@@ -0,0 +1,53 @@
+from werkzeug import BaseRequest, BaseResponse, escape, run_simple, SharedDataMiddleware
+from werkzeug.exceptions import HTTPException
+from werkzeug.routing import RequestRedirect
+from jinja import Environment, FileSystemLoader
+from jinja.exceptions import TemplateNotFound
+import os
+from random import randint
+
+class Request(BaseRequest):
+    """Useful subclass of the default request that knows how to build urls."""
+
+    def __init__(self, environ):
+        BaseRequest.__init__(self, environ)
+
+
+class Response(BaseResponse):
+    """Subclass of base response that has a default mimetype of text/html."""
+    default_mimetype = 'text/html'
+
+
+# setup jinja
+env = Environment(loader=FileSystemLoader('pages', use_memcache=True))
+
+def read_mirrors():
+    file = open('mirrors', 'r')
+    dat = file.read()
+    file.close()
+    return dat.split('\n')
+
+
+def app(environ, start_response):
+    """The WSGI application that connects all together."""
+    req = Request(environ)
+    path = req.path[1:].lower()
+    if path == '':
+        path = 'index'
+    try:
+        try:
+            path.index('.')
+            tmpl = env.get_template(path)
+        except ValueError:
+            tmpl = env.get_template(path + '.html')
+    except TemplateNotFound:
+        tmpl = env.get_template('not_found.html')
+    resp = Response(tmpl.render())
+    return resp(environ, start_response)
+
+app = SharedDataMiddleware(app, {
+    '/_static': os.path.join(os.path.dirname(__file__), 'static'),
+    '/.bzr': os.path.join(os.path.dirname(__file__), '../.bzr')
+})
+if __name__ == '__main__':
+    run_simple('localhost', 5009, app)
diff --git a/www.i2p2/generate.py b/www.i2p2/generate.py
new file mode 100644
index 000000000..9893c8833
--- /dev/null
+++ b/www.i2p2/generate.py
@@ -0,0 +1,26 @@
+#!/usr/bin/env python
+import os
+from jinja import Environment, FileSystemLoader
+#from codecs import open
+
+env = Environment(loader=FileSystemLoader('pages'), trim_blocks=True, friendly_traceback=False)
+
+
+def get_files(folder):
+    for fn in os.listdir(folder):
+        if fn.startswith('_'):
+            continue
+        fn = os.path.join(folder, fn)
+        if os.path.isdir(fn):
+            for item in get_files(fn):
+                yield item
+        else:
+            yield fn
+
+for filename in get_files('pages'):
+    filename = filename.split('/', 2)[1]
+    t = env.get_template(filename)
+    f = open(os.path.join('out', filename), 'w')
+    f.write(t.render().encode('utf-8'))
+    f.close()
+    print filename
\ No newline at end of file
diff --git a/www.i2p2/generate.sh b/www.i2p2/generate.sh
new file mode 100755
index 000000000..c75a90850
--- /dev/null
+++ b/www.i2p2/generate.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+rm -rf out
+mkdir out
+cp -R static out/_static
+python generate.py
\ No newline at end of file
diff --git a/www.i2p2/pages/_config b/www.i2p2/pages/_config
new file mode 100644
index 000000000..17ad7c907
--- /dev/null
+++ b/www.i2p2/pages/_config
@@ -0,0 +1 @@
+{# Jinja Config file #}
\ No newline at end of file
diff --git a/www.i2p2/pages/_layout.html b/www.i2p2/pages/_layout.html
new file mode 100644
index 000000000..077451880
--- /dev/null
+++ b/www.i2p2/pages/_layout.html
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+    "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" >
+  <head>
+    <title>{% filter capture('title') %}{% block title %}{% endblock %}{% endfilter %} - I2P</title>
+    <link rel="stylesheet" href="_static/styles/default.css" type="text/css">
+    <link rel="shortcut icon" href="_static/favicon.ico" />
+  </head>
+  <body>
+    <div class="hide"><a href="#main" title="Skip navigation" accesskey="2">Skip navigation</a></div>
+    <div class="logo">
+      <a href="index.html"><img src="_static/images/i2plogo.png" alt="I2P Logo" width="178" height="35" /></a>
+    </div>
+    <h1>{{ title }}</h1>
+    <div class="menu">
+      {% include "_menu.html" %}
+    </div>
+    <div class="main" id="main">
+      {% block content %}{% endblock %}
+    </div>
+  </body>
+</html>
diff --git a/www.i2p2/pages/_menu.html b/www.i2p2/pages/_menu.html
new file mode 100644
index 000000000..4f1a575d5
--- /dev/null
+++ b/www.i2p2/pages/_menu.html
@@ -0,0 +1,30 @@
+<br /><a href="index.html">Welcome to I2P</a></b><br />
+<br /><b><a href="download.html">Download</a></b><br />
+&bull;&nbsp;<a href="http://dev.i2p.net/cgi-bin/cvsweb.cgi/i2p/history.txt?rev=HEAD">Latest changes</a><br />
+<br /><b>News</b><br />
+&bull;&nbsp;<a href="announcements.html">Announcements</a><br />
+&bull;&nbsp;<a href="http://dev.i2p.net/pipermail/i2p/">Mailinglist</a><br />
+
+&bull;&nbsp;<a href="meetings.html">Meetings</a><br />
+&bull;&nbsp;<a href="roadmap.html">Roadmap</a><br />
+&bull;&nbsp;<a href="todo.html">Task list</a><br />
+<br /><b><a href="intro.html">About I2P</a></b><br />
+&bull;&nbsp;<a href="faq.html">FAQ</a><br />
+&bull;&nbsp;<a href="http://forum.i2p2.de/">Forums</a><br />
+&bull;&nbsp;<a href="bounties.html">Bounties</a><br />
+&bull;&nbsp;<a href="getinvolved.html">Get involved</a><br />
+&bull;&nbsp;<a href="donate.html">Donate!</a><br />
+
+&bull;&nbsp;<a href="team.html">I2P Team</a><br />
+&bull;&nbsp;<a href="halloffame.html">Hall of Fame</a><br />
+<br /><b>Documentation</b><br />
+&bull;&nbsp;<a href="how.html">How does it work?</a><br />
+&bull;&nbsp;<a href="http://dev.i2p.net/cgi-bin/cvsweb.cgi/i2p/router/doc/techintro.html?rev=HEAD">Tech intro</a><br />
+&bull;&nbsp;<a href="howto.html">Howto docs</a><br />
+&bull;&nbsp;<a href="applications.html">Applications</a><br />
+<br /><b>Development</b><br />
+&bull;&nbsp;<a href="api.html">API</a><br />
+
+&bull;&nbsp;<a href="licenses.html">Licenses</a>
+<br /><b><a href="links.html">Links</a></b><br />
+<a href="impressum.html">Impressum</a><br />
\ No newline at end of file
diff --git a/pages/announcements.html b/www.i2p2/pages/announcements.html
similarity index 98%
rename from pages/announcements.html
rename to www.i2p2/pages/announcements.html
index 8fd369e6a..23792071d 100644
--- a/pages/announcements.html
+++ b/www.i2p2/pages/announcements.html
@@ -1,3 +1,6 @@
+{% extends "_layout.html" %}
+{% block title %}Announcements{% endblock %}
+{% block content %}
 <h3>Past announcements</h3>
 <h4>2007</h4>
 <ul>
@@ -106,3 +109,4 @@
 <li>2003-12-27 - <a href="http://dev.i2p.net/pipermail/i2p/2003-December/000023.html">0.2.3.2</a></li>
 <li>2003-12-15 - <a href="http://dev.i2p.net/pipermail/i2p/2003-December/000002.html">0.2.3</a></li>
 </ul>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/api.html b/www.i2p2/pages/api.html
similarity index 78%
rename from pages/api.html
rename to www.i2p2/pages/api.html
index dbab2ec3b..1f3768d02 100644
--- a/pages/api.html
+++ b/www.i2p2/pages/api.html
@@ -1,3 +1,6 @@
+{% extends "_layout.html" %}
+{% block title %}Home{% endblock %}
+{% block content %}
 <p>Application developers should review the <a href="applications">application 
 development guide</a> for ideas about the four basic protocols for writing an
 application to run over I2P:</p>
@@ -7,3 +10,4 @@ application to run over I2P:</p>
 <li><a href="i2cp">I2CP</a></li>
 <li><a href="datagrams">Datagrams</a></li>
 </ul>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/applications.html b/www.i2p2/pages/applications.html
similarity index 99%
rename from pages/applications.html
rename to www.i2p2/pages/applications.html
index a7e0d1867..feeae50b2 100644
--- a/pages/applications.html
+++ b/www.i2p2/pages/applications.html
@@ -1,3 +1,6 @@
+{% extends "_layout.html" %}
+{% block title %}Applications{% endblock %}
+{% block content %}
 <h1>Application development guide</h1>
 
 <h2>Why write I2P specific code?</h2>
@@ -171,3 +174,4 @@ then fetching those messages by calling
 in something other than Java there is a significant amount of code to be written (encryption routines, 
 object marshalling, asynchronous message handling, etc).  While someone could write an I2CP library in 
 C or something else, it would most likely be more useful to use the C SAM library instead. </p>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/bounties.html b/www.i2p2/pages/bounties.html
similarity index 96%
rename from pages/bounties.html
rename to www.i2p2/pages/bounties.html
index adb01cd4f..636eba846 100644
--- a/pages/bounties.html
+++ b/www.i2p2/pages/bounties.html
@@ -1,3 +1,6 @@
+{% extends "_layout.html" %}
+{% block title %}Bounties{% endblock %}
+{% block content %}
 <p>While we always gratefully accept any contributions of code, 
 documentation, and the like, there are other ways to help I2P move 
 forward.  As with any open source project, our goals would be achieved more 
@@ -77,3 +80,4 @@ etc), and the like.</p>
 
 <p><i><sup>*</sup> Dev lists anyone who may already be working on the bounty - collaboration is preferred, so if you're interested in working on it, please contact one of the people listed!</i></p>
 
+{% endblock %}
\ No newline at end of file
diff --git a/pages/bounty_unittests.html b/www.i2p2/pages/bounty_unittests.html
similarity index 91%
rename from pages/bounty_unittests.html
rename to www.i2p2/pages/bounty_unittests.html
index dd054a060..b9ccdc9cc 100644
--- a/pages/bounty_unittests.html
+++ b/www.i2p2/pages/bounty_unittests.html
@@ -1,4 +1,6 @@
-<p>To improve I2P's maintainability, we want to have a solid set of
+{% extends "_layout.html" %}
+{% block title %}Bounty unittests{% endblock %}
+{% block content %}<p>To improve I2P's maintainability, we want to have a solid set of
 automated unit tests for the critical code.  While we do have some
 unit tests at the moment, they are ad-hoc.  This bounty is for 
 someone to move the tests over to jUnit, automate their execution,
@@ -45,3 +47,4 @@ measured code coverage of 90% of the streaming lib
 <p><i>Note: bounty amounts may be increased by further donations.  Do
 you think these are important?  <a href="donate">Add in your donation</a>, 
 marking the amount for the unit test bounty!</i></p>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/cvs.html b/www.i2p2/pages/cvs.html
similarity index 84%
rename from pages/cvs.html
rename to www.i2p2/pages/cvs.html
index f0ae1b994..84bb161e2 100644
--- a/pages/cvs.html
+++ b/www.i2p2/pages/cvs.html
@@ -1,4 +1,6 @@
-<p>The I2P sourcecode is kept in a CVS repository. For those who aren't very
+{% extends "_layout.html" %}
+{% block title %}CVS{% endblock %}
+{% block content %}<p>The I2P sourcecode is kept in a CVS repository. For those who aren't very
 familiar with cvs, there is a
 <a href="http://cvsbook.red-bean.com/cvsbook.html">fantastic book</a> on the
 subject (developers only need to deal with the first chapter - "An Overview of
@@ -25,3 +27,4 @@ Password: anoncvs</p>
 
 <p>Humourous quote from WinCVS: "Did you know...  Never experiment with new CVS
 commands on your working repository.  Create a sample module instead."</p>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/datagrams.html b/www.i2p2/pages/datagrams.html
similarity index 73%
rename from pages/datagrams.html
rename to www.i2p2/pages/datagrams.html
index d1519eeea..e117aa4f9 100644
--- a/pages/datagrams.html
+++ b/www.i2p2/pages/datagrams.html
@@ -1,4 +1,6 @@
-<p>Datagrams build upon the base <a href="i2cp">I2CP</a> to provide authenticated
+{% extends "_layout.html" %}
+{% block title %}Datagrams{% endblock %}
+{% block content %}<p>Datagrams build upon the base <a href="i2cp">I2CP</a> to provide authenticated
 and repliable messages in a standard format.  This lets applications reliably read
 the "from" address out of a datagram and know that the address really sent the
 message.  This is necessary for some applications since the base I2P message is
@@ -8,4 +10,4 @@ message and sender is authenticated by signing the payload.</p>
 <p>Applications written in Java that want to use datagrams can access the 
 <a href="http://www.i2p.net/javadoc/net/i2p/client/datagram/package-summary.html">net.i2p.client.datagram</a>
 package (a part of the core SDK in i2p.jar), while applications in other languages 
-can use <a href="sam">SAM</a>'s datagram support.</p>
\ No newline at end of file
+can use <a href="sam">SAM</a>'s datagram support.</p>{% endblock %}
\ No newline at end of file
diff --git a/pages/donate.html b/www.i2p2/pages/donate.html
similarity index 97%
rename from pages/donate.html
rename to www.i2p2/pages/donate.html
index 4815f1a57..ce76dd3e3 100644
--- a/pages/donate.html
+++ b/www.i2p2/pages/donate.html
@@ -1,4 +1,6 @@
-<p>Thank you for your interest in contributing to I2P! The details of how you
+{% extends "_layout.html" %}
+{% block title %}Donate{% endblock %}
+{% block content %}<p>Thank you for your interest in contributing to I2P! The details of how you
 can make your contribution are provided below:</p>
 
 <h2><a href="http://www.paypal.com/" target="_new">PayPal</a></h2>
@@ -152,3 +154,4 @@ Account number: 1274080</p>
 </form>
 
 <br /><br />
+{% endblock %}
\ No newline at end of file
diff --git a/pages/download.html b/www.i2p2/pages/download.html
similarity index 80%
rename from pages/download.html
rename to www.i2p2/pages/download.html
index 909629b7c..e713738ae 100644
--- a/pages/download.html
+++ b/www.i2p2/pages/download.html
@@ -1,20 +1,22 @@
-<h3>Clean installs</h3>
+{% extends "_layout.html" %}
+{% block title %}Download{% endblock %}
+{% block content %}<h3>Clean installs</h3>
 <ul>
 <li>Graphical installer:<br />
-    <a href="http://dev.i2p.net/i2p/i2pinstall.exe">i2pinstall.exe</a>
+    <a href="http://mirror.i2p2.de/i2pinstall.exe">i2pinstall.exe</a>
     (SHA1 929b6646033302bf08e152992f247085924b5c82
-     <a href="http://dev.i2p.net/i2p/i2pinstall.exe.sig">sig</a>)<br /> 
+     <a href="http://mirror.i2p2.de/i2pinstall.exe.sig">sig</a>)<br /> 
     Download that file and run it.  If you're not on windows, you can 
     type <code>java -jar i2pinstall.exe</code> (yes, really)</li>
 <li>Headless install:<br />
-    <a href="http://dev.i2p.net/i2p/i2p.tar.bz2">i2p.tar.bz2</a>
+    <a href="http://mirror.i2p2.de/i2p.tar.bz2">i2p.tar.bz2</a>
     (SHA1 50709313a4fedb4fabe684bd9bc40165bee62fc3
-     <a href="http://dev.i2p.net/i2p/i2p.tar.bz2.sig">sig</a>)<br />
+     <a href="http://mirror.i2p2.de/i2p.tar.bz2.sig">sig</a>)<br />
     Run <code>(tar xjvf i2p.tar.bz2 ; cd i2p ; vi install-headless.txt)</code></li>
 <li>Source install:<br />
-    <a href="http://dev.i2p.net/i2p/i2p-0.6.1.30.tar.bz2">i2p-0.6.1.30.tar.bz2</a>
+    <a href="http://mirror.i2p2.de/i2p-0.6.1.30.tar.bz2">i2p-0.6.1.30.tar.bz2</a>
     (SHA1 6b82dcd305a819a3eb9236a70a9e125897bba048
-     <a href="http://dev.i2p.net/i2p/i2p-0.6.1.30.tar.bz2.sig">sig</a>)<br />
+     <a href="http://mirror.i2p2.de/i2p-0.6.1.30.tar.bz2.sig">sig</a>)<br />
     Alternately, you can fetch the source from <a href="cvs">cvs</a> (CVS HEAD
     gets you the most recent updates, while the tag <code>i2p_0_6_1_30</code> gets you
     the release)<br/>
@@ -37,7 +39,7 @@ can be accessed at its usual location.</p>
 
 <p>When installing for the first time, please remember to <b>adjust your NAT/firewall</b>
 if you can, bearing in mind the Internet-facing ports I2P uses,
-<a href="http://www.i2p.net/faq#ports">described here</a> among other ports.</p>
+<a href="http://www.i2p2.de/faq#ports">described here</a> among other ports.</p>
 
 <h3>Updates from earlier releases:</h3>
 <ol>
@@ -60,3 +62,4 @@ if you can, bearing in mind the Internet-facing ports I2P uses,
 <li>Click <a href="http://localhost:7657/configservice.jsp">"Graceful restart"</a></li>
 <li>Grab a cup of coffee and come back in 11 minutes</li>
 </ol>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/faq.html b/www.i2p2/pages/faq.html
similarity index 97%
rename from pages/faq.html
rename to www.i2p2/pages/faq.html
index d1e0673aa..1d46ec34c 100644
--- a/pages/faq.html
+++ b/www.i2p2/pages/faq.html
@@ -1,4 +1,6 @@
-<h3 id="remote_webconsole">How can I access the web console from my other machines or password protect it?
+{% extends "_layout.html" %}
+{% block title %}FAQ{% endblock %}
+{% block content %}<h3 id="remote_webconsole">How can I access the web console from my other machines or password protect it?
 <span class="permalink">(<a href="#remote_webconsole">link</a>)</span></h3>
 <p>
     For security purposes, the router's admin console by default only listens
@@ -158,3 +160,4 @@
     the <a href="http://forum.i2p.net/">forum</a> and we'll post it here (with
     the answer, hopefully).
 </p>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/getinvolved.html b/www.i2p2/pages/getinvolved.html
similarity index 69%
rename from pages/getinvolved.html
rename to www.i2p2/pages/getinvolved.html
index 119aef676..6c7b1bc05 100644
--- a/pages/getinvolved.html
+++ b/www.i2p2/pages/getinvolved.html
@@ -1,7 +1,10 @@
-<p>To get involved, please feel free to join us on the #i2p IRC channel (on
+{% extends "_layout.html" %}
+{% block title %}getinvolved{% endblock %}
+{% block content %}<p>To get involved, please feel free to join us on the #i2p IRC channel (on
 irc.freenode.net, or within I2P on irc.duck.i2p or irc.postman.i2p). In
 addition, we have a <a href="http://dev.i2p.net/pipermail/i2p/">mailing list</a>
 And meetings are held every Tuesday at 9PM GMT on IRC
 (with meeting logs kept <a href="meetings">online</a>).</p>
 <p>If you're interested in joining our <a href="team">team</a>, please get in
 touch as we're always looking for eager contributors!</p>    
+{% endblock %}
\ No newline at end of file
diff --git a/pages/halloffame.html b/www.i2p2/pages/halloffame.html
similarity index 97%
rename from pages/halloffame.html
rename to www.i2p2/pages/halloffame.html
index d90512743..34f3cf75e 100644
--- a/pages/halloffame.html
+++ b/www.i2p2/pages/halloffame.html
@@ -1,4 +1,6 @@
-<b>Current balance: $2407, as of $Date: 2006-12-06 01:11:09 $</b>
+{% extends "_layout.html" %}
+{% block title %}halloffame{% endblock %}
+{% block content %}<b>Current balance: $2407, as of $Date: 2007-03-13 19:45:12 $</b>
 <br />
 <b>Current monthly running costs:</b><br />
 <table border="1">
@@ -99,3 +101,4 @@
 If you have made a donation, please send an email to <a href="mailto:donations@i2p.net">jrandom</a>
 with you name or nick (and optionally homepage) so we can list you here.
 </p>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/how.html b/www.i2p2/pages/how.html
similarity index 83%
rename from pages/how.html
rename to www.i2p2/pages/how.html
index d358eb9e4..4ef381778 100644
--- a/pages/how.html
+++ b/www.i2p2/pages/how.html
@@ -1,4 +1,6 @@
-<ul>
+{% extends "_layout.html" %}
+{% block title %}How{% endblock %}
+{% block content %}<ul>
 <li><a href="how_intro">Intro</a></li>
 <li><a href="how_threatmodel">Threat model</a></li>
 <li><a href="how_tunnelrouting">Tunnel routing</a></li>
@@ -11,3 +13,4 @@
 </li>
 <li><a href="how_networkcomparisons">Network comparisons</a></li>
 </ul>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/how_cryptography.html b/www.i2p2/pages/how_cryptography.html
similarity index 98%
rename from pages/how_cryptography.html
rename to www.i2p2/pages/how_cryptography.html
index 9f7915d96..2070838d3 100644
--- a/pages/how_cryptography.html
+++ b/www.i2p2/pages/how_cryptography.html
@@ -1,4 +1,6 @@
-<p>
+{% extends "_layout.html" %}
+{% block title %}How cryptography{% endblock %}
+{% block content %}<p>
 There are a handful of cryptographic algorithms in use within I2P, but we have
 reduced them to a bare minimum to deal with our needs - one symmetric algorithm
 one asymmetric algorithm, one signing algorithm, and one hashing algorithm.  However, 
@@ -156,4 +158,4 @@ However, this is extended by
 <a href="http://dev.i2p.net/cgi-bin/cvsweb.cgi/i2p/router/java/src/net/i2p/router/transport/tcp/RestrictiveTCPConnection.java">[RestrictiveTCPConnection]</a>
 which updates the establishConnection() method to validate the protocol version, the time, and
 the peer's publicly reachable addresses (since we don't support restricted routes yet, we 
-refuse to talk to those who other people can't talk to as well).  
\ No newline at end of file
+refuse to talk to those who other people can't talk to as well).  {% endblock %}
\ No newline at end of file
diff --git a/pages/how_elgamalaes.html b/www.i2p2/pages/how_elgamalaes.html
similarity index 96%
rename from pages/how_elgamalaes.html
rename to www.i2p2/pages/how_elgamalaes.html
index d801e3ae7..57aaa4cbd 100644
--- a/pages/how_elgamalaes.html
+++ b/www.i2p2/pages/how_elgamalaes.html
@@ -1,4 +1,6 @@
-<p>
+{% extends "_layout.html" %}
+{% block title %}How elgamalaes{% endblock %}
+{% block content %}<p>
 Within I2P, various messages are encrypted, but we don't want anyone to know 
 to whom or from whom it is bound, so we can't just toss a "to" or "from" address.
 In addition, messages are not delivered in order (or reliably), so we can't simply
@@ -75,3 +77,4 @@ as follows -</p>
 <p>Followed by the AES encrypted block above (2 byte # session tags,
 that many session tags, sizeof(payload), H(payload), flag, payload,
 random padding).</p>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/how_garlicrouting.html b/www.i2p2/pages/how_garlicrouting.html
similarity index 95%
rename from pages/how_garlicrouting.html
rename to www.i2p2/pages/how_garlicrouting.html
index 6e936146f..0b15cc05f 100644
--- a/pages/how_garlicrouting.html
+++ b/www.i2p2/pages/how_garlicrouting.html
@@ -1,4 +1,6 @@
-<p>
+{% extends "_layout.html" %}
+{% block title %}How garlicrouting{% endblock %}
+{% block content %}<p>
 As briefly explained on the <a href="how_intro">intro</a>, in addition to sending 
 messages through tunnels (via <a href="how_tunnelrouting">tunnels</a>), I2P uses a technique called
 "garlic routing" - layered encryption of messages, passing through routers 
@@ -49,4 +51,4 @@ The term garlic routing was first coined by Michael Freedman in Roger Dingledine
 <a href="http://onion-router.net/">[Onion Routing]</a>.  The main difference with I2P's garlic routing
 is that the path is unidirectional - there is no "turning point" as seen in onion routing
 or mixmaster reply blocks, which greatly simplifies the algorithm and allows for more flexible
-and reliable delivery.
\ No newline at end of file
+and reliable delivery.{% endblock %}
\ No newline at end of file
diff --git a/pages/how_intro.html b/www.i2p2/pages/how_intro.html
similarity index 98%
rename from pages/how_intro.html
rename to www.i2p2/pages/how_intro.html
index c8b58dd26..8f8f19d20 100644
--- a/pages/how_intro.html
+++ b/www.i2p2/pages/how_intro.html
@@ -1,4 +1,6 @@
-<i>Note: these documents have not yet been updated to include the changes made
+{% extends "_layout.html" %}
+{% block title %}How intro{% endblock %}
+{% block content %}<i>Note: these documents have not yet been updated to include the changes made
 in I2P 0.5 - the new 
 <a href="http://dev.i2p.net/cgi-bin/cvsweb.cgi/i2p/router/doc/tunnel-alt.html?rev=HEAD">tunnel 
 routing and encryption</a> algorithms, addressing <a href="todo#tunnelId">several</a>
@@ -142,3 +144,4 @@ Tuesday at 9pm GMT with <a href="meetings">archives available</a>.</p>
 	<pre>
 cvs -d :pserver:anoncvs@i2p.net/cvsroot co i2p</pre>
 <p>with the password <code>anoncvs</code>. </p>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/how_networkcomparisons.html b/www.i2p2/pages/how_networkcomparisons.html
similarity index 98%
rename from pages/how_networkcomparisons.html
rename to www.i2p2/pages/how_networkcomparisons.html
index 5923d4a2b..4d3c2c990 100644
--- a/pages/how_networkcomparisons.html
+++ b/www.i2p2/pages/how_networkcomparisons.html
@@ -1,4 +1,6 @@
-<p>There are a great many other applications and projects working on anonymous 
+{% extends "_layout.html" %}
+{% block title %}How networkcomparisons{% endblock %}
+{% block content %}<p>There are a great many other applications and projects working on anonymous 
 communication and I2P has been inspired by much of their efforts.  This is not 
 a comprehensive list of anonymity resources - both freehaven's 
 <a href="http://freehaven.net/anonbib/topic.html">Anonymity Bibliography</a>
@@ -301,3 +303,4 @@ while these networks can work great at small scales, they are not suitable for l
 someone wants to get in touch with another specific peer.  That does not mean that there is no 
 value in these systems, just that their applicability is limited to situations where their 
 particular issues can be addressed.</p>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/how_networkdatabase.html b/www.i2p2/pages/how_networkdatabase.html
similarity index 96%
rename from pages/how_networkdatabase.html
rename to www.i2p2/pages/how_networkdatabase.html
index 4a4119d06..4e09f544b 100644
--- a/pages/how_networkdatabase.html
+++ b/www.i2p2/pages/how_networkdatabase.html
@@ -1,4 +1,6 @@
-<p>I2P's network database is a specialized kademlia derived DHT, containing 
+{% extends "_layout.html" %}
+{% block title %}How networkdatabase{% endblock %}
+{% block content %}<p>I2P's network database is a specialized kademlia derived DHT, containing 
 just two types of data - router contact information and destination contact
 information.  Each piece of data is signed by the appropriate party and verified
 by anyone who uses or stores it.  In addition, the data has liveliness information
@@ -110,4 +112,4 @@ fairly small (only 200 nodes), and we have not yet had to deal with the situatio
 that kademlia really shines in - times when there are thousands or even millions
 of peers in the network.  The netDb implementation more than adequately meets our
 needs at the moment, but there will likely be further tuning and bugfixing as 
-the network grows.</p>
\ No newline at end of file
+the network grows.</p>{% endblock %}
\ No newline at end of file
diff --git a/pages/how_peerselection.html b/www.i2p2/pages/how_peerselection.html
similarity index 96%
rename from pages/how_peerselection.html
rename to www.i2p2/pages/how_peerselection.html
index 80596eca8..a12801911 100644
--- a/pages/how_peerselection.html
+++ b/www.i2p2/pages/how_peerselection.html
@@ -1,4 +1,6 @@
-<p>Peer selection within I2P is simply the process of choosing which routers
+{% extends "_layout.html" %}
+{% block title %}How peerselection{% endblock %}
+{% block content %}<p>Peer selection within I2P is simply the process of choosing which routers
 on the network we want our messages to go through (which peers will we 
 ask to join our tunnels).  To accomplish this, we keep track of how each
 peer performs (the peer's "profile") and use that data to estimate how 
@@ -96,4 +98,4 @@ across peers as well as to prevent some simple attacks.</p>
 
 These groupings are implemented in the <a 
 href="http://dev.i2p.net/cgi-bin/cvsweb.cgi/i2p/router/java/src/net/i2p/router/peermanager/ProfileOrganizer.java?rev=HEAD&content-type=text/x-cvsweb-markup">ProfileOrganizer</a>'s
-reorganize() method (using the calculateThresholds() and locked_placeProfile() methods in turn).</p>
\ No newline at end of file
+reorganize() method (using the calculateThresholds() and locked_placeProfile() methods in turn).</p>{% endblock %}
\ No newline at end of file
diff --git a/pages/how_threatmodel.html b/www.i2p2/pages/how_threatmodel.html
similarity index 99%
rename from pages/how_threatmodel.html
rename to www.i2p2/pages/how_threatmodel.html
index 164ef2a6d..0987b5965 100644
--- a/pages/how_threatmodel.html
+++ b/www.i2p2/pages/how_threatmodel.html
@@ -1,4 +1,6 @@
-<h1>What do we mean by "anonymous"?</h1>
+{% extends "_layout.html" %}
+{% block title %}How threatmodel{% endblock %}
+{% block content %}<h1>What do we mean by "anonymous"?</h1>
 
 <p>Your level of anonymity can be described as how hard it is for someone
 to find out information you don't want them to know - who you are, where
@@ -334,3 +336,4 @@ modification).  Documentation for the design and implementation of the network a
 the software components are an essential part of security, as without them it is 
 unlikely that developers would be willing to spend the time to learn the software 
 enough to identify shortcomings and bugs.</p>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/how_tunnelrouting.html b/www.i2p2/pages/how_tunnelrouting.html
similarity index 97%
rename from pages/how_tunnelrouting.html
rename to www.i2p2/pages/how_tunnelrouting.html
index fde061939..5168711bd 100644
--- a/pages/how_tunnelrouting.html
+++ b/www.i2p2/pages/how_tunnelrouting.html
@@ -1,4 +1,6 @@
-<i>Note: these documents have not yet been updated to include the changes made
+{% extends "_layout.html" %}
+{% block title %}How tunnelrouting{% endblock %}
+{% block content %}<i>Note: these documents have not yet been updated to include the changes made
 in I2P 0.5 - the new 
 <a href="http://dev.i2p.net/cgi-bin/cvsweb.cgi/i2p/router/doc/tunnel-alt.html?rev=HEAD">tunnel 
 routing and encryption</a> algorithms, addressing <a href="todo#tunnelId">several</a>
@@ -169,4 +171,4 @@ instructions can specify delivery to a specific router or can point at a tunnel)
 		its allocated?</li>
 	<li>I2P 3.0 tunnel mixing / pooling details</li>
 	<li>Tunnel throttling details</li>
-</ul>
\ No newline at end of file
+</ul>{% endblock %}
\ No newline at end of file
diff --git a/pages/howto.html b/www.i2p2/pages/howto.html
similarity index 70%
rename from pages/howto.html
rename to www.i2p2/pages/howto.html
index 13b6ab4f9..cac7a959a 100644
--- a/pages/howto.html
+++ b/www.i2p2/pages/howto.html
@@ -1,5 +1,7 @@
-<ul>
+{% extends "_layout.html" %}
+{% block title %}Howto{% endblock %}
+{% block content %}<ul>
 <li><a href="http://forum.i2p.net/viewtopic.php?t=54">Installing Java for I2P on FreeBSD</a></li>
 <li><a href="howto_blojsom">Installing blojsom for an eepsite</a></li>
 <li><a href="http://forum.i2p.net/viewtopic.php?t=194#578">Run eepsite(s) with Apache</a></li>
-</ul>
\ No newline at end of file
+</ul>{% endblock %}
\ No newline at end of file
diff --git a/pages/howto_blojsom.html b/www.i2p2/pages/howto_blojsom.html
similarity index 94%
rename from pages/howto_blojsom.html
rename to www.i2p2/pages/howto_blojsom.html
index e8bdfd55a..f8c665769 100644
--- a/pages/howto_blojsom.html
+++ b/www.i2p2/pages/howto_blojsom.html
@@ -1,4 +1,6 @@
-<p>Instructions for installing 
+{% extends "_layout.html" %}
+{% block title %}Howto Blojsom{% endblock %}
+{% block content %}<p>Instructions for installing 
 <a href="http://wiki.blojsom.com/wiki/display/blojsom/About+blojsom">blojsom</a>
 in the default eepsite container:</p>
 
@@ -41,3 +43,4 @@ and save to eepsite/webapps/</li>
 <li> blog entries will be stored under ~/blojsom-blogs/default/</li>
 <li> like all eepsites, comments are dangerous, as they may include raw html.  </li>
 </ul>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/i2cp.html b/www.i2p2/pages/i2cp.html
similarity index 90%
rename from pages/i2cp.html
rename to www.i2p2/pages/i2cp.html
index abd70bb85..b18c143e2 100644
--- a/pages/i2cp.html
+++ b/www.i2p2/pages/i2cp.html
@@ -1,4 +1,6 @@
-<p>The I2P Client Protocol (I2CP) exposes a strong seperation of concerns between
+{% extends "_layout.html" %}
+{% block title %}I2CP{% endblock %}
+{% block content %}<p>The I2P Client Protocol (I2CP) exposes a strong seperation of concerns between
 the router and any client that wishes to communicate over the network.  It enables
 secure and asynchronous messaging by sending and receiving messages over a 
 single TCP socket, yet never exposing any private keys and authenticating itself
@@ -24,3 +26,4 @@ August of 2003, there have been minor modifications on occation, and until the
 network as a whole is thoroughly peer reviewed (including the 
 <a href="how_cryptography">encryption</a> used), making a hard and fast byte level
 protocol specification does not seem like a wise use of time.</p>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/i2ptunnel.html b/www.i2p2/pages/i2ptunnel.html
similarity index 98%
rename from pages/i2ptunnel.html
rename to www.i2p2/pages/i2ptunnel.html
index ad9505c3d..91453ca51 100644
--- a/pages/i2ptunnel.html
+++ b/www.i2p2/pages/i2ptunnel.html
@@ -1,4 +1,6 @@
-Below is quick copy of aum's eepsite deployment guide.
+{% extends "_layout.html" %}
+{% block title %}i2ptunnel{% endblock %}
+{% block content %}Below is quick copy of aum's eepsite deployment guide.
 <br />
 <br />
 
@@ -80,3 +82,4 @@ Below is quick copy of aum's eepsite deployment guide.
 <li>Exercise for Windows users - port setupServer.py into a MS-DOS .BAT file.</li>
 </ul></li>
 </ol>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/i2ptunnel_migration.html b/www.i2p2/pages/i2ptunnel_migration.html
similarity index 92%
rename from pages/i2ptunnel_migration.html
rename to www.i2p2/pages/i2ptunnel_migration.html
index c0c0a7267..14bcdc41e 100644
--- a/pages/i2ptunnel_migration.html
+++ b/www.i2p2/pages/i2ptunnel_migration.html
@@ -1,4 +1,6 @@
-<h3>I2PTunnel migration:</h3>
+{% extends "_layout.html" %}
+{% block title %}i2ptunnel migration{% endblock %}
+{% block content %}<h3>I2PTunnel migration:</h3>
 
 <p>After upgrading to the new architecture, you'll have to do a 
 little work to get your old I2PTunnel-driven servers running.  
@@ -39,4 +41,4 @@ existing tunnels and rebuild new ones)</p>
 into the network before you are able to use the /i2ptunnel/ web
 interface.  It will say "Please be patient" if you try to 
 beforehand, which means that it is still trying to build the 
-necessary I2PTunnel sessions it has been configured to create.  </p>
\ No newline at end of file
+necessary I2PTunnel sessions it has been configured to create.  </p>{% endblock %}
\ No newline at end of file
diff --git a/pages/i2ptunnel_services.html b/www.i2p2/pages/i2ptunnel_services.html
similarity index 98%
rename from pages/i2ptunnel_services.html
rename to www.i2p2/pages/i2ptunnel_services.html
index 2a5429fc1..aa61ad8a8 100644
--- a/pages/i2ptunnel_services.html
+++ b/www.i2p2/pages/i2ptunnel_services.html
@@ -1,4 +1,6 @@
-Below is quick copy of aum's eepsite deployment guide.
+{% extends "_layout.html" %}
+{% block title %}i2ptunnel services{% endblock %}
+{% block content %}Below is quick copy of aum's eepsite deployment guide.
 <br />
 
 <br />
@@ -104,3 +106,4 @@ Below is quick copy of aum's eepsite deployment guide.
 <li>Exercise for Windows users - port setupServer.py into a MS-DOS .BAT file.
 <br />
 </ul>
+{% endblock %}
\ No newline at end of file
diff --git a/www.i2p2/pages/impressum.html b/www.i2p2/pages/impressum.html
new file mode 100644
index 000000000..35ab07009
--- /dev/null
+++ b/www.i2p2/pages/impressum.html
@@ -0,0 +1,8 @@
+{% extends "_layout.html" %}
+{% block title %}Impressum{% endblock %}
+{% block content %}
+  <p>[german laws...]</p>
+  <p>Tassilo Schweyer<br />
+    Weitfelderweg 8b<br />
+    89275 Elchingen</p>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/home.html b/www.i2p2/pages/index.html
similarity index 93%
rename from pages/home.html
rename to www.i2p2/pages/index.html
index 0be73e003..bc2215d72 100644
--- a/pages/home.html
+++ b/www.i2p2/pages/index.html
@@ -1,3 +1,6 @@
+{% extends "_layout.html" %}
+{% block title %}Home{% endblock %}
+{% block content %}
 <p><b>Latest version:</b><br />
 2007-10-07 - I2P 0.6.1.30 -
 <a href="http://dev.i2p.net/pipermail/i2p/2007-October/001356.html">Announcement</a>
@@ -24,3 +27,4 @@ and I2PSnark extend it to offer both additional functionality and protection.</p
 <p>I2P is still a work in progress, and should only be used for testing or
 development purposes prior to the 1.0 release.  Further releases beyond that
 will add support for more hostile adversaries.</p>
+{% endblock %}
diff --git a/www.i2p2/pages/installation.html b/www.i2p2/pages/installation.html
new file mode 100644
index 000000000..04d8d9a8c
--- /dev/null
+++ b/www.i2p2/pages/installation.html
@@ -0,0 +1,3 @@
+{% extends "_layout.html" %}
+{% block title %}Installation{% endblock %}
+{% block content %}Please see the <a href="download">download</a> page for installation details.{% endblock %}
\ No newline at end of file
diff --git a/pages/intro.html b/www.i2p2/pages/intro.html
similarity index 98%
rename from pages/intro.html
rename to www.i2p2/pages/intro.html
index 2f963ab01..0e30a44d1 100644
--- a/pages/intro.html
+++ b/www.i2p2/pages/intro.html
@@ -1,3 +1,6 @@
+{% extends "_layout.html" %}
+{% block title %}Intro{% endblock %}
+{% block content %}
 <p>I2P is an anonymous network, exposing a simple layer that applications can 
 use to anonymously and securely send messages to each other.  The network itself is 
 strictly message based (ala 
@@ -77,3 +80,4 @@ other languages (with a C library available, and both Python and Perl in
 development).  The network is actively being developed and has not yet reached 
 the 1.0 release, but the current <a href="roadmap">roadmap</a> describes 
 our schedule.</p>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/jbigi.html b/www.i2p2/pages/jbigi.html
similarity index 93%
rename from pages/jbigi.html
rename to www.i2p2/pages/jbigi.html
index a5e9e028f..096a37df5 100644
--- a/pages/jbigi.html
+++ b/www.i2p2/pages/jbigi.html
@@ -1,4 +1,6 @@
-<p>Using JNI (Java Native Interface), a bit of C code (thanks ugha!), a little
+{% extends "_layout.html" %}
+{% block title %}jbigi{% endblock %}
+{% block content %}<p>Using JNI (Java Native Interface), a bit of C code (thanks ugha!), a little
 manual work and a piece of chewinggum it is possible to make the public key
 cryptography quite a bit faster.</p>
 
@@ -49,3 +51,4 @@ should be a lot faster.</li>
 </ol>
 
 <p>Feedback is appreciated</p>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/licenses.html b/www.i2p2/pages/licenses.html
similarity index 98%
rename from pages/licenses.html
rename to www.i2p2/pages/licenses.html
index fb2915b9b..05cbc37cb 100644
--- a/pages/licenses.html
+++ b/www.i2p2/pages/licenses.html
@@ -1,4 +1,6 @@
-<p>As required by our threat model (among other reasons), the 
+{% extends "_layout.html" %}
+{% block title %}Licenses{% endblock %}
+{% block content %}<p>As required by our threat model (among other reasons), the 
 software developed to support the anonymous communication 
 network we call I2P must be freely available, open source, 
 and user modifiable.  To meet this criteria, we make use of
@@ -252,3 +254,4 @@ access to I2P's CVS repository.  That means that they affirm that:</p>
 <p>If anyone is aware of any instances where the above conditions are not met,
 please contact the component lead and/or the I2P project manager with further
 information.</p>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/links.html b/www.i2p2/pages/links.html
similarity index 86%
rename from pages/links.html
rename to www.i2p2/pages/links.html
index c63e55cf6..9e88fe58a 100644
--- a/pages/links.html
+++ b/www.i2p2/pages/links.html
@@ -1,4 +1,6 @@
-<ul>
+{% extends "_layout.html" %}
+{% block title %}Links{% endblock %}
+{% block content %}<ul>
 <li><a href="http://freehaven.net/anonbib/topic.html">Freehaven's Anonymity Bibliography</a></li>
 <li><a href="http://gnunet.org/links.php3">GNUNet's related projects</a></li>
 <li><a href="http://www.tik.ee.ethz.ch/~morphmix/">Morphmix</a></li>
@@ -10,3 +12,4 @@
 <li><a href="http://freenetproject.org/">Freenet</a></li>
 <li><a href="http://anon.inf.tu-dresden.de/index_en.html">JAP</a></li>
 </ul>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting100.html b/www.i2p2/pages/meeting100.html
similarity index 98%
rename from pages/meeting100.html
rename to www.i2p2/pages/meeting100.html
index 9438d8f57..979352d99 100644
--- a/pages/meeting100.html
+++ b/www.i2p2/pages/meeting100.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, July 27 @ 21:00 GMT</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting100.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, July 27 @ 21:00 GMT</h3>
 <div class="irclog">
 <p>14:02 &lt; jrandom&gt; 0) hi</p>
 <p>14:02 &lt; jrandom&gt; 1) 0.3.3 &amp; current updates</p>
@@ -190,3 +192,4 @@
 <p>14:57  * jrandom *baf*s dm on the head</p>
 <p>14:58 &lt; jrandom&gt; (closing the meeting)</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting101.html b/www.i2p2/pages/meeting101.html
similarity index 99%
rename from pages/meeting101.html
rename to www.i2p2/pages/meeting101.html
index 0932b7c3e..e96a0193c 100644
--- a/pages/meeting101.html
+++ b/www.i2p2/pages/meeting101.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, August 3 @ 21:00 GMT</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting101.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, August 3 @ 21:00 GMT</h3>
 <div class="irclog">
 <p>14:05 &lt;jrandomi2p&gt; 0) hi</p>
 <p>14:05 &lt;jrandomi2p&gt; 1) 0.3.4 status</p>
@@ -216,3 +218,4 @@
 <p>15:15 * jrandomi2p winds up</p>
 <p>15:15 * jrandomi2p *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting102.html b/www.i2p2/pages/meeting102.html
similarity index 98%
rename from pages/meeting102.html
rename to www.i2p2/pages/meeting102.html
index cbe40933c..42b9bf40f 100644
--- a/pages/meeting102.html
+++ b/www.i2p2/pages/meeting102.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, August 10 @ 21:00 GMT</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting102.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, August 10 @ 21:00 GMT</h3>
 <div class="irclog">
 <p>14:04 &lt; jrandom&gt; 0) hi</p>
 <p>14:04 &lt; jrandom&gt; 1) 0.3.4.1 status</p>
@@ -115,3 +117,4 @@
 <p>14:36  * jrandom winds up</p>
 <p>14:36  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting103.html b/www.i2p2/pages/meeting103.html
similarity index 99%
rename from pages/meeting103.html
rename to www.i2p2/pages/meeting103.html
index 75b115ae9..166b8b14e 100644
--- a/pages/meeting103.html
+++ b/www.i2p2/pages/meeting103.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, August 17, 2004</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting103.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, August 17, 2004</h3>
 <div class="irclog">
 <p>14:05 &lt; jrandom&gt; 0) hi</p>
 <p>14:05 &lt; jrandom&gt; 1) Network status and 0.3.4.3</p>
@@ -212,3 +214,4 @@
 <p>14:58  * jrandom winds up</p>
 <p>14:59  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting104.html b/www.i2p2/pages/meeting104.html
similarity index 99%
rename from pages/meeting104.html
rename to www.i2p2/pages/meeting104.html
index 6563da93a..350fe5aa8 100644
--- a/pages/meeting104.html
+++ b/www.i2p2/pages/meeting104.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, August 24, 2004</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting104.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, August 24, 2004</h3>
 <div class="irclog">
 <p>14:01 &lt; jrandom&gt; 0) hi</p>
 <p>14:01 &lt; jrandom&gt; 1) 0.3.4.3 status</p>
@@ -417,3 +419,4 @@
 <p>15:42  * jrandom winds up</p>
 <p>15:42  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting105.html b/www.i2p2/pages/meeting105.html
similarity index 99%
rename from pages/meeting105.html
rename to www.i2p2/pages/meeting105.html
index aa08edc9e..cfde67d8f 100644
--- a/pages/meeting105.html
+++ b/www.i2p2/pages/meeting105.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, August 31, 2004</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting105.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, August 31, 2004</h3>
 <div class="irclog">
 <p>14:04 &lt; jrandom&gt; 0) hi</p>
 <p>14:04 &lt; jrandom&gt; 1) 0.3.4.3</p>
@@ -220,3 +222,4 @@
 <p>14:57  * jrandom stops winding up</p>
 <p>14:57  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting106.html b/www.i2p2/pages/meeting106.html
similarity index 99%
rename from pages/meeting106.html
rename to www.i2p2/pages/meeting106.html
index 666fe3157..54a6a767c 100644
--- a/pages/meeting106.html
+++ b/www.i2p2/pages/meeting106.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, September 7, 2004</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting106.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, September 7, 2004</h3>
 <div class="irclog">
 <p>14:09 &lt; jrandom&gt; 0) hi</p>
 <p>14:09 &lt; jrandom&gt; 1) 0.4</p>
@@ -471,3 +473,4 @@
 <p>15:58  * jrandom winds up</p>
 <p>15:59  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting107.html b/www.i2p2/pages/meeting107.html
similarity index 99%
rename from pages/meeting107.html
rename to www.i2p2/pages/meeting107.html
index 577a346ac..5a3648c45 100644
--- a/pages/meeting107.html
+++ b/www.i2p2/pages/meeting107.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, September 14, 2004</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting107.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, September 14, 2004</h3>
 <div class="irclog">
 <p>14:06 &lt; jrandom&gt; 0) hi</p>
 <p>14:06 &lt; jrandom&gt; 1) 0.4.0.1</p>
@@ -495,3 +497,4 @@
 <p>16:04 &lt; fvw&gt; duck: my emotions? You haven't even begun to see my emotions. Let me get a few drinks though.. *grin*</p>
 <p>16:04  * jrandom *baf*s cervantes on the head, closing the meeting</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting108.html b/www.i2p2/pages/meeting108.html
similarity index 94%
rename from pages/meeting108.html
rename to www.i2p2/pages/meeting108.html
index 36626fc1b..5e034e66c 100644
--- a/pages/meeting108.html
+++ b/www.i2p2/pages/meeting108.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, September 21, 2004</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting108.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, September 21, 2004</h3>
 <div class="irclog">
 <p>14:06 &lt; jrandom&gt; 0) hi</p>
 <p>14:06 &lt; jrandom&gt; 1) Dev status</p>
@@ -35,3 +37,4 @@
 <p>14:19  * jrandom winds up</p>
 <p>14:19  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting109.html b/www.i2p2/pages/meeting109.html
similarity index 98%
rename from pages/meeting109.html
rename to www.i2p2/pages/meeting109.html
index bbab95aa7..364209570 100644
--- a/pages/meeting109.html
+++ b/www.i2p2/pages/meeting109.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, September 28, 2004</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting109.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, September 28, 2004</h3>
 <div class="irclog">
 <p>14:08 &lt; jrandom&gt; 0) hi</p>
 <p>14:08 &lt; jrandom&gt; 1) New transport</p>
@@ -114,3 +116,4 @@
 <p>14:47  * jrandom winds up</p>
 <p>14:47  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting110.html b/www.i2p2/pages/meeting110.html
similarity index 98%
rename from pages/meeting110.html
rename to www.i2p2/pages/meeting110.html
index 2d66729ee..e35982d7a 100644
--- a/pages/meeting110.html
+++ b/www.i2p2/pages/meeting110.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, October 5, 2004</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting110.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, October 5, 2004</h3>
 <div class="irclog">
 <p>14:05 &lt; jrandom&gt; 0) hi</p>
 <p>14:05 &lt; jrandom&gt; 1) 0.4.1.1 status</p>
@@ -181,3 +183,4 @@
 <p>14:51 &lt; deer&gt; * Jake kisses jrandom </p>
 <p>14:51  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting111.html b/www.i2p2/pages/meeting111.html
similarity index 99%
rename from pages/meeting111.html
rename to www.i2p2/pages/meeting111.html
index ecbdd5853..8d739c9f2 100644
--- a/pages/meeting111.html
+++ b/www.i2p2/pages/meeting111.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, October 12, 2004</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting111.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, October 12, 2004</h3>
 <div class="irclog">
 <p>14:04 &lt; jrandom&gt; 0) hi</p>
 <p>14:04 &lt; jrandom&gt; 1) 0.4.1.2</p>
@@ -196,3 +198,4 @@
 <p>15:00  * jrandom winds up</p>
 <p>15:00  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting112.html b/www.i2p2/pages/meeting112.html
similarity index 99%
rename from pages/meeting112.html
rename to www.i2p2/pages/meeting112.html
index e17cb9ea2..2e4f6a561 100644
--- a/pages/meeting112.html
+++ b/www.i2p2/pages/meeting112.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, October 19, 2004</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting112.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, October 19, 2004</h3>
 <div class="irclog">
 <p>14:03 &lt; jrandom&gt; 1) 0.4.1.3</p>
 <p>14:03 &lt; jrandom&gt; 2) Tunnel test time, and send processing time</p>
@@ -267,3 +269,4 @@
 <p>15:02  * jrandom winds up </p>
 <p>15:02  * jrandom *baf*s the meeting closed </p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting113.html b/www.i2p2/pages/meeting113.html
similarity index 98%
rename from pages/meeting113.html
rename to www.i2p2/pages/meeting113.html
index 259e7956e..4d9253e48 100644
--- a/pages/meeting113.html
+++ b/www.i2p2/pages/meeting113.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, October 26, 2004</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting113.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, October 26, 2004</h3>
 <div class="irclog">
 <p>14:04 &lt; jrandom&gt; 0) hi</p>
 <p>14:04 &lt; jrandom&gt; 1) Net status</p>
@@ -33,7 +35,7 @@
 <p>14:14 &lt; jrandom&gt; e.g. short request/response gets the requestee a response in a single round trip</p>
 <p>14:15 &lt; jrandom&gt; i'm working on the profile=bulk right now, going through the sliding windows under lag and failure conditions</p>
 <p>14:15 &lt; jrandom&gt; still some things to clean up, and nothing ready for use, but its progress</p>
-<p>14:16 &lt; deer&gt; &lt;clayboy&gt; so is 0.4.2 with streaming lib én route for october? it seems like an unnecessary rush.</p>
+<p>14:16 &lt; deer&gt; &lt;clayboy&gt; so is 0.4.2 with streaming lib en route for october? it seems like an unnecessary rush.</p>
 <p>14:16 &lt; jrandom&gt; i dont think we'll have the streaming lib ready for final deployment by next week, no</p>
 <p>14:17 &lt; jrandom&gt; so there'll be some schedule slippage, i'm not sure to what extent yet</p>
 <p>14:17 &lt; deer&gt; &lt;duck&gt; any test classes we can run for kicks?</p>
@@ -159,9 +161,9 @@
 <p>14:51 &lt; deer&gt; &lt;gott&gt; that's all I had to say for now.</p>
 <p>14:51 &lt; deer&gt; &lt;gott&gt; oh, another thing</p>
 <p>14:51 &lt; deer&gt; &lt;gott&gt; snipsnap works well under i2p</p>
-<p>14:52 &lt; deer&gt; &lt;gott&gt; so we might see kuro5hin-style eepsites being brought up sometime à la SCUM</p>
+<p>14:52 &lt; deer&gt; &lt;gott&gt; so we might see kuro5hin-style eepsites being brought up sometime a la SCUM</p>
 <p>14:52 &lt; jrandom&gt; kickass</p>
-<p>14:52 &lt; deer&gt; &lt;gott&gt; *except more devious à la SCUM</p>
+<p>14:52 &lt; deer&gt; &lt;gott&gt; *except more devious a la SCUM</p>
 <p>14:52 &lt; jrandom&gt; a howto for setting that up would be great</p>
 <p>14:52 &lt; deer&gt; &lt;gott&gt; you put the .war in webapps</p>
 <p>14:52 &lt; deer&gt; &lt;gott&gt; it's pretty straightforward ;-)</p>
@@ -207,7 +209,7 @@
 <p>15:07 &lt; jrandom&gt; i've got my own views, but thats where one of i2p's strong points comes out - my own views are irrelevent :)  any sort ofnaming srevice can be used by client apps, as all of that functionality is outside of the core scope</p>
 <p>15:08 &lt; jrandom&gt; i know nano is working on something too - there's some entries @ nano.i2p, though i dont know how thats progressing</p>
 <p>15:08 &lt; deer&gt; &lt;polecat&gt; Agreed; you could write clients to use a ddns server as much as you could write them to parse the local hosts.txt</p>
-<p>15:08 &lt; deer&gt; &lt;gott&gt; jrandom: I dread the day when hosts.txt or equivalent naming system begins to show « enlarge.your.penis.i2p »</p>
+<p>15:08 &lt; deer&gt; &lt;gott&gt; jrandom: I dread the day when hosts.txt or equivalent naming system begins to show << enlarge.your.penis.i2p >></p>
 <p>15:09 &lt; deer&gt; &lt;polecat&gt; Just might be easier; at the current standing only I2PTunnel has the ability to understand hosts.txt.  Plus if we're going to compete with ipv4 and ipv6 we can't compromise limited functionality when they don't.</p>
 <p>15:10 &lt; jrandom&gt; a while back mihi factored out the naming hooks in i2ptunnel - anything that implements http://dev.i2p.net/javadoc/net/i2p/client/naming/NamingService.html can be used transparently</p>
 <p>15:10 &lt; jrandom&gt; (and that includes I2PTunnel and SAM)</p>
@@ -268,3 +270,4 @@
 <p>15:33  * jrandom winds up</p>
 <p>15:34  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting114.html b/www.i2p2/pages/meeting114.html
similarity index 99%
rename from pages/meeting114.html
rename to www.i2p2/pages/meeting114.html
index 971a83d65..1c84bcdc9 100644
--- a/pages/meeting114.html
+++ b/www.i2p2/pages/meeting114.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, November 2, 2004</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting114.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, November 2, 2004</h3>
 <div class="irclog">
 <p>13:37 &lt; jrandom&gt; 0) hi</p>
 <p>13:37 &lt; jrandom&gt; 1) Net status</p>
@@ -399,3 +401,4 @@
 <p>15:11  * jrandom winds up</p>
 <p>15:11  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting115.html b/www.i2p2/pages/meeting115.html
similarity index 99%
rename from pages/meeting115.html
rename to www.i2p2/pages/meeting115.html
index 7993a0045..fb82c9355 100644
--- a/pages/meeting115.html
+++ b/www.i2p2/pages/meeting115.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, November 9, 2004</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting115.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, November 9, 2004</h3>
 <div class="irclog">
 <p>13:26 &lt; jrandom&gt; 0) hi</p>
 <p>13:26 &lt; cervantes&gt; lets see the menu before we order :P</p>
@@ -518,3 +520,4 @@
 <p>15:04 &lt; jrandom&gt; ...</p>
 <p>15:04  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting116.html b/www.i2p2/pages/meeting116.html
similarity index 98%
rename from pages/meeting116.html
rename to www.i2p2/pages/meeting116.html
index 85509326d..76266f761 100644
--- a/pages/meeting116.html
+++ b/www.i2p2/pages/meeting116.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, November 16, 2004</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting116.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, November 16, 2004</h3>
 <div class="irclog">
 <p>13:05 &lt; jrandom&gt; 0) hi</p>
 <p>13:05 &lt; jrandom&gt; 1) Congestion</p>
@@ -178,3 +180,4 @@
 <p>14:07  * jrandom winds up</p>
 <p>14:07  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting117.html b/www.i2p2/pages/meeting117.html
similarity index 97%
rename from pages/meeting117.html
rename to www.i2p2/pages/meeting117.html
index 141e7062a..5aa5d9a26 100644
--- a/pages/meeting117.html
+++ b/www.i2p2/pages/meeting117.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, November 23, 2004</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting117.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, November 23, 2004</h3>
 <div class="irclog">
 <p>13:03 &lt; jrandom&gt; 0) hi</p>
 <p>13:03 &lt; jrandom&gt; 1) Net status</p>
@@ -65,3 +67,4 @@
 <p>13:25  * jrandom winds up</p>
 <p>13:25  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting118.html b/www.i2p2/pages/meeting118.html
similarity index 99%
rename from pages/meeting118.html
rename to www.i2p2/pages/meeting118.html
index 92ac780ae..3bcfc56c8 100644
--- a/pages/meeting118.html
+++ b/www.i2p2/pages/meeting118.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, November 30, 2004</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting118.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, November 30, 2004</h3>
 <div class="irclog">
 <p>13:08 &lt; jrandom&gt; 0) hi</p>
 <p>13:08 &lt; jrandom&gt; 1) 0.4.2 and 0.4.2.1</p>
@@ -319,3 +321,4 @@
 <p>14:34  * jrandom winds up</p>
 <p>14:35  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting119.html b/www.i2p2/pages/meeting119.html
similarity index 98%
rename from pages/meeting119.html
rename to www.i2p2/pages/meeting119.html
index f1e769009..3af91d889 100644
--- a/pages/meeting119.html
+++ b/www.i2p2/pages/meeting119.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, December 7, 2004</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting119.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, December 7, 2004</h3>
 <div class="irclog">
 <p>22:00:00 &lt;@duck&gt; Tue Dec  7 21:00:00 UTC 2004</p>
 <p>22:00:04 &lt;@duck&gt; I2P meeting time</p>
@@ -169,3 +171,4 @@
 <p>22:43:38  * duck winds up</p>
 <p>22:43:45  * duck *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting120.html b/www.i2p2/pages/meeting120.html
similarity index 99%
rename from pages/meeting120.html
rename to www.i2p2/pages/meeting120.html
index 6e295e856..7d89afef1 100644
--- a/pages/meeting120.html
+++ b/www.i2p2/pages/meeting120.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, December 14, 2004</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting120.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, December 14, 2004</h3>
 <div class="irclog">
 <p>13:08 &lt; jrandom&gt; 0) hi</p>
 <p>13:08 &lt; jrandom&gt; 1) Net status</p>
@@ -485,3 +487,4 @@
 <p>14:49  * jrandom winds up</p>
 <p>14:50  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting121.html b/www.i2p2/pages/meeting121.html
similarity index 99%
rename from pages/meeting121.html
rename to www.i2p2/pages/meeting121.html
index af64ee2cf..5c7a158ab 100644
--- a/pages/meeting121.html
+++ b/www.i2p2/pages/meeting121.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, December 21, 2004</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting121.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, December 21, 2004</h3>
 <div class="irclog">
 <p>13:05 &lt;@jrandom&gt; 0) hi</p>
 <p>13:05 &lt;@jrandom&gt; 1) 0.4.2.4 & 0.4.2.5</p>
@@ -324,3 +326,4 @@
 <p>14:34  * jrandom winds up</p>
 <p>14:34  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting122.html b/www.i2p2/pages/meeting122.html
similarity index 99%
rename from pages/meeting122.html
rename to www.i2p2/pages/meeting122.html
index bb6e24099..884824882 100644
--- a/pages/meeting122.html
+++ b/www.i2p2/pages/meeting122.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, December 28, 2004</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting122.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, December 28, 2004</h3>
 <div class="irclog">
 <p>13:06 &lt;@jrandom&gt; 0) hi</p>
 <p>13:06 &lt;@jrandom&gt; 1) 0.4.2.5</p>
@@ -196,3 +198,4 @@
 <p>13:57  * jrandom winds up</p>
 <p>13:57  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting123.html b/www.i2p2/pages/meeting123.html
similarity index 98%
rename from pages/meeting123.html
rename to www.i2p2/pages/meeting123.html
index 3731e14c6..d9bbfb1ad 100644
--- a/pages/meeting123.html
+++ b/www.i2p2/pages/meeting123.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, January 4, 2005</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting123.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, January 4, 2005</h3>
 <div class="irclog">
 <p>13:09 &lt;@jrandom&gt; 0) hi</p>
 <p>13:09 &lt;@jrandom&gt; 1) Net status</p>
@@ -155,3 +157,4 @@
 <p>13:51  * jrandom winds up</p>
 <p>13:51  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting124.html b/www.i2p2/pages/meeting124.html
similarity index 99%
rename from pages/meeting124.html
rename to www.i2p2/pages/meeting124.html
index 577a852c3..788ecff31 100644
--- a/pages/meeting124.html
+++ b/www.i2p2/pages/meeting124.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, January 11, 2005</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting124.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, January 11, 2005</h3>
 <div class="irclog">
 <p>13:10 &lt; jrandom&gt; 0) hi</p>
 <p>13:10 &lt; deer&gt; &lt;Ragnarok&gt; you're fired</p>
@@ -379,3 +381,4 @@
 <p>14:45  * jrandom winds up</p>
 <p>14:45  * jrandom *baf*s the meeting closed^2</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting125.html b/www.i2p2/pages/meeting125.html
similarity index 99%
rename from pages/meeting125.html
rename to www.i2p2/pages/meeting125.html
index f83f861b9..5877900c6 100644
--- a/pages/meeting125.html
+++ b/www.i2p2/pages/meeting125.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, January 18, 2005</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting125.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, January 18, 2005</h3>
 <div class="irclog">
 <p>13:04 &lt; jrandom&gt; 0) hi</p>
 <p>13:04 &lt; jrandom&gt; 1) Net status</p>
@@ -279,3 +281,4 @@
 <p>14:30  * jrandom winds up</p>
 <p>14:31  * jrandom *baf*s the cowbell, closing the meeting</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting126.html b/www.i2p2/pages/meeting126.html
similarity index 98%
rename from pages/meeting126.html
rename to www.i2p2/pages/meeting126.html
index 4eaece339..8c7a8bcf9 100644
--- a/pages/meeting126.html
+++ b/www.i2p2/pages/meeting126.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, January 25, 2005</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting126.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, January 25, 2005</h3>
 <div class="irclog">
 <p>13:50 &lt; jrandom&gt; 0) hi</p>
 <p>13:50 &lt; jrandom&gt; 1) 0.5 status</p>
@@ -173,3 +175,4 @@
 <p>14:46  * jrandom winds up</p>
 <p>14:46  * jrandom *baf*s the gong, closing the meeting</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting127.html b/www.i2p2/pages/meeting127.html
similarity index 98%
rename from pages/meeting127.html
rename to www.i2p2/pages/meeting127.html
index b60087153..30ed9d7c8 100644
--- a/pages/meeting127.html
+++ b/www.i2p2/pages/meeting127.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, February 1, 2005</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting127.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, February 1, 2005</h3>
 <div class="irclog">
 <p>13:06 &lt; jrandom&gt; 0) hi</p>
 <p>13:06 &lt; jrandom&gt; 1) 0.5 status</p>
@@ -154,3 +156,4 @@
 <p>14:06  * jrandom winds up</p>
 <p>14:06  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting128.html b/www.i2p2/pages/meeting128.html
similarity index 99%
rename from pages/meeting128.html
rename to www.i2p2/pages/meeting128.html
index 3dd2beaca..a364b16f3 100644
--- a/pages/meeting128.html
+++ b/www.i2p2/pages/meeting128.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, February 8, 2005</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting128.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, February 8, 2005</h3>
 <div class="irclog">
 <p>13:05 &lt; jrandom&gt; 0) hi</p>
 <p>13:05 &lt; jrandom&gt; 1) 0.4.2.6-*</p>
@@ -286,3 +288,4 @@
 <p>14:34 &lt; ant&gt; * jnymo pitches the meeting ball</p>
 <p>14:34  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting129.html b/www.i2p2/pages/meeting129.html
similarity index 99%
rename from pages/meeting129.html
rename to www.i2p2/pages/meeting129.html
index d0a46f019..63f0afb05 100644
--- a/pages/meeting129.html
+++ b/www.i2p2/pages/meeting129.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, February 15, 2005</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting129.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, February 15, 2005</h3>
 <div class="irclog">
 <p>13:07 &lt; jrandom&gt; 0) hi</p>
 <p>13:07 &lt; jrandom&gt; 1) Net status</p>
@@ -248,3 +250,4 @@
 <p>14:30 &lt;+postman&gt; ooops</p>
 <p>14:30  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting130.html b/www.i2p2/pages/meeting130.html
similarity index 99%
rename from pages/meeting130.html
rename to www.i2p2/pages/meeting130.html
index 5920b9c38..7b2c04fbd 100644
--- a/pages/meeting130.html
+++ b/www.i2p2/pages/meeting130.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, February 22, 2005</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting130.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, February 22, 2005</h3>
 <div class="irclog">
 <p>13:04 &lt; jrandom&gt; 0) hi</p>
 <p>13:04 &lt; jrandom&gt; 1) 0.5</p>
@@ -283,3 +285,4 @@
 <p>14:24  * jrandom downloads a gavel</p>
 <p>14:24  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting131.html b/www.i2p2/pages/meeting131.html
similarity index 99%
rename from pages/meeting131.html
rename to www.i2p2/pages/meeting131.html
index c89dfed7c..68a14e1db 100644
--- a/pages/meeting131.html
+++ b/www.i2p2/pages/meeting131.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, March 1, 2005</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting131.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, March 1, 2005</h3>
 <div class="irclog">
 <p>13:05 &lt;@jrandom&gt; 0) hi</p>
 <p>13:05 &lt;@jrandom&gt; 1) 0.5.0.1</p>
@@ -304,7 +306,7 @@
 <p>14:25 &lt; MichElle&gt; anyway</p>
 <p>14:25 &lt; MichElle&gt; that's all I wanted to say</p>
 <p>14:25 &lt; MichElle&gt; keep your eyes on jrandom</p>
-<p>14:26 &lt; MichElle&gt; his gentle and warm façade may be just that.</p>
+<p>14:26 &lt; MichElle&gt; his gentle and warm facade may be just that.</p>
 <p>14:26 &lt;+ugha2p&gt; detonate: There are no theoretical thread limits, it will just consume all available resources until it crashes. :)</p>
 <p>14:26 &lt; jnymo&gt; facade</p>
 <p>14:26 &lt;@jrandom&gt; detonate: some OSes/ulimits may throttle @ 256, but win98 is already past the 100 TCP connections limit anyway</p>
@@ -367,3 +369,4 @@
 <p>14:35  * jrandom winds up</p>
 <p>14:35  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting132.html b/www.i2p2/pages/meeting132.html
similarity index 99%
rename from pages/meeting132.html
rename to www.i2p2/pages/meeting132.html
index ff7a8aeb5..8ad0e9c11 100644
--- a/pages/meeting132.html
+++ b/www.i2p2/pages/meeting132.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, March 8, 2005</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting132.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, March 8, 2005</h3>
 <div class="irclog">
 <p>13:06 &lt;@jrandom&gt; 0) hi</p>
 <p>13:06 &lt;@jrandom&gt; 1) 0.5.0.2</p>
@@ -360,3 +362,4 @@
 <p>14:36  * jrandom winds up</p>
 <p>14:36  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting133.html b/www.i2p2/pages/meeting133.html
similarity index 99%
rename from pages/meeting133.html
rename to www.i2p2/pages/meeting133.html
index e4a30bfe2..3206b0935 100644
--- a/pages/meeting133.html
+++ b/www.i2p2/pages/meeting133.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, March 15, 2005</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting133.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, March 15, 2005</h3>
 <div class="irclog">
 <p>13:07 &lt; jrandom&gt; 0) hi</p>
 <p>13:07 &lt; jrandom&gt; 1) Net status</p>
@@ -318,3 +320,4 @@
 <p>14:34  * jrandom winds up</p>
 <p>14:34  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting134.html b/www.i2p2/pages/meeting134.html
similarity index 99%
rename from pages/meeting134.html
rename to www.i2p2/pages/meeting134.html
index d0ca53d13..23eae7f73 100644
--- a/pages/meeting134.html
+++ b/www.i2p2/pages/meeting134.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, March 22, 2005</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting134.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, March 22, 2005</h3>
 <div class="irclog">
 <p>13:01 &lt;@jrandom&gt; 0) hi</p>
 <p>13:01 &lt;@jrandom&gt; 1) 0.5.0.3</p>
@@ -172,3 +174,4 @@
 <p>14:21  * jrandom winds up</p>
 <p>14:21  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting135.html b/www.i2p2/pages/meeting135.html
similarity index 98%
rename from pages/meeting135.html
rename to www.i2p2/pages/meeting135.html
index 714117c53..d82a11867 100644
--- a/pages/meeting135.html
+++ b/www.i2p2/pages/meeting135.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, March 29, 2005</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting135.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, March 29, 2005</h3>
 <div class="irclog">
 <p>13:13 &lt; jrandom&gt; 0) hi</p>
 <p>13:13 &lt; jrandom&gt; 1) 0.5.0.5</p>
@@ -120,3 +122,4 @@
 <p>13:54  * jrandom winds up</p>
 <p>13:54  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting136.html b/www.i2p2/pages/meeting136.html
similarity index 97%
rename from pages/meeting136.html
rename to www.i2p2/pages/meeting136.html
index 0176e2f78..e7dd11f59 100644
--- a/pages/meeting136.html
+++ b/www.i2p2/pages/meeting136.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, April 5, 2005</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting136.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, April 5, 2005</h3>
 <div class="irclog">
 <p>14:34 &lt;@jrandom&gt; 0) hi</p>
 <p>14:34 &lt;@jrandom&gt; 1) 0.5.0.5</p>
@@ -98,3 +100,4 @@
 <p>15:07  * jrandom winds up</p>
 <p>15:07  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting137.html b/www.i2p2/pages/meeting137.html
similarity index 99%
rename from pages/meeting137.html
rename to www.i2p2/pages/meeting137.html
index 420a2520a..19e171a0a 100644
--- a/pages/meeting137.html
+++ b/www.i2p2/pages/meeting137.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, April 12, 2005</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting137.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, April 12, 2005</h3>
 <div class="irclog">
 <p>14:05 &lt; jrandom&gt; 0) hi</p>
 <p>14:05 &lt; jrandom&gt; 1) Net status</p>
@@ -281,3 +283,4 @@
 <p>15:20  * jrandom winds up</p>
 <p>15:20  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting138.html b/www.i2p2/pages/meeting138.html
similarity index 98%
rename from pages/meeting138.html
rename to www.i2p2/pages/meeting138.html
index f26f86578..607802865 100644
--- a/pages/meeting138.html
+++ b/www.i2p2/pages/meeting138.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, April 19, 2005</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting138.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, April 19, 2005</h3>
 <div class="irclog">
 <p>14:05 &lt;@jrandom&gt; 0) hi</p>
 <p>14:05 &lt;@jrandom&gt; 1) Net status</p>
@@ -101,3 +103,4 @@
 <p>14:45  * jrandom winds up</p>
 <p>14:45  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting139.html b/www.i2p2/pages/meeting139.html
similarity index 97%
rename from pages/meeting139.html
rename to www.i2p2/pages/meeting139.html
index c0f0b3891..4e713c535 100644
--- a/pages/meeting139.html
+++ b/www.i2p2/pages/meeting139.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, April 26, 2005</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting139.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, April 26, 2005</h3>
 <div class="irclog">
 <p>14:10 &lt;@jrandom&gt; 0) hi</p>
 <p>14:10 &lt;@jrandom&gt; 1) Net status</p>
@@ -59,3 +61,4 @@
 <p>14:38  * jrandom2p winds up</p>
 <p>14:38  * jrandom2p *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting140.html b/www.i2p2/pages/meeting140.html
similarity index 99%
rename from pages/meeting140.html
rename to www.i2p2/pages/meeting140.html
index 4267ba123..503bb774e 100644
--- a/pages/meeting140.html
+++ b/www.i2p2/pages/meeting140.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, May 3, 2005</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting140.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, May 3, 2005</h3>
 <div class="irclog">
 <p>14:08 &lt; jrandom&gt; 0) hi</p>
 <p>14:08 &lt; jrandom&gt; 1) Net status</p>
@@ -194,3 +196,4 @@
 <p>15:15  * jrandom winds up</p>
 <p>15:15  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting141.html b/www.i2p2/pages/meeting141.html
similarity index 96%
rename from pages/meeting141.html
rename to www.i2p2/pages/meeting141.html
index 29c151ac8..71f099222 100644
--- a/pages/meeting141.html
+++ b/www.i2p2/pages/meeting141.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, August 2, 2005</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting141.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, August 2, 2005</h3>
 <div class="irclog">
 <p>13:53 &lt; jrandom2p&gt; ok, as i'm here, is there anyone interested in having a brief meeting wrt the notes (or something else)?</p>
 <p>13:54 &lt; jrandom2p&gt; anything in the notes people are concerned with, thoughts not related to 'em that people want to bring up, or other issues relevent and timely?</p>
@@ -44,7 +46,7 @@
 <p>14:08 &lt;@cervantes&gt; or he's been bum-raped by the riaa</p>
 <p>14:08 &lt; jrandom2p&gt; ah yeah, its up there (it was just cached on squid.i2p)</p>
 <p>14:08 &lt;@smeghead&gt; riaaped?</p>
-<p>14:09 &lt; jrandom2p&gt; ($Id: meeting141.html,v 1.1 2005/08/03 15:12:13 jrandom Exp $)</p>
+<p>14:09 &lt; jrandom2p&gt; ($Id: meeting141.html,v 1.2 2005-08-04 16:21:39 duck Exp $)</p>
 <p>14:09 &lt; jrandom2p&gt; *cough*</p>
 <p>14:09 &lt;+bar&gt; there are some things that need to be added to bugzilla, like i2p 0.6 and java 1.5</p>
 <p>14:09 &lt;@smeghead&gt; ok</p>
@@ -84,7 +86,7 @@
 <p>14:15 &lt;@cervantes&gt; mihi: 0.6 has RandomPort (tm) functionality</p>
 <p>14:15 &lt; jrandom2p&gt; heh</p>
 <p>14:16 &lt;@cervantes&gt; :)</p>
-<p>14:16 &lt;+ant&gt; * mihi 'd like FixedPort™ functionality :)</p>
+<p>14:16 &lt;+ant&gt; * mihi 'd like FixedPorto functionality :)</p>
 <p>14:16 &lt;+ant&gt; <mihi> and disconnected...</p>
 <p>14:16 &lt;@cervantes&gt; then you'd need  0.6-1 FixedPort Pro</p>
 <p>14:16 &lt; jrandom2p&gt; heh</p>
@@ -130,3 +132,4 @@
 <p>14:27  * jrandom2p winds up</p>
 <p>14:27  * jrandom2p *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting142.html b/www.i2p2/pages/meeting142.html
similarity index 97%
rename from pages/meeting142.html
rename to www.i2p2/pages/meeting142.html
index e0c052ef6..e6ef5a794 100644
--- a/pages/meeting142.html
+++ b/www.i2p2/pages/meeting142.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, August 9, 2005</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting142.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, August 9, 2005</h3>
 <div class="irclog">
 <p>13:11 &lt; jrandom2p&gt; 0) hi</p>
 <p>13:11 &lt; jrandom2p&gt; 1) 0.6.0.2</p>
@@ -89,3 +91,4 @@
 <p>13:51  * jrandom winds up </p>
 <p>13:51  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting143.html b/www.i2p2/pages/meeting143.html
similarity index 95%
rename from pages/meeting143.html
rename to www.i2p2/pages/meeting143.html
index ef278faca..7a635ece9 100644
--- a/pages/meeting143.html
+++ b/www.i2p2/pages/meeting143.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, August 16, 2005</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting143.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, August 16, 2005</h3>
 <div class="irclog">
 <p>13:09 &lt;@jrandom&gt; 0) hi</p>
 <p>13:09 &lt;@jrandom&gt; 1) PeerTest status</p>
@@ -51,3 +53,4 @@
 <p>13:32  * jrandom winds up</p>
 <p>13:32  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting144.html b/www.i2p2/pages/meeting144.html
similarity index 98%
rename from pages/meeting144.html
rename to www.i2p2/pages/meeting144.html
index 006b5bc16..9fb6b7364 100644
--- a/pages/meeting144.html
+++ b/www.i2p2/pages/meeting144.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, August 23, 2005</h2>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting144.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, August 23, 2005</h2>
 <div class="irclog">
 <p>12:01 &lt; jrandom&gt; 0) hi</p>
 <p>12:01 &lt; jrandom&gt; 1) 0.6.0.3 status</p>
@@ -144,3 +146,4 @@
 <p>12:51  * jrandom winds up</p>
 <p>12:52  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting145.html b/www.i2p2/pages/meeting145.html
similarity index 98%
rename from pages/meeting145.html
rename to www.i2p2/pages/meeting145.html
index ed5c23ab9..f74d9e1e3 100644
--- a/pages/meeting145.html
+++ b/www.i2p2/pages/meeting145.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, August 30, 2005</h2>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting145.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, August 30, 2005</h2>
 <div class="irclog">
 <p>13:03 &lt;+bla&gt; Is there a meeting today?</p>
 <p>13:04 &lt; jrandom&gt; 0) hi</p>
@@ -129,3 +131,4 @@
 <p>14:09  * jrandom winds up</p>
 <p>14:10  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting146.html b/www.i2p2/pages/meeting146.html
similarity index 98%
rename from pages/meeting146.html
rename to www.i2p2/pages/meeting146.html
index 7233ca4a5..a2fc0a732 100644
--- a/pages/meeting146.html
+++ b/www.i2p2/pages/meeting146.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, September 06, 2005</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting146.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, September 06, 2005</h3>
 <div class="irclog">
 <p>13:04 &lt; jrandom&gt; 0) hi</p>
 <p>13:04 &lt; jrandom&gt; 1) Net status</p>
@@ -65,7 +67,7 @@
 <p>13:23 &lt;+Ragnarok&gt; maybe a small description on what you think the common use case for syndie is might be nice.  I'm still a little unsure as to what it is, aside from a blog CMS</p>
 <p>13:23 &lt; jrandom&gt; cool adamta - be sure to work with the latest codebase, as I went through and css'ed everything last night</p>
 <p>13:24 &lt; jrandom&gt; (at a rought level, that is)</p>
-<p>13:24 &lt;+fox&gt; &lt;adamta&gt; jrandom: Oops… I'd been working on an earlier version.</p>
+<p>13:24 &lt;+fox&gt; &lt;adamta&gt; jrandom: Oops... I'd been working on an earlier version.</p>
 <p>13:24 &lt;+fox&gt; &lt;adamta&gt; I'll `cvs update` and see what's changed, then.</p>
 <p>13:24  * Ragnarok , asking for user docs.  Oh the hypocrisy</p>
 <p>13:24 &lt; jrandom&gt; good call Ragnarok.  the use case is essentially '$myI2P.getUseCases()'</p>
@@ -213,3 +215,4 @@
 <p>14:09  * jrandom winds up</p>
 <p>14:09  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting147.html b/www.i2p2/pages/meeting147.html
similarity index 95%
rename from pages/meeting147.html
rename to www.i2p2/pages/meeting147.html
index a0ad29965..061be2081 100644
--- a/pages/meeting147.html
+++ b/www.i2p2/pages/meeting147.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, September 13, 2005</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting147.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, September 13, 2005</h3>
 <div class="irclog">
 <p>13:01 &lt; jrandom&gt; 0) hi</p>
 <p>13:01 &lt; jrandom&gt; 1) Net status</p>
@@ -42,3 +44,4 @@
 <p>13:17  * jrandom winds up</p>
 <p>13:17  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting148.html b/www.i2p2/pages/meeting148.html
similarity index 97%
rename from pages/meeting148.html
rename to www.i2p2/pages/meeting148.html
index 47a70d0ba..7c029f562 100644
--- a/pages/meeting148.html
+++ b/www.i2p2/pages/meeting148.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, September 20 @ 20:00 GMT</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting148.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, September 20 @ 20:00 GMT</h3>
 <div class="irclog">
 <p>16:18 &lt; jrandom&gt; 0) hi</p>
 <p>16:18 &lt; jrandom&gt; 1) 0.6.0.6</p>
@@ -98,3 +100,4 @@
 <p>16:46  * jrandom winds up</p>
 <p>16:46  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting149.html b/www.i2p2/pages/meeting149.html
similarity index 99%
rename from pages/meeting149.html
rename to www.i2p2/pages/meeting149.html
index f91718dc0..92a91ec43 100644
--- a/pages/meeting149.html
+++ b/www.i2p2/pages/meeting149.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, September 27, 2005</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting149.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, September 27, 2005</h3>
 <div class="irclog">
 <p>16:14 &lt; jrandom&gt; 0) hi</p>
 <p>16:14 &lt; jrandom&gt; 1) Net status</p>
@@ -253,3 +255,4 @@
 <p>17:25  * jrandom winds up</p>
 <p>17:25  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting150.html b/www.i2p2/pages/meeting150.html
similarity index 98%
rename from pages/meeting150.html
rename to www.i2p2/pages/meeting150.html
index 590810319..576e63259 100644
--- a/pages/meeting150.html
+++ b/www.i2p2/pages/meeting150.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, October 4, 2005</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting150.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, October 4, 2005</h3>
 <div class="irclog">
 <p>16:16 &lt; jrandom&gt; 0) hi</p>
 <p>16:16 &lt; jrandom&gt; 1) 0.6.1.1</p>
@@ -143,3 +145,4 @@
 <p>17:03  * jrandom winds up </p>
 <p>17:03  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting151.html b/www.i2p2/pages/meeting151.html
similarity index 99%
rename from pages/meeting151.html
rename to www.i2p2/pages/meeting151.html
index 68d8450e2..d60bab825 100644
--- a/pages/meeting151.html
+++ b/www.i2p2/pages/meeting151.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, October 11, 2005</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting151.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, October 11, 2005</h3>
 <div class="irclog">
 <p>16:29 &lt; jrandom&gt; 0) hi</p>
 <p>16:29 &lt; jrandom&gt; 1) 0.6.1.2</p>
@@ -235,3 +237,4 @@
 <p>17:43  * jrandom winds up</p>
 <p>17:43  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting152.html b/www.i2p2/pages/meeting152.html
similarity index 99%
rename from pages/meeting152.html
rename to www.i2p2/pages/meeting152.html
index 62bd854cd..748c1b996 100644
--- a/pages/meeting152.html
+++ b/www.i2p2/pages/meeting152.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, October 18, 2005</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting152.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, October 18, 2005</h3>
 <div class="irclog">
 <p>16:10 &lt; jrandom&gt; 0) hi</p>
 <p>16:10 &lt; jrandom&gt; 1) 0.6.1.3</p>
@@ -271,3 +273,4 @@
 <p>17:41  * jrandom winds up</p>
 <p>17:41  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting153.html b/www.i2p2/pages/meeting153.html
similarity index 99%
rename from pages/meeting153.html
rename to www.i2p2/pages/meeting153.html
index eac498b19..d5848455b 100644
--- a/pages/meeting153.html
+++ b/www.i2p2/pages/meeting153.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, October 25, 2005</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting153.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, October 25, 2005</h3>
 <div class="irclog">
 <p>16:24 &lt; jrandom&gt; 0) hi</p>
 <p>16:24 &lt; jrandom&gt; 1) Net status</p>
@@ -441,3 +443,4 @@
 <p>18:09  * jrandom winds up</p>
 <p>18:09  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting154.html b/www.i2p2/pages/meeting154.html
similarity index 98%
rename from pages/meeting154.html
rename to www.i2p2/pages/meeting154.html
index 14eee7ed5..cff9fddec 100644
--- a/pages/meeting154.html
+++ b/www.i2p2/pages/meeting154.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, November 1, 2005</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting154.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, November 1, 2005</h3>
 <div class="irclog">
 <p>15:04 &lt; jrandom&gt; 0) hi</p>
 <p>15:04 &lt; jrandom&gt; 1) 0.6.1.4 and net status</p>
@@ -177,3 +179,4 @@
 <p>16:07  * jrandom winds up</p>
 <p>16:08  * jrandom *bafs* the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting155.html b/www.i2p2/pages/meeting155.html
similarity index 97%
rename from pages/meeting155.html
rename to www.i2p2/pages/meeting155.html
index 4e5e1f868..ffc42bb2c 100644
--- a/pages/meeting155.html
+++ b/www.i2p2/pages/meeting155.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, November 8, 2005</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting155.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, November 8, 2005</h3>
 <div class="irclog">
 <p>15:21 &lt; jrandom&gt; 0) hi</p>
 <p>15:21 &lt; jrandom&gt; 1) Net status / short term roadmap</p>
@@ -61,3 +63,4 @@
 <p>15:54  * jrandom windos up</p>
 <p>15:54  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting156.html b/www.i2p2/pages/meeting156.html
similarity index 99%
rename from pages/meeting156.html
rename to www.i2p2/pages/meeting156.html
index a00b8bc99..aea8d11b6 100644
--- a/pages/meeting156.html
+++ b/www.i2p2/pages/meeting156.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, November 15, 2005</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting156.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, November 15, 2005</h3>
 <div class="irclog">
 <p>15:15 &lt; jrandom&gt; 0) hi</p>
 <p>15:15 &lt; jrandom&gt; 1) Net status / 0.6.1.5</p>
@@ -346,3 +348,4 @@
 <p>16:44  * jrandom winds up</p>
 <p>16:44  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting157.html b/www.i2p2/pages/meeting157.html
similarity index 98%
rename from pages/meeting157.html
rename to www.i2p2/pages/meeting157.html
index 5dc79a9bd..6659b6279 100644
--- a/pages/meeting157.html
+++ b/www.i2p2/pages/meeting157.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, November 22, 2005</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting157.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, November 22, 2005</h3>
 <div class="irclog">
 <p>16:18 &lt; jrandom&gt; 0) hi</p>
 <p>16:18 &lt; jrandom&gt; 1) Net status</p>
@@ -139,3 +141,4 @@
 <p>17:20  * jrandom winds up</p>
 <p>17:20  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting158.html b/www.i2p2/pages/meeting158.html
similarity index 99%
rename from pages/meeting158.html
rename to www.i2p2/pages/meeting158.html
index f140fd31e..80ada8f34 100644
--- a/pages/meeting158.html
+++ b/www.i2p2/pages/meeting158.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, November 29, 2005</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting158.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, November 29, 2005</h3>
 <div class="irclog">
 <p>15:25 &lt; jrandom&gt; 0) hi</p>
 <p>15:25 &lt; jrandom&gt; 1) Net status and 0.6.1.6</p>
@@ -223,3 +225,4 @@
 <p>16:37  * jrandom winds up</p>
 <p>16:37  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting159.html b/www.i2p2/pages/meeting159.html
similarity index 99%
rename from pages/meeting159.html
rename to www.i2p2/pages/meeting159.html
index 5e57796d1..7a70b99eb 100644
--- a/pages/meeting159.html
+++ b/www.i2p2/pages/meeting159.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, December 6, 2005</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting159.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, December 6, 2005</h3>
 <div class="irclog">
 <p>15:26 &lt; jrandom&gt; 0) hi</p>
 <p>15:26 &lt; jrandom&gt; 1) 0.6.1.7 and net status</p>
@@ -261,3 +263,4 @@
 <p>17:04  * jrandom winds up</p>
 <p>17:04  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting160.html b/www.i2p2/pages/meeting160.html
similarity index 95%
rename from pages/meeting160.html
rename to www.i2p2/pages/meeting160.html
index 3c5dd196c..34dff5f43 100644
--- a/pages/meeting160.html
+++ b/www.i2p2/pages/meeting160.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, December 13, 2005</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting160.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, December 13, 2005</h3>
 <div class="irclog">
 <p>15:15 &lt; jrandom&gt; 0) hi</p>
 <p>15:15 &lt; jrandom&gt; 1) Net status and load testing</p>
@@ -50,3 +52,4 @@
 <p>15:35  * jrandom winds up</p>
 <p>15:35  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting161.html b/www.i2p2/pages/meeting161.html
similarity index 98%
rename from pages/meeting161.html
rename to www.i2p2/pages/meeting161.html
index 458362102..129332f6c 100644
--- a/pages/meeting161.html
+++ b/www.i2p2/pages/meeting161.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, December 20, 2005</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting161.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, December 20, 2005</h3>
 <div class="irclog">
 <p>15:20 &lt; jrandom&gt; 0) hi</p>
 <p>15:20 &lt; jrandom&gt; 1) Net status</p>
@@ -117,3 +119,4 @@
 <p>16:14 &lt;+bar&gt; yes, win amd64.</p>
 <p>16:14  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting162.html b/www.i2p2/pages/meeting162.html
similarity index 98%
rename from pages/meeting162.html
rename to www.i2p2/pages/meeting162.html
index 664e7971d..1c32afe9b 100644
--- a/pages/meeting162.html
+++ b/www.i2p2/pages/meeting162.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, January 4, 2006</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting162.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, January 4, 2006</h3>
 <div class="irclog">
 <p>15:22 &lt; jrandom&gt; 0) hi</p>
 <p>15:22 &lt; jrandom&gt; 1) Net status and 0.6.1.8</p>
@@ -88,3 +90,4 @@
 <p>16:02  * jrandom winds up</p>
 <p>16:02  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting163.html b/www.i2p2/pages/meeting163.html
similarity index 98%
rename from pages/meeting163.html
rename to www.i2p2/pages/meeting163.html
index 093dfa84a..8ef6b73a8 100644
--- a/pages/meeting163.html
+++ b/www.i2p2/pages/meeting163.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, January 10, 2006</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting163.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, January 10, 2006</h3>
 <div class="irclog">
 <p>15:26 &lt; jrandom&gt; 0) hi</p>
 <p>15:26 &lt; jrandom&gt; 1) Net status</p>
@@ -171,3 +173,4 @@
 <p>16:31  * jrandom winds up</p>
 <p>16:32  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting164.html b/www.i2p2/pages/meeting164.html
similarity index 99%
rename from pages/meeting164.html
rename to www.i2p2/pages/meeting164.html
index e162904e6..8f6b89bf1 100644
--- a/pages/meeting164.html
+++ b/www.i2p2/pages/meeting164.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, January 17, 2006</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting164.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, January 17, 2006</h3>
 <div class="irclog">
 <p>15:40 &lt; jrandom&gt; 0) hi</p>
 <p>15:40 &lt; jrandom&gt; 1) Net status and 0.6.1.9</p>
@@ -262,3 +264,4 @@
 <p>17:36  * jrandom winds up</p>
 <p>17:36  * jrandom *baf*S the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting165.html b/www.i2p2/pages/meeting165.html
similarity index 98%
rename from pages/meeting165.html
rename to www.i2p2/pages/meeting165.html
index 5c4114b0f..11db1ada5 100644
--- a/pages/meeting165.html
+++ b/www.i2p2/pages/meeting165.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, January 24, 2006</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting165.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, January 24, 2006</h3>
 <div class="irclog">
 <p>15:25 &lt; jrandom&gt; 0) hi</p>
 <p>15:25 &lt; jrandom&gt; 1) Net status</p>
@@ -109,3 +111,4 @@
 <p>16:06  * jrandom winds up</p>
 <p>16:07  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting166.html b/www.i2p2/pages/meeting166.html
similarity index 98%
rename from pages/meeting166.html
rename to www.i2p2/pages/meeting166.html
index 5528eb350..310b79c94 100644
--- a/pages/meeting166.html
+++ b/www.i2p2/pages/meeting166.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, January 31, 2006</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting166.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, January 31, 2006</h3>
 <div class="irclog">
 <p>15:19 &lt; jrandom&gt;  0) hi</p>
 <p>15:19 &lt; jrandom&gt; 1) Net status</p>
@@ -137,3 +139,4 @@
 <p>16:19 &lt; jrandom&gt; gracias :)</p>
 <p>16:19  * jrandom *baf*s the meeting closed </p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting167.html b/www.i2p2/pages/meeting167.html
similarity index 98%
rename from pages/meeting167.html
rename to www.i2p2/pages/meeting167.html
index a486754e4..bcdb994df 100644
--- a/pages/meeting167.html
+++ b/www.i2p2/pages/meeting167.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, February 7, 2005</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting167.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, February 7, 2005</h3>
 <div class="irclog">
 <p>15:36 &lt; jrandom&gt; 0) hi</p>
 <p>15:36 &lt; jrandom&gt; 1) Net status</p>
@@ -146,3 +148,4 @@
 <p>16:43  * jrandom winds up</p>
 <p>16:43  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting168.html b/www.i2p2/pages/meeting168.html
similarity index 97%
rename from pages/meeting168.html
rename to www.i2p2/pages/meeting168.html
index 17d350f30..a7b0a654b 100644
--- a/pages/meeting168.html
+++ b/www.i2p2/pages/meeting168.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, February 14, 2006</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting168.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, February 14, 2006</h3>
 <div class="irclog">
 <p>15:39 &lt; jrandom&gt; 0) hi</p>
 <p>15:39 &lt; jrandom&gt; 1) Net status</p>
@@ -69,3 +71,4 @@
 <p>16:05  * jrandom winds up</p>
 <p>16:05  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting170.html b/www.i2p2/pages/meeting170.html
similarity index 98%
rename from pages/meeting170.html
rename to www.i2p2/pages/meeting170.html
index c31163094..b740f0166 100644
--- a/pages/meeting170.html
+++ b/www.i2p2/pages/meeting170.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, February 28, 2006</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting170.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, February 28, 2006</h3>
 <div class="irclog">
 <p>15:11 &lt; jrandom&gt; 0) hi</p>
 <p>15:11 &lt; jrandom&gt; 1) Net status and 0.6.1.12</p>
@@ -117,3 +119,4 @@
 <p>16:04 &lt; nymisis&gt; Oh, darn, good point.</p>
 <p>16:04  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting171.html b/www.i2p2/pages/meeting171.html
similarity index 97%
rename from pages/meeting171.html
rename to www.i2p2/pages/meeting171.html
index 52caa0627..7014b8897 100644
--- a/pages/meeting171.html
+++ b/www.i2p2/pages/meeting171.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, March 7, 2006</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting171.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, March 7, 2006</h3>
 <div class="irclog">
 <p>15:08 &lt; jrandom&gt; 0) hi</p>
 <p>15:08 &lt; jrandom&gt; 1) Net status</p>
@@ -73,3 +75,4 @@
 <p>15:46  * jrandom winds up</p>
 <p>15:47  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting172.html b/www.i2p2/pages/meeting172.html
similarity index 96%
rename from pages/meeting172.html
rename to www.i2p2/pages/meeting172.html
index c0fa7caad..58ab59ee9 100644
--- a/pages/meeting172.html
+++ b/www.i2p2/pages/meeting172.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, March 14, 2006</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting172.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, March 14, 2006</h3>
 <div class="irclog">
 <p>15:09 &lt;@jrandom&gt; 0) hi</p>
 <p>15:09 &lt;@jrandom&gt; 1) Net status</p>
@@ -60,3 +62,4 @@
 <p>15:39  * jrandom winds up</p>
 <p>15:39  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting173.html b/www.i2p2/pages/meeting173.html
similarity index 98%
rename from pages/meeting173.html
rename to www.i2p2/pages/meeting173.html
index c2c0e8b03..ab2ab27a7 100644
--- a/pages/meeting173.html
+++ b/www.i2p2/pages/meeting173.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, March 21, 2006</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting173.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, March 21, 2006</h3>
 <div class="irclog">
 <p>15:09 &lt;@jrandom&gt; 0) hi</p>
 <p>15:09 &lt;@jrandom&gt; 1) Net status</p>
@@ -117,3 +119,4 @@
 <p>16:00  * jrandom winds up</p>
 <p>16:00  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting174.html b/www.i2p2/pages/meeting174.html
similarity index 97%
rename from pages/meeting174.html
rename to www.i2p2/pages/meeting174.html
index 5ef2c2472..6a099806e 100644
--- a/pages/meeting174.html
+++ b/www.i2p2/pages/meeting174.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, March 28, 2006</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting174.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, March 28, 2006</h3>
 <div class="irclog">
 <p>15:08 &lt; jrandom&gt; 0) hi</p>
 <p>15:08 &lt; jrandom&gt; 1) Net status and 0.6.1.13</p>
@@ -73,3 +75,4 @@
 <p>15:45  * jrandom winds up</p>
 <p>15:46  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting175.html b/www.i2p2/pages/meeting175.html
similarity index 98%
rename from pages/meeting175.html
rename to www.i2p2/pages/meeting175.html
index c1524fc77..d69c71bad 100644
--- a/pages/meeting175.html
+++ b/www.i2p2/pages/meeting175.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, April 4, 2006</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting175.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, April 4, 2006</h3>
 <div class="irclog">
 <p>16:21 &lt; jrandom&gt; 0) hi</p>
 <p>16:21 &lt; jrandom&gt; 1) Net status and 0.6.1.14</p>
@@ -127,3 +129,4 @@
 <p>17:17  * jrandom resumes winding</p>
 <p>17:18  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting176.html b/www.i2p2/pages/meeting176.html
similarity index 99%
rename from pages/meeting176.html
rename to www.i2p2/pages/meeting176.html
index 89a14cdb1..9a8ad6d5b 100644
--- a/pages/meeting176.html
+++ b/www.i2p2/pages/meeting176.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, April 18, 2005</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting176.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, April 18, 2005</h3>
 <div class="irclog">
 <p>16:09 &lt; jrandom&gt; 0) hi</p>
 <p>16:09 &lt; jrandom&gt; 1) Net status and 0.6.1.16</p>
@@ -175,3 +177,4 @@
 <p>17:40  * jrandom winds up</p>
 <p>17:41  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting177.html b/www.i2p2/pages/meeting177.html
similarity index 98%
rename from pages/meeting177.html
rename to www.i2p2/pages/meeting177.html
index ed2baca7e..25bf303b0 100644
--- a/pages/meeting177.html
+++ b/www.i2p2/pages/meeting177.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, April 25, 2005</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting177.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, April 25, 2005</h3>
 <div class="irclog">
 <p>16:12 &lt; jrandom&gt; 0) hi</p>
 <p>16:12 &lt; jrandom&gt; 1) Net status and 0.6.1.17</p>
@@ -149,3 +151,4 @@
 <p>17:13  * jrandom winds up...</p>
 <p>17:13  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting178.html b/www.i2p2/pages/meeting178.html
similarity index 95%
rename from pages/meeting178.html
rename to www.i2p2/pages/meeting178.html
index 6e3052ccb..82a9bab70 100644
--- a/pages/meeting178.html
+++ b/www.i2p2/pages/meeting178.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, May 2, 2006</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting178.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, May 2, 2006</h3>
 <div class="irclog">
 <p>16:09 &lt; jrandom&gt; 0) hi</p>
 <p>16:09 &lt; jrandom&gt; 1) Net status</p>
@@ -36,3 +38,4 @@
 <p>16:33  * jrandom winds up</p>
 <p>16:33  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting179.html b/www.i2p2/pages/meeting179.html
similarity index 97%
rename from pages/meeting179.html
rename to www.i2p2/pages/meeting179.html
index 472b4ef08..74a41a48c 100644
--- a/pages/meeting179.html
+++ b/www.i2p2/pages/meeting179.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, May 9, 2006</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting179.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, May 9, 2006</h3>
 <div class="irclog">
 <p>16:31 &lt; jrandom&gt; 0) hi</p>
 <p>16:31 &lt; jrandom&gt; 1) Net status and 0.6.1.18</p>
@@ -62,3 +64,4 @@
 <p>17:08  * jrandom winds up</p>
 <p>17:09  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting180.html b/www.i2p2/pages/meeting180.html
similarity index 97%
rename from pages/meeting180.html
rename to www.i2p2/pages/meeting180.html
index 89225a8d6..48c3e4304 100644
--- a/pages/meeting180.html
+++ b/www.i2p2/pages/meeting180.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, May 16, 2006</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting180.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, May 16, 2006</h3>
 <div class="irclog">
 <p>&lt; cervantes&gt;  moo: http://dev.i2p.net/pipermail/i2p/2006-May/001289.html
 <p>&lt; cervantes&gt;  0) hi
@@ -78,3 +80,4 @@
 <p>&lt; fox&gt;  &lt; duck&gt;  thx for taking care of the meeting
 <p>&lt; cervantes&gt;  heh I was expecting to baf it closed before anything said anything....but bar ruined that plan :)
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting181.html b/www.i2p2/pages/meeting181.html
similarity index 96%
rename from pages/meeting181.html
rename to www.i2p2/pages/meeting181.html
index 7f04ed7f1..a6d976748 100644
--- a/pages/meeting181.html
+++ b/www.i2p2/pages/meeting181.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, May 30, 2006</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting181.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, May 30, 2006</h3>
 <div class="irclog">
 <p>16:00 &lt; jrandom&gt; 0) hi</p>
 <p>16:00 &lt; jrandom&gt; 1) Net status</p>
@@ -53,3 +55,4 @@
 <p>16:37  * jrandom winds up</p>
 <p>16:37  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting182.html b/www.i2p2/pages/meeting182.html
similarity index 97%
rename from pages/meeting182.html
rename to www.i2p2/pages/meeting182.html
index 1f7ebc3a8..f7a9daece 100644
--- a/pages/meeting182.html
+++ b/www.i2p2/pages/meeting182.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, June 13, 2006</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting182.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, June 13, 2006</h3>
 <div class="irclog">
 <p>16:05 &lt; jrandom&gt; 0) hi</p>
 <p>16:05 &lt; jrandom&gt; 1) Net status</p>
@@ -58,3 +60,4 @@
 <p>16:30  * jrandom winds up</p>
 <p>16:30  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting183.html b/www.i2p2/pages/meeting183.html
similarity index 99%
rename from pages/meeting183.html
rename to www.i2p2/pages/meeting183.html
index 4d7b8b4a7..a554f07c1 100644
--- a/pages/meeting183.html
+++ b/www.i2p2/pages/meeting183.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, August 1, 2006</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting183.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, August 1, 2006</h3>
 <div class="irclog">
 <p>16:02 &lt; jrandom&gt; ok, might as well get this rolling</p>
 <p>16:03 &lt; jrandom&gt; hi, pre-meeting notes posted up at http://dev.i2p.net/pipermail/i2p/2006-August/001304.html</p>
@@ -186,3 +188,4 @@
 <p>17:13  * jrandom winds up</p>
 <p>17:13  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting184.html b/www.i2p2/pages/meeting184.html
similarity index 99%
rename from pages/meeting184.html
rename to www.i2p2/pages/meeting184.html
index 6b7b79b1e..0cd4c55a4 100644
--- a/pages/meeting184.html
+++ b/www.i2p2/pages/meeting184.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, September 12, 2006</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting184.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, September 12, 2006</h3>
 <div class="irclog">
 <p>16:06 &lt; jrandom&gt; 0) hi</p>
 <p>16:06 &lt; jrandom&gt; 1) 0.6.1.25 and net status</p>
@@ -263,3 +265,4 @@
 <p>17:34  * jrandom winds up</p>
 <p>17:34  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting185.html b/www.i2p2/pages/meeting185.html
similarity index 97%
rename from pages/meeting185.html
rename to www.i2p2/pages/meeting185.html
index bd0f4d33b..115c327f5 100644
--- a/pages/meeting185.html
+++ b/www.i2p2/pages/meeting185.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, October 17, 2006</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting185.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, October 17, 2006</h3>
 <div class="irclog">
 <p>16:01 &lt; jrandom&gt; 0) hi</p>
 <p>16:01 &lt; jrandom&gt; 1) Net status</p>
@@ -80,3 +82,4 @@
 <p>16:36  * jrandom winds up</p>
 <p>16:36  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting186.html b/www.i2p2/pages/meeting186.html
similarity index 98%
rename from pages/meeting186.html
rename to www.i2p2/pages/meeting186.html
index 8d3bb4a36..c4ab0a500 100644
--- a/pages/meeting186.html
+++ b/www.i2p2/pages/meeting186.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, October 24, 2006</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting186.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, October 24, 2006</h3>
 <div class="irclog">
 <p>16:03 &lt; jrandom&gt; 0) hi</p>
 <p>16:03 &lt; jrandom&gt; 1) Net status</p>
@@ -98,3 +100,4 @@
 <p>16:54  * jrandom winds up</p>
 <p>16:54  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting187.html b/www.i2p2/pages/meeting187.html
similarity index 97%
rename from pages/meeting187.html
rename to www.i2p2/pages/meeting187.html
index aa42283a0..3e466db49 100644
--- a/pages/meeting187.html
+++ b/www.i2p2/pages/meeting187.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, October 31, 2006</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting187.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, October 31, 2006</h3>
 <div class="irclog">
 <p>15:33 &lt; jrandom&gt; 0) hi</p>
 <p>15:33 &lt; jrandom&gt; 1) Net status</p>
@@ -71,3 +73,4 @@
 <p>16:12  * jrandom winds up</p>
 <p>16:12  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting188.html b/www.i2p2/pages/meeting188.html
similarity index 97%
rename from pages/meeting188.html
rename to www.i2p2/pages/meeting188.html
index 844d2779f..8e298786d 100644
--- a/pages/meeting188.html
+++ b/www.i2p2/pages/meeting188.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, November 7, 2006</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting188.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, November 7, 2006</h3>
 <div class="irclog">
 <p>15:09 &lt; jrandom&gt; 0) hi</p>
 <p>15:09 &lt; jrandom&gt; 1) Net status</p>
@@ -88,3 +90,4 @@
 <p>15:46  * jrandom winds up</p>
 <p>15:46  * jrandom *baf*S the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting189.html b/www.i2p2/pages/meeting189.html
similarity index 98%
rename from pages/meeting189.html
rename to www.i2p2/pages/meeting189.html
index bc443cebc..4d0487631 100644
--- a/pages/meeting189.html
+++ b/www.i2p2/pages/meeting189.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, November 14, 2006</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting189.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, November 14, 2006</h3>
 <div class="irclog">
 <p>15:07 &lt; jrandom&gt; 0) hi</p>
 <p>15:07 &lt; jrandom&gt; 1) Net status</p>
@@ -91,3 +93,4 @@
 <p>16:10  * jrandom winds up</p>
 <p>16:10  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting190.html b/www.i2p2/pages/meeting190.html
similarity index 98%
rename from pages/meeting190.html
rename to www.i2p2/pages/meeting190.html
index 59e725a13..22ca8010a 100644
--- a/pages/meeting190.html
+++ b/www.i2p2/pages/meeting190.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, November 21, 2006</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting190.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, November 21, 2006</h3>
 <div class="irclog">
 <p>15:02 &lt; jrandom&gt; 0) hi</p>
 <p>15:02 &lt; jrandom&gt; 1) Net status</p>
@@ -115,3 +117,4 @@
 <p>15:53  * jrandom winds up</p>
 <p>15:53  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting191.html b/www.i2p2/pages/meeting191.html
similarity index 96%
rename from pages/meeting191.html
rename to www.i2p2/pages/meeting191.html
index c2d6fe90d..994e45b9c 100644
--- a/pages/meeting191.html
+++ b/www.i2p2/pages/meeting191.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, November 28, 2006</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting191.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, November 28, 2006</h3>
 <div class="irclog">
 <p>15:14 &lt; jrandom&gt; 0) hi</p>
 <p>15:14 &lt; jrandom&gt; 1) Net status</p>
@@ -53,3 +55,4 @@
 <p>15:30  * jrandom winds up</p>
 <p>15:30  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting192.html b/www.i2p2/pages/meeting192.html
similarity index 96%
rename from pages/meeting192.html
rename to www.i2p2/pages/meeting192.html
index eaf169c9f..255379691 100644
--- a/pages/meeting192.html
+++ b/www.i2p2/pages/meeting192.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, December 5, 2006</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting192.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, December 5, 2006</h3>
 <div class="irclog">
 <p>15:00 &lt; jrandom&gt; 0) hi</p>
 <p>15:00 &lt; jrandom&gt; 1) Net status</p>
@@ -53,3 +55,4 @@
 <p>15:24  * jrandom winds up</p>
 <p>15:24  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting193.html b/www.i2p2/pages/meeting193.html
similarity index 91%
rename from pages/meeting193.html
rename to www.i2p2/pages/meeting193.html
index 2dc6e9926..5ad52593f 100644
--- a/pages/meeting193.html
+++ b/www.i2p2/pages/meeting193.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, December 12, 2006</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting193.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, December 12, 2006</h3>
 <div class="irclog">
 <p>15:03 &lt; jrandom&gt; 0) hi</p>
 <p>15:03 &lt; jrandom&gt; 1) Net status</p>
@@ -21,3 +23,4 @@
 <p>15:16 &lt; jrandom&gt; if not</p>
 <p>15:16  * jrandom winds up</p>
 <p>15:16  * jrandom *baf*s the meeting closed</p>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting194.html b/www.i2p2/pages/meeting194.html
similarity index 99%
rename from pages/meeting194.html
rename to www.i2p2/pages/meeting194.html
index 573a46314..d3113b985 100644
--- a/pages/meeting194.html
+++ b/www.i2p2/pages/meeting194.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, December 26, 2006</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting194.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, December 26, 2006</h3>
 <div class="irclog">
 <p>15:02 &lt; jrandom&gt; 0) hi</p>
 <p>15:02 &lt; jrandom&gt; 1) Net status</p>
@@ -155,3 +157,4 @@
 <p>16:33  * jrandom winds up</p>
 <p>16:33  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting195.html b/www.i2p2/pages/meeting195.html
similarity index 97%
rename from pages/meeting195.html
rename to www.i2p2/pages/meeting195.html
index bc3bf2cdf..5ee759040 100644
--- a/pages/meeting195.html
+++ b/www.i2p2/pages/meeting195.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, January 2, 2007</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting195.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, January 2, 2007</h3>
 <div class="irclog">
 <p>15:02 &lt; jrandom&gt; 0) hi</p>
 <p>15:02 &lt; jrandom&gt; 1) Net status and plans</p>
@@ -73,3 +75,4 @@
 <p>15:47  * jrandom winds up</p>
 <p>15:47  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting196.html b/www.i2p2/pages/meeting196.html
similarity index 98%
rename from pages/meeting196.html
rename to www.i2p2/pages/meeting196.html
index d25850431..55bc5b938 100644
--- a/pages/meeting196.html
+++ b/www.i2p2/pages/meeting196.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, January 9, 2007</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting196.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, January 9, 2007</h3>
 <div class="irclog">
 <p>15:07 &lt; jrandom&gt; 0) hi</p>
 <p>15:07 &lt; jrandom&gt; 1) Net status</p>
@@ -112,3 +114,4 @@
 <p>16:09  * jrandom winds up</p>
 <p>16:09  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting197.html b/www.i2p2/pages/meeting197.html
similarity index 94%
rename from pages/meeting197.html
rename to www.i2p2/pages/meeting197.html
index 1972e0f0b..7fecb5213 100644
--- a/pages/meeting197.html
+++ b/www.i2p2/pages/meeting197.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, January 16, 2007</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting197.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, January 16, 2007</h3>
 <div class="irclog">
 <p>15:03 &lt; jrandom&gt; 0) hi</p>
 <p>15:03 &lt; jrandom&gt; 1) Net status</p>
@@ -34,3 +36,4 @@
 <p>15:23  * jrandom winds up</p>
 <p>15:23  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting198.html b/www.i2p2/pages/meeting198.html
similarity index 97%
rename from pages/meeting198.html
rename to www.i2p2/pages/meeting198.html
index 0aa9df5ae..58e91ae47 100644
--- a/pages/meeting198.html
+++ b/www.i2p2/pages/meeting198.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, January 30, 2007</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting198.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, January 30, 2007</h3>
 <div class="irclog">
 <p>15:06 &lt; jrandom&gt; 0) hi<p>
 <p>15:06 &lt; jrandom&gt; 1) Net status<p>
@@ -58,3 +60,4 @@
 <p>15:33  * jrandom winds up<p>
 <p>15:34  * jrandom *baf*s the meeting closed<p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting199.html b/www.i2p2/pages/meeting199.html
similarity index 99%
rename from pages/meeting199.html
rename to www.i2p2/pages/meeting199.html
index 97964a154..c350dc164 100644
--- a/pages/meeting199.html
+++ b/www.i2p2/pages/meeting199.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, February 6, 2007</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting199.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, February 6, 2007</h3>
 <div class="irclog">
 <p>15:02 &lt; jrandom&gt; 0) hi</p>
 <p>15:02 &lt; jrandom&gt; 1) Net status</p>
@@ -236,3 +238,4 @@
 <p>16:37  * void hands jrandom the baffer</p>
 <p>16:37  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting200.html b/www.i2p2/pages/meeting200.html
similarity index 97%
rename from pages/meeting200.html
rename to www.i2p2/pages/meeting200.html
index 5cdf5879b..2d25d5ff8 100644
--- a/pages/meeting200.html
+++ b/www.i2p2/pages/meeting200.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, February 13, 2007</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting200.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, February 13, 2007</h3>
 <div class="irclog">
 <p>15:04 &lt; jrandom&gt; 0) hi</p>
 <p>15:04 &lt; jrandom&gt; 1) Net status and 0.6.1.27</p>
@@ -74,3 +76,4 @@
 <p>15:35  * jrandom winds up</p>
 <p>15:35  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting201.html b/www.i2p2/pages/meeting201.html
similarity index 94%
rename from pages/meeting201.html
rename to www.i2p2/pages/meeting201.html
index 951c43f32..ea6d13be6 100644
--- a/pages/meeting201.html
+++ b/www.i2p2/pages/meeting201.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, February 20, 2007</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting201.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, February 20, 2007</h3>
 <div class="irclog">
 <p>14:59 &lt; jrandom&gt; 0) hi</p>
 <p>14:59 &lt; jrandom&gt; 1) Net status</p>
@@ -35,3 +37,4 @@
 <p>15:18  * jrandom winds up</p>
 <p>15:18  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting202.html b/www.i2p2/pages/meeting202.html
similarity index 97%
rename from pages/meeting202.html
rename to www.i2p2/pages/meeting202.html
index 5bfcd63d9..69ebdd98c 100644
--- a/pages/meeting202.html
+++ b/www.i2p2/pages/meeting202.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, March 13, 2007</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting202.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, March 13, 2007</h3>
 <div class="irclog">
 <p>16:01 &lt; jrandom&gt; 0) hi</p>
 <p>16:01 &lt; jrandom&gt; 1) Net status and 0.6.1.28</p>
@@ -82,3 +84,4 @@
 <p>16:57  * jrandom winds up</p>
 <p>16:58  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting203.html b/www.i2p2/pages/meeting203.html
similarity index 97%
rename from pages/meeting203.html
rename to www.i2p2/pages/meeting203.html
index 3482795e3..f8817e0a6 100644
--- a/pages/meeting203.html
+++ b/www.i2p2/pages/meeting203.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, March 20, 2007</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting203.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, March 20, 2007</h3>
 <div class="irclog">
 <p>16:05 &lt; jrandom&gt; 0) hi</p>
 <p>16:05 &lt; jrandom&gt; 1) Net status and 0.6.1.28</p>
@@ -11,7 +13,7 @@
 <p>16:08 &lt; jrandom&gt; ok, lets jump on into 1) net status and 0.6.1.28</p>
 <p>16:09 &lt; jrandom&gt; things are looking pretty good so far with about half of the net upgraded</p>
 <p>16:09 &lt; jrandom&gt; an interesting data point is that the net has grown a bit too, added perhaps another 40-50 active ntcp connections to my router and i see around 700 known router idents</p>
-<p>16:10 &lt; jrandom&gt; we´ll see how that progresses over the next week or so though</p>
+<p>16:10 &lt; jrandom&gt; we'll see how that progresses over the next week or so though</p>
 <p>16:11 &lt; jrandom&gt; ok, anyone have anything to bring up re: net status or 0.6.1.28?</p>
 <p>16:13 &lt; jrandom&gt; ok, if not, lets swing on over to 2) syndie dev status</p>
 <p>16:13 &lt; jrandom&gt; lots going on in that front, as mentioned in the notes</p>
@@ -106,3 +108,4 @@
 <p>16:49  * jrandom winds up</p>
 <p>16:50  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting204.html b/www.i2p2/pages/meeting204.html
similarity index 97%
rename from pages/meeting204.html
rename to www.i2p2/pages/meeting204.html
index debabdaa2..2ca3f4aab 100644
--- a/pages/meeting204.html
+++ b/www.i2p2/pages/meeting204.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, March 27, 2007</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting204.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, March 27, 2007</h3>
 <div class="irclog">
 <p>16:02 &lt; jrandom&gt; 0) hi</p>
 <p>16:02 &lt; jrandom&gt; 1) Net status</p>
@@ -76,3 +78,4 @@
 <p>16:41  * jrandom winds up</p>
 <p>16:41  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting205.html b/www.i2p2/pages/meeting205.html
similarity index 98%
rename from pages/meeting205.html
rename to www.i2p2/pages/meeting205.html
index 21ab3ab75..f298821c6 100644
--- a/pages/meeting205.html
+++ b/www.i2p2/pages/meeting205.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, April 3, 2007</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting205.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, April 3, 2007</h3>
 <div class="irclog">
 <p>16:01 &lt; jrandom&gt; 0) hi</p>
 <p>16:01 &lt; jrandom&gt; 1) net status</p>
@@ -83,3 +85,4 @@
 <p>16:32  * jrandom winds up</p>
 <p>16:33  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting206.html b/www.i2p2/pages/meeting206.html
similarity index 95%
rename from pages/meeting206.html
rename to www.i2p2/pages/meeting206.html
index a6115d077..0a3cdfbc6 100644
--- a/pages/meeting206.html
+++ b/www.i2p2/pages/meeting206.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, April 10, 2007</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting206.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, April 10, 2007</h3>
 <div class="irclog">
 <p>16:01 &lt; jrandom&gt; 0) hi</p>
 <p>16:01 &lt; jrandom&gt; 1) Net status</p>
@@ -40,3 +42,4 @@
 <p>16:26  * jrandom winds up</p>
 <p>16:26  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting47.html b/www.i2p2/pages/meeting47.html
similarity index 99%
rename from pages/meeting47.html
rename to www.i2p2/pages/meeting47.html
index fc5b3f7a4..801a77d4e 100644
--- a/pages/meeting47.html
+++ b/www.i2p2/pages/meeting47.html
@@ -1,4 +1,6 @@
-<div class="irclog">
+{% extends "_layout.html" %}
+{% block title %}Meeting 47{% endblock %}
+{% block content %}<div class="irclog">
 <p>--&gt;	You are now talking on #iip-dev</p>
 <p>---	Topic for #iip-dev is IIP Meeting - logfiles:</p>
 <p>	  http://wiki.invisiblenet.net/?Meetings - http://www.invisiblenet.net/research/</p>
@@ -907,3 +909,4 @@
 <p>&lt;--	hezekiah has quit (Client exiting)</p>
 <p>&lt;--	Ehud has quit (Client exiting)</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting48.html b/www.i2p2/pages/meeting48.html
similarity index 99%
rename from pages/meeting48.html
rename to www.i2p2/pages/meeting48.html
index cce8fb028..e5985bdec 100644
--- a/pages/meeting48.html
+++ b/www.i2p2/pages/meeting48.html
@@ -1,4 +1,6 @@
-<div class="irclog">
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting48.html{% endblock %}
+{% block content %}<div class="irclog">
 <p>--- Log opened Tue Jul 15 17:46:47 2003</p>
 <p>17:46 &lt; gott&gt; yo.</p>
 <p>17:46 &lt;@nop&gt; just a heads up on my silence</p>
@@ -741,3 +743,4 @@
 <p>19:30 &lt; jeremiah&gt; seeya</p>
 <p>--- Log closed Tue Jul 15 19:30:51 2003</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting49.html b/www.i2p2/pages/meeting49.html
similarity index 99%
rename from pages/meeting49.html
rename to www.i2p2/pages/meeting49.html
index cce8fb028..8f6c264c4 100644
--- a/pages/meeting49.html
+++ b/www.i2p2/pages/meeting49.html
@@ -1,4 +1,6 @@
-<div class="irclog">
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting49.html{% endblock %}
+{% block content %}<div class="irclog">
 <p>--- Log opened Tue Jul 15 17:46:47 2003</p>
 <p>17:46 &lt; gott&gt; yo.</p>
 <p>17:46 &lt;@nop&gt; just a heads up on my silence</p>
@@ -741,3 +743,4 @@
 <p>19:30 &lt; jeremiah&gt; seeya</p>
 <p>--- Log closed Tue Jul 15 19:30:51 2003</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting50.html b/www.i2p2/pages/meeting50.html
similarity index 99%
rename from pages/meeting50.html
rename to www.i2p2/pages/meeting50.html
index 27057f320..fbab9962a 100644
--- a/pages/meeting50.html
+++ b/www.i2p2/pages/meeting50.html
@@ -1,4 +1,6 @@
-<p><div class="irclog">--- Log opened Tue Jul 22 15:56:06 2003</p>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting50.html{% endblock %}
+{% block content %}<p><div class="irclog">--- Log opened Tue Jul 22 15:56:06 2003</p>
 <p>15:56 &lt;@hezekiah&gt; jrand0m: Righto!</p>
 <p>15:56 -!- mode/#iip-dev [+o jrand0m] by hezekiah</p>
 <p>15:56 &lt;@cohesion&gt; log enabled</p>
@@ -592,3 +594,4 @@
 <p>17:17 &lt; jeremiah&gt; i checked out earlier today, but it's weird now</p>
 <p>17:17 &lt;@jrand0m&gt; sourceforge is being a pain atm</p>
 <p>--- Log closed Tue Jul 22 17:18:14 2003</div></p>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting51.html b/www.i2p2/pages/meeting51.html
similarity index 99%
rename from pages/meeting51.html
rename to www.i2p2/pages/meeting51.html
index cc3739c01..0c7dfd351 100644
--- a/pages/meeting51.html
+++ b/www.i2p2/pages/meeting51.html
@@ -1,4 +1,6 @@
-<div class="irclog">
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting51.html{% endblock %}
+{% block content %}<div class="irclog">
 <p>--- Log opened Tue Jul 29 16:54:31 2003</p>
 <p>17:11 &lt;@hezekiah&gt; Tue Jul 29 21:11:18 UTC 2003</p>
 <p>17:11 &lt;@hezekiah&gt; The 51th (I think) iip-dev meeting.</p>
@@ -881,3 +883,4 @@
 <p>18:53 &lt;@hezekiah&gt; See you next Tuesday!</p>
 <p>--- Log closed Tue Jul 29 18:53:55 2003</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting52.html b/www.i2p2/pages/meeting52.html
similarity index 99%
rename from pages/meeting52.html
rename to www.i2p2/pages/meeting52.html
index 77c212359..eb6ecf056 100644
--- a/pages/meeting52.html
+++ b/www.i2p2/pages/meeting52.html
@@ -1,4 +1,6 @@
-<div class="irclog">
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting52.html{% endblock %}
+{% block content %}<div class="irclog">
 <p>&lt;nop&gt;	ok, meeting started</p>
 <p>&lt;nop&gt;	what's on the agenda</p>
 <p>--&gt;	logger (logger@anon.iip) has joined #iip-dev</p>
@@ -376,3 +378,4 @@
 <p>&lt;hezekiah&gt;	See you all next week citizens!</p>
 <p>*	hezekiah smashes down the *baf*er</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting53.html b/www.i2p2/pages/meeting53.html
similarity index 98%
rename from pages/meeting53.html
rename to www.i2p2/pages/meeting53.html
index 26965d954..4b2b04994 100644
--- a/pages/meeting53.html
+++ b/www.i2p2/pages/meeting53.html
@@ -1,4 +1,6 @@
-<div class="irclog">
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting53.html{% endblock %}
+{% block content %}<div class="irclog">
 <p>[21:09] &lt;jrand0m&gt; ok.  21:00 UTC esta ahora</p>
 <p>[21:09] &lt;jrand0m&gt; welcome to the um meeting</p>
 <p>[21:09] &lt;jrand0m&gt; we have a lot of people out today (nop, hezekiah, thecrypto, and userx), so we'll keep it brief</p>
@@ -108,3 +110,4 @@
 <p>[21:48] * shardy has joined #iip-dev</p>
 <p>[21:48] * mihi drops dead.</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting54.html b/www.i2p2/pages/meeting54.html
similarity index 99%
rename from pages/meeting54.html
rename to www.i2p2/pages/meeting54.html
index 3786aa800..8fb180023 100644
--- a/pages/meeting54.html
+++ b/www.i2p2/pages/meeting54.html
@@ -1,4 +1,6 @@
-<div class="irclog">
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting54.html{% endblock %}
+{% block content %}<div class="irclog">
 <p>--- Log opened Tue Aug 19 16:56:12 2003</p>
 <p>17:00 -!- logger [logger@anon.iip] has joined #iip-dev</p>
 <p>17:00 -!- Topic for #iip-dev: Weekly IIP development meetings, and other</p>
@@ -436,3 +438,4 @@
 <p>18:05 &lt; hezekiah&gt; ;-)</p>
 <p>--- Log closed Tue Aug 19 18:05:36 2003</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting55.html b/www.i2p2/pages/meeting55.html
similarity index 99%
rename from pages/meeting55.html
rename to www.i2p2/pages/meeting55.html
index b42854833..a4fb42c27 100644
--- a/pages/meeting55.html
+++ b/www.i2p2/pages/meeting55.html
@@ -1,4 +1,6 @@
-<div class="irclog">
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting55.html{% endblock %}
+{% block content %}<div class="irclog">
 <p>[23:00] &lt;jrand0m&gt; ok, topics&gt; x.0: welcome x.1: spec questions x.2: elg issues x.3: sdk status x.4: release plan x.5: apps </p>
 <p>[23:00] &lt;jrand0m&gt; is x == 0 or 1 or 2? </p>
 <p>[23:00] &lt;jeremiah&gt; 22/7</p>
@@ -209,3 +211,4 @@
 <p>[00:03] * jrand0m winds up</p>
 <p>[00:03] * jrand0m *baf*s the meeting to a close.</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting56.html b/www.i2p2/pages/meeting56.html
similarity index 99%
rename from pages/meeting56.html
rename to www.i2p2/pages/meeting56.html
index c19ac4d6a..094958698 100644
--- a/pages/meeting56.html
+++ b/www.i2p2/pages/meeting56.html
@@ -1,4 +1,6 @@
-<div class="irclog">
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting56.html{% endblock %}
+{% block content %}<div class="irclog">
 <p>[22:53] &lt;jrand0m&gt; ok, wtf, why not.  agenda: </p>
 <p>[22:53] &lt;jrand0m&gt; 0) welcome </p>
 <p>[22:53] &lt;jrand0m&gt; 1) spec &amp; sdk release  </p>
@@ -210,3 +212,4 @@
 <p>[23:53] &lt;jrand0m&gt; ... the wind-up </p>
 <p>[23:53] &lt;jrand0m&gt; and the *baf* </p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting57.html b/www.i2p2/pages/meeting57.html
similarity index 99%
rename from pages/meeting57.html
rename to www.i2p2/pages/meeting57.html
index 792b7b4a2..076139620 100644
--- a/pages/meeting57.html
+++ b/www.i2p2/pages/meeting57.html
@@ -1,4 +1,6 @@
-<div class="irclog">
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting57.html{% endblock %}
+{% block content %}<div class="irclog">
 <p>[22:57] &lt;jrand0m&gt; ok, buenos noches srs y srtas </p>
 <p>[22:57] &lt;jrand0m&gt; agenda: </p>
 <p>[22:57] &lt;jrand0m&gt; 0) welcome </p>
@@ -165,3 +167,4 @@
 <p>[23:43] &lt;jrand0m&gt; ok great.  next week, same bat time, same bat place. </p>
 <p>[23:44] * jrand0m *baf*s the meeting to an end</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting58.html b/www.i2p2/pages/meeting58.html
similarity index 99%
rename from pages/meeting58.html
rename to www.i2p2/pages/meeting58.html
index cde74686b..5c5bbc6bd 100644
--- a/pages/meeting58.html
+++ b/www.i2p2/pages/meeting58.html
@@ -1,4 +1,6 @@
-<div class="irclog">
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting58.html{% endblock %}
+{% block content %}<div class="irclog">
 <p>[22:53] &lt;jrand0m&gt; 0) welcome </p>
 <p>[22:54] &lt;jrand0m&gt; 1) apps: </p>
 <p>[22:54] &lt;jrand0m&gt; 1.1) IM </p>
@@ -309,3 +311,4 @@
 <p>[00:22] &lt;jrand0m&gt; nop, and anyone else, really&gt; if you have any comments /questions / concerns, either let us know or post on the mailing list (or even into the wiki) </p>
 <p>[00:23] * jrand0m loads up and *baf*s the meeting to an end.</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting59.html b/www.i2p2/pages/meeting59.html
similarity index 99%
rename from pages/meeting59.html
rename to www.i2p2/pages/meeting59.html
index 7c94a6360..275c9e216 100644
--- a/pages/meeting59.html
+++ b/www.i2p2/pages/meeting59.html
@@ -1,4 +1,6 @@
-<div class="irclog">
+{% extends "_layout.html" %}
+{% block title %}Meeting 59{% endblock %}
+{% block content %}<div class="irclog">
 <p>[22:56] &lt;jrand0m&gt; ok ok </p>
 <p>[22:56] &lt;jrand0m&gt; agenda </p>
 <p>[22:56] &lt;jrand0m&gt; 0.0) welcome </p>
@@ -729,4 +731,4 @@
 <p>[00:41] *** dm has changed the topic on channel #iip-dev to topic1</p>
 <p>[00:41] * jrand0m loads up and...</p>
 <p>[00:41] * jrand0m *baf*s the meeting to an end</p>
-</div>
\ No newline at end of file
+</div>{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting60.html b/www.i2p2/pages/meeting60.html
similarity index 99%
rename from pages/meeting60.html
rename to www.i2p2/pages/meeting60.html
index ad826de10..c4c90afee 100644
--- a/pages/meeting60.html
+++ b/www.i2p2/pages/meeting60.html
@@ -1,4 +1,6 @@
-<div class="irclog">
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting60.html{% endblock %}
+{% block content %}<div class="irclog">
 <p>[22:53] &lt;jrand0m&gt; 0.x) welcome </p>
 <p>[22:53] &lt;jrand0m&gt; 1.x) todo before i2p 0.2: </p>
 <p>[22:53] &lt;jrand0m&gt; 1.1) bw limiting </p>
@@ -274,3 +276,4 @@
 <p>[23:58] &lt;dm&gt; nice try jr!</p>
 <p>[23:58] * jrand0m *baf*s the meeting away</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting61.html b/www.i2p2/pages/meeting61.html
similarity index 97%
rename from pages/meeting61.html
rename to www.i2p2/pages/meeting61.html
index db2328f57..c66271c97 100644
--- a/pages/meeting61.html
+++ b/www.i2p2/pages/meeting61.html
@@ -1,4 +1,6 @@
-<div class="irclog">
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting61.html{% endblock %}
+{% block content %}<div class="irclog">
 <p>[23:04] &lt;jrand0m&gt; 0.0) welcome </p>
 <p>[23:04] &lt;jrand0m&gt; 1.0) dev status </p>
 <p>[23:04] &lt;jrand0m&gt; 2.0) new server </p>
@@ -77,3 +79,4 @@
 <p>[23:23] &lt;jrand0m&gt; I think we've just gotten away with a 23 minute meeting :) </p>
 <p>[23:23] * jrand0m slips the *baf*er out of my back pocket and *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting62.html b/www.i2p2/pages/meeting62.html
similarity index 99%
rename from pages/meeting62.html
rename to www.i2p2/pages/meeting62.html
index 532360600..f5d63b0e8 100644
--- a/pages/meeting62.html
+++ b/www.i2p2/pages/meeting62.html
@@ -1,4 +1,6 @@
-<div class="irclog">
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting62.html{% endblock %}
+{% block content %}<div class="irclog">
 <p>[23:01] &lt;jrand0m&gt; agenda </p>
 <p>[23:01] &lt;jrand0m&gt; 0) welcome </p>
 <p>[23:01] &lt;jrand0m&gt; 1) 0.2 status </p>
@@ -283,4 +285,4 @@
 <p>[00:10] &lt;jrand0m&gt; ok... 68 minutes... if I can drag this out for one more minute... </p>
 <p>[00:10] &lt;jrand0m&gt; w00t </p>
 <p>[00:10] * jrand0m *baf*s the meeting closed.</p>
-</div>
\ No newline at end of file
+</div>{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting63.html b/www.i2p2/pages/meeting63.html
similarity index 98%
rename from pages/meeting63.html
rename to www.i2p2/pages/meeting63.html
index 50856d4db..14ad496e1 100644
--- a/pages/meeting63.html
+++ b/www.i2p2/pages/meeting63.html
@@ -1,4 +1,6 @@
-<h3>Tuesday, October 28, 2003 21:02:50 UTC</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting63.html{% endblock %}
+{% block content %}<h3>Tuesday, October 28, 2003 21:02:50 UTC</h3>
 <div class="irclog">
 <p>[22:59] &lt;dm&gt; so when IS this meeting?</p>
 <p>[23:00] &lt;jrand0m&gt; now. </p>
@@ -178,3 +180,4 @@
 <p>[23:57] *** dm has left #iip-dev</p>
 <p>[23:57] * jrand0m *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting64.html b/www.i2p2/pages/meeting64.html
similarity index 98%
rename from pages/meeting64.html
rename to www.i2p2/pages/meeting64.html
index 09be76e13..268394412 100644
--- a/pages/meeting64.html
+++ b/www.i2p2/pages/meeting64.html
@@ -1,4 +1,6 @@
-<p>(meeting log edited to cover up the fact that iip crashed midway through the meeting and there were lots of ping timeouts, so don't try to read this as a plain narrative)</p>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting64.html{% endblock %}
+{% block content %}<p>(meeting log edited to cover up the fact that iip crashed midway through the meeting and there were lots of ping timeouts, so don't try to read this as a plain narrative)</p>
 <h3>Tuesday, November 11, 2003 21:02:50 UTC</h3>
 <div class="irclog">
 <p>[22:02] &lt;jrand0m&gt; agenda </p>
@@ -191,3 +193,4 @@
 <p>[23:20] &lt;jrand0m&gt; ok, well, /interesting/ meeting, with a few iip crashes in the middle ;) </p>
 <p>[23:21] * jrand0m *baf*s the meeting to a close</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting65.html b/www.i2p2/pages/meeting65.html
similarity index 99%
rename from pages/meeting65.html
rename to www.i2p2/pages/meeting65.html
index 21d98b740..6fc591e33 100644
--- a/pages/meeting65.html
+++ b/www.i2p2/pages/meeting65.html
@@ -1,4 +1,6 @@
-<h3>Tuesday, November 18, 2003 21:02:50 UTC</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting65.html{% endblock %}
+{% block content %}<h3>Tuesday, November 18, 2003 21:02:50 UTC</h3>
 <div class="irclog">
 <p>[22:02] &lt;jrand0m&gt; agenda: </p>
 <p>[22:02] &lt;jrand0m&gt; 0) welcome </p>
@@ -618,3 +620,4 @@
 <p>[23:51] * jrand0m winds up</p>
 <p>[23:51] * jrand0m *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting66.html b/www.i2p2/pages/meeting66.html
similarity index 99%
rename from pages/meeting66.html
rename to www.i2p2/pages/meeting66.html
index fd1bdfa40..db3716c77 100644
--- a/pages/meeting66.html
+++ b/www.i2p2/pages/meeting66.html
@@ -1,4 +1,6 @@
-<h3>Tuesday, November 26, 2003 22:00:00 CET</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting66.html{% endblock %}
+{% block content %}<h3>Tuesday, November 26, 2003 22:00:00 CET</h3>
 <div class="irclog">
 <p>[22:04] &lt;jrand0m&gt; agenda: </p>
 <p>[22:04] &lt;jrand0m&gt; 0) welcome </p>
@@ -472,3 +474,4 @@
 <p>[23:49] &lt;jrand0m&gt; time to... </p>
 <p>[23:49] * jrand0m *baf*'s the meeting closed.</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting68.html b/www.i2p2/pages/meeting68.html
similarity index 99%
rename from pages/meeting68.html
rename to www.i2p2/pages/meeting68.html
index cd6b3d800..8f2cec843 100644
--- a/pages/meeting68.html
+++ b/www.i2p2/pages/meeting68.html
@@ -1,4 +1,6 @@
-<h3>Tuesday, December 9, 2003 22:00:00 CET</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting68.html{% endblock %}
+{% block content %}<h3>Tuesday, December 9, 2003 22:00:00 CET</h3>
 <div class="irclog">
 <p>[22:02] &lt;jrand0m&gt; 0) welcome to $num </p>
 <p>[22:02] &lt;jrand0m&gt; 1) iip status </p>
@@ -276,3 +278,4 @@
 <p>[23:02] * jrand0m *baf*'s the meeting closed on that note</p>
 
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting69.html b/www.i2p2/pages/meeting69.html
similarity index 99%
rename from pages/meeting69.html
rename to www.i2p2/pages/meeting69.html
index 93e5ac6fc..5a114374a 100644
--- a/pages/meeting69.html
+++ b/www.i2p2/pages/meeting69.html
@@ -1,4 +1,6 @@
-<h3>Tuesday, December 16, 2003 22:00:00 CET</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting69.html{% endblock %}
+{% block content %}<h3>Tuesday, December 16, 2003 22:00:00 CET</h3>
 <div class="irclog">
 <p>[22:04] &lt;jrand0m&gt; 0) hi </p>
 <p>[22:04] &lt;jrand0m&gt; 1) iip </p>
@@ -245,3 +247,4 @@
 <p>[22:59] * jrand0m winds up</p>
 <p>[22:59] * jrand0m *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting70.html b/www.i2p2/pages/meeting70.html
similarity index 98%
rename from pages/meeting70.html
rename to www.i2p2/pages/meeting70.html
index ab2ffeba2..c37ec1cdb 100644
--- a/pages/meeting70.html
+++ b/www.i2p2/pages/meeting70.html
@@ -1,4 +1,6 @@
-<h3>Tuesday, December 23, 2003 22:00:00 CET</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting70.html{% endblock %}
+{% block content %}<h3>Tuesday, December 23, 2003 22:00:00 CET</h3>
 <div class="irclog">
 <p>[22:01] &lt;jrand0m&gt; 0) hi </p>
 <p>[22:01] &lt;jrand0m&gt; 1) administravia </p>
@@ -159,3 +161,4 @@
 <p>[22:47] &lt;jrand0m&gt; ok, thats about it. </p>
 <p>[22:48] * jrand0m *baf*s the meeting to a close</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting71.html b/www.i2p2/pages/meeting71.html
similarity index 99%
rename from pages/meeting71.html
rename to www.i2p2/pages/meeting71.html
index ddfbdc132..b2922f0da 100644
--- a/pages/meeting71.html
+++ b/www.i2p2/pages/meeting71.html
@@ -1,4 +1,6 @@
-<h3>Tuesday, December 30, 2003 22:00:00 CET</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting71.html{% endblock %}
+{% block content %}<h3>Tuesday, December 30, 2003 22:00:00 CET</h3>
 <div class="irclog">
 <p>&lt;jrandom&gt; 0) hi</p>
 <p>&lt;jrandom&gt; 1) router status</p>
@@ -331,3 +333,4 @@
 <p>&#8801; jrandom winds up...</p>
 <p>&#8801; jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting72.html b/www.i2p2/pages/meeting72.html
similarity index 99%
rename from pages/meeting72.html
rename to www.i2p2/pages/meeting72.html
index c1ab37d90..e51952262 100644
--- a/pages/meeting72.html
+++ b/www.i2p2/pages/meeting72.html
@@ -1,4 +1,6 @@
-<h3>Tuesday, Jan 6, 2004 22:00:00 CET</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting72.html{% endblock %}
+{% block content %}<h3>Tuesday, Jan 6, 2004 22:00:00 CET</h3>
 <div class="irclog">
 <p>[22:02] &lt;jrand0m&gt; agenda:</p>
 <p>[22:02] &lt;jrand0m&gt; 0) hi</p>
@@ -654,3 +656,4 @@
 <p>[00:44] * jrand0m readies the *baf*'er</p>
 <p>[00:44] * jrand0m *baf*'s the meeting closed.</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting73.html b/www.i2p2/pages/meeting73.html
similarity index 98%
rename from pages/meeting73.html
rename to www.i2p2/pages/meeting73.html
index 5bbd9ee33..60186f2c7 100644
--- a/pages/meeting73.html
+++ b/www.i2p2/pages/meeting73.html
@@ -1,4 +1,6 @@
-<h3>Tuesday, Jan 13, 2004 22:00:00 CET</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting73.html{% endblock %}
+{% block content %}<h3>Tuesday, Jan 13, 2004 22:00:00 CET</h3>
 <div class="irclog">
 <p>[22:01] &lt;jrand0m&gt; 0) hi</p>
 <p>[22:01] &lt;jrand0m&gt; 1) 0.2.3.4</p>
@@ -138,3 +140,4 @@
 <p>[22:32] &lt;jrand0m&gt; word kaji!</p>
 <p>[22:32] * jrand0m *baf*s the meeting closed on that note</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting74.html b/www.i2p2/pages/meeting74.html
similarity index 98%
rename from pages/meeting74.html
rename to www.i2p2/pages/meeting74.html
index 2ecdc67b8..9090a5689 100644
--- a/pages/meeting74.html
+++ b/www.i2p2/pages/meeting74.html
@@ -1,4 +1,6 @@
-<h3>Tuesday, Jan 20, 2004 22:00:00 CET</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting74.html{% endblock %}
+{% block content %}<h3>Tuesday, Jan 20, 2004 22:00:00 CET</h3>
 <div class="irclog">
 <p>[22:07] &lt;jrand0m&gt; agenda:</p>
 <p>[22:07] &lt;jrand0m&gt; 0) hi (read http://i2p.dnsalias.net/pipermail/i2p/2004-January/000101.html)</p>
@@ -185,3 +187,4 @@
 <p>[22:54] &lt;jrand0m&gt; 'k thazzit</p>
 <p>[22:54] * jrand0m *baf*s the meeting to a close</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting75.html b/www.i2p2/pages/meeting75.html
similarity index 98%
rename from pages/meeting75.html
rename to www.i2p2/pages/meeting75.html
index 679cc41a3..2df20e88b 100644
--- a/pages/meeting75.html
+++ b/www.i2p2/pages/meeting75.html
@@ -1,4 +1,6 @@
-<h3>Tuesday, Jan 27, 2004 22:00:00 CET</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting75.html{% endblock %}
+{% block content %}<h3>Tuesday, Jan 27, 2004 22:00:00 CET</h3>
 <div class="irclog">
 <p>[22:03] &lt;jrand0m&gt; 0) hi</p>
 <p>[22:03] &lt;jrand0m&gt; 1) router dev status (0.2.4)</p>
@@ -99,3 +101,4 @@
 <p>[22:30] &lt;baffled2&gt; Okay, I'll see you all when I get home.</p>
 <p>[22:30] * jrand0m *baf*'s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting76.html b/www.i2p2/pages/meeting76.html
similarity index 99%
rename from pages/meeting76.html
rename to www.i2p2/pages/meeting76.html
index e2c11b589..ca475cfc0 100644
--- a/pages/meeting76.html
+++ b/www.i2p2/pages/meeting76.html
@@ -1,4 +1,6 @@
-<h3>Tuesday, Feb 3, 2004 22:00:00 CET</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting76.html{% endblock %}
+{% block content %}<h3>Tuesday, Feb 3, 2004 22:00:00 CET</h3>
 <div class="irclog">
 <p>[22:01] &lt;jrand0m&gt; 0) hi</p>
 <p>[22:01] &lt;jrand0m&gt; 1) testnet</p>
@@ -515,3 +517,4 @@
 <p>[23:57] &lt;dm&gt; do not baf</p>
 <p>[23:57] * @jrand0m denies dm and *baf*'s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting77.html b/www.i2p2/pages/meeting77.html
similarity index 99%
rename from pages/meeting77.html
rename to www.i2p2/pages/meeting77.html
index db005d7df..91e580033 100644
--- a/pages/meeting77.html
+++ b/www.i2p2/pages/meeting77.html
@@ -1,4 +1,6 @@
-<h3>Tuesday, Feb 10, 2004 22:00:00 CET</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting77.html{% endblock %}
+{% block content %}<h3>Tuesday, Feb 10, 2004 22:00:00 CET</h3>
 <div class="irclog">
 <p>[22:00] &lt;jrand0m&gt; &lt;incoming&gt;</p>
 <p>[22:00] &lt;jrand0m&gt; 0) hi</p>
@@ -497,3 +499,4 @@
 <p>[00:02] &lt;fidd&gt; :)</p>
 <p>[00:02] * jrand0m *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting78.html b/www.i2p2/pages/meeting78.html
similarity index 99%
rename from pages/meeting78.html
rename to www.i2p2/pages/meeting78.html
index 249737818..8442f77df 100644
--- a/pages/meeting78.html
+++ b/www.i2p2/pages/meeting78.html
@@ -1,4 +1,6 @@
-<p>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting78.html{% endblock %}
+{% block content %}<p>
 <p>Considering we did not have a very official meeting do to Jrand0m not</p>
 <p>feeling very well, here are my logs of the meeting from slightly</p>
 <p>before it started to sometime after it ended.  I have edited out the</p>
@@ -285,3 +287,4 @@
 <p>Signoff: mihi (let's have more luck next week...)</p>
 <p>&lt;duck&gt; did I miss anything?</p>
 <p>Signoff: jnk (Ping timeout)</p>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting79.html b/www.i2p2/pages/meeting79.html
similarity index 98%
rename from pages/meeting79.html
rename to www.i2p2/pages/meeting79.html
index b8c3bc807..c90f4993a 100644
--- a/pages/meeting79.html
+++ b/www.i2p2/pages/meeting79.html
@@ -1,4 +1,6 @@
-<h3>Tuesday, Feb 24, 2004 22:00:00 CET</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting79.html{% endblock %}
+{% block content %}<h3>Tuesday, Feb 24, 2004 22:00:00 CET</h3>
 <div class="irclog">
 <p>[22:00] &lt;jrand0m&gt; 0) hi</p>
 <p>[22:00] &lt;jrand0m&gt; 1) 0.2.4.2/0.2.5</p>
@@ -182,3 +184,4 @@
 <p>[22:58] * jrand0m winds up</p>
 <p>[22:58] * jrand0m *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting80.html b/www.i2p2/pages/meeting80.html
similarity index 99%
rename from pages/meeting80.html
rename to www.i2p2/pages/meeting80.html
index 91e824eb6..8bb1a3039 100644
--- a/pages/meeting80.html
+++ b/www.i2p2/pages/meeting80.html
@@ -1,4 +1,6 @@
-<h3>Tuesday, Mar 2, 2004 13:00:00 PST</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting80.html{% endblock %}
+{% block content %}<h3>Tuesday, Mar 2, 2004 13:00:00 PST</h3>
 <div class="irclog">
 <p>13:07 &lt; jrandom&gt; 0) hi</p>
 <p>13:07 &lt; jrandom&gt; 1) Dev status</p>
@@ -353,3 +355,4 @@
 <p>14:31  * jrandom winds up the *baf*er...</p>
 <p>14:31  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting81.html b/www.i2p2/pages/meeting81.html
similarity index 99%
rename from pages/meeting81.html
rename to www.i2p2/pages/meeting81.html
index 62e7e72d6..3f10c599c 100644
--- a/pages/meeting81.html
+++ b/www.i2p2/pages/meeting81.html
@@ -1,4 +1,6 @@
-<h3>Tuesday, Mar 16, 2004 13:00:00 PST</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting81.html{% endblock %}
+{% block content %}<h3>Tuesday, Mar 16, 2004 13:00:00 PST</h3>
 <div class="irclog">
 <p>13:12 &lt; jrandom&gt; agenda:</p>
 <p>13:12 &lt; jrandom&gt; 0) hi</p>
@@ -400,3 +402,4 @@
 <p>15:01  * jrandom winds up</p>
 <p>15:01  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting82.html b/www.i2p2/pages/meeting82.html
similarity index 99%
rename from pages/meeting82.html
rename to www.i2p2/pages/meeting82.html
index cb406c57e..3a7a0e9b1 100644
--- a/pages/meeting82.html
+++ b/www.i2p2/pages/meeting82.html
@@ -1,4 +1,6 @@
-<h3>Tuesday, Mar 23, 2004 13:00:00 PST</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting82.html{% endblock %}
+{% block content %}<h3>Tuesday, Mar 23, 2004 13:00:00 PST</h3>
 <div class="irclog">
 <p>[22:01:22] &lt;jrand0m&gt; agenda:</p>
 <p>[22:01:22] &lt;jrand0m&gt; 0) Hi</p>
@@ -465,3 +467,4 @@
 <p>[23:33:05] * jrand0m winds up...</p>
 <p>[23:33:20] * jrand0m *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting90.html b/www.i2p2/pages/meeting90.html
similarity index 99%
rename from pages/meeting90.html
rename to www.i2p2/pages/meeting90.html
index 1efa7c86c..ee01205a9 100644
--- a/pages/meeting90.html
+++ b/www.i2p2/pages/meeting90.html
@@ -1,4 +1,6 @@
-<h3> Tuesday, May 18, 2004 14:00:00 PDT</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting90.html{% endblock %}
+{% block content %}<h3> Tuesday, May 18, 2004 14:00:00 PDT</h3>
 <div class="irclog">
 <p>14:07 &lt; jrandom&gt; 0) hi</p>
 <p>14:07 &lt; jrandom&gt; 1) testnet status</p>
@@ -198,3 +200,4 @@
 <p>15:10  * jrandom winds up</p>
 <p>15:10  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting92.html b/www.i2p2/pages/meeting92.html
similarity index 99%
rename from pages/meeting92.html
rename to www.i2p2/pages/meeting92.html
index 974fd2fcf..94ccbe4ec 100644
--- a/pages/meeting92.html
+++ b/www.i2p2/pages/meeting92.html
@@ -1,4 +1,6 @@
-<div class="irclog">
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting92.html{% endblock %}
+{% block content %}<div class="irclog">
 <p>[22:59] &#60;duck&#62; Tue Jun  1 21:00:00 UTC 2004</p>
 <p>[23:00] &#60;duck&#62; hi folks!</p>
 <p>[23:00] &#60;mihi&#62; hi duck</p>
@@ -336,3 +338,4 @@
 <p>[00:13] &#60;Nightblade&#62; ja</p>
 <p>[00:13] * duck *baffs*</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting93.html b/www.i2p2/pages/meeting93.html
similarity index 99%
rename from pages/meeting93.html
rename to www.i2p2/pages/meeting93.html
index 9e6b9ef58..362c6c7b5 100644
--- a/pages/meeting93.html
+++ b/www.i2p2/pages/meeting93.html
@@ -1,4 +1,6 @@
-<div class="irclog">
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting93.html{% endblock %}
+{% block content %}<div class="irclog">
 <p>21:02:08 &lt;duck&gt; Tue Jun  8 21:02:08 UTC 2004</p>
 <p>21:02:21 &lt;duck&gt; meeting time</p>
 <p>21:02:33 &lt;duck&gt; writeup is at http://dev.i2p.net/pipermail/i2p/2004-June/000268.html</p>
@@ -275,3 +277,4 @@
 <p>21:53:12 &lt;hypercubus&gt; my hair, my hair</p>
 <p>21:53:24  * fvw points at hypercube and laughs. Your hair! Your hair!</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting95.html b/www.i2p2/pages/meeting95.html
similarity index 99%
rename from pages/meeting95.html
rename to www.i2p2/pages/meeting95.html
index 7d135d8a4..e2e6d6c01 100644
--- a/pages/meeting95.html
+++ b/www.i2p2/pages/meeting95.html
@@ -1,4 +1,6 @@
-<div class="irclog">
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting95.html{% endblock %}
+{% block content %}<div class="irclog">
 <p>14:00 &lt; jrandom&gt; 0) hi</p>
 <p>14:00 &lt; jrandom&gt; 1) status update</p>
 <p>14:00 &lt; jrandom&gt; 2) cvs HEAD</p>
@@ -282,3 +284,4 @@
 <p>15:15  * jrandom winds up</p>
 <p>15:15  * jrandom *baf*s cervantes on the head, closing the meeting</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meeting99.html b/www.i2p2/pages/meeting99.html
similarity index 99%
rename from pages/meeting99.html
rename to www.i2p2/pages/meeting99.html
index 903b459a0..70569ae25 100644
--- a/pages/meeting99.html
+++ b/www.i2p2/pages/meeting99.html
@@ -1,4 +1,6 @@
-<h3>I2P dev meeting, July 20 @ 21:00 GMT</h3>
+{% extends "_layout.html" %}
+{% block title %}Pages/meeting99.html{% endblock %}
+{% block content %}<h3>I2P dev meeting, July 20 @ 21:00 GMT</h3>
 <div class="irclog">
 <p>14:05 &lt; jrandom&gt; 0) hi</p>
 <p>14:05 &lt; jrandom&gt; 1) 0.3.2.3, 0.3.3, and the roadmap</p>
@@ -198,3 +200,4 @@
 <p>15:11  * jrandom winds up</p>
 <p>15:11  * jrandom *baf*s the meeting closed</p>
 </div>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/meetings.html b/www.i2p2/pages/meetings.html
similarity index 98%
rename from pages/meetings.html
rename to www.i2p2/pages/meetings.html
index 6cc364705..1da3edd23 100644
--- a/pages/meetings.html
+++ b/www.i2p2/pages/meetings.html
@@ -1,4 +1,6 @@
-<p>The meetings are held every Tuesday at 8PM GMT on IRC.</p>
+{% extends "_layout.html" %}
+{% block title %}Meetings{% endblock %}
+{% block content %}<p>The meetings are held every Tuesday at 8PM GMT on IRC.</p>
 
 <h3>Logs of past meetings</h3>
 <ul>
@@ -150,3 +152,4 @@
 <li><a href="meeting48">Meeting 48</a></li>
 <li><a href="meeting47">Meeting 47</a></li>
 </ul>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/ministreaming.html b/www.i2p2/pages/ministreaming.html
similarity index 90%
rename from pages/ministreaming.html
rename to www.i2p2/pages/ministreaming.html
index 7193a020d..2c690c94e 100644
--- a/pages/ministreaming.html
+++ b/www.i2p2/pages/ministreaming.html
@@ -1,4 +1,6 @@
-<p>The ministreaming library is a layer on top of the core 
+{% extends "_layout.html" %}
+{% block title %}ministreaming{% endblock %}
+{% block content %}<p>The ministreaming library is a layer on top of the core 
 <a href="i2cp">I2CP</a> that allows reliable, in order, and authenticated streams
 of messages to operate across an unreliable, unordered, and unauthenticated 
 message layer.  Just like the TCP to IP relationship, this streaming 
@@ -28,4 +30,4 @@ ministreaming.jar, and it is located in CVS under
 <a href="http://dev.i2p.net/cgi-bin/cvsweb.cgi/i2p/apps/ministreaming/">
 i2p/apps/ministreaming/</a>.  Developers in Java who would like to use it can
 access the API directly, while developers in other languages can use it through
-<a href="sam">SAM</a>'s streaming support.</p>
\ No newline at end of file
+<a href="sam">SAM</a>'s streaming support.</p>{% endblock %}
\ No newline at end of file
diff --git a/pages/minwww.html b/www.i2p2/pages/minwww.html
similarity index 96%
rename from pages/minwww.html
rename to www.i2p2/pages/minwww.html
index d8aa45772..9dcaf6730 100644
--- a/pages/minwww.html
+++ b/www.i2p2/pages/minwww.html
@@ -1,4 +1,6 @@
-<p>Here's an outline and rationale for a minimal WWW proxy app for use over
+{% extends "_layout.html" %}
+{% block title %}minwww{% endblock %}
+{% block content %}<p>Here's an outline and rationale for a minimal WWW proxy app for use over
 I2P.</p>
 <p>HTTP operation over I2P using I2PTunnel.  When the base SocketLibrary
 is out, the only significant difference will be the 'wrapRequest' and
@@ -98,3 +100,4 @@ size, but thats going to be going away since it involves either excessive memory
 overhead on intermediary routers, or additional implementation details to
 handle.  I2PTunnel is currently limited to 128KB and hasn't been a burden,
 so perhaps it could be increased to 256KB when the I2CP spec is updated)</p>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/myi2p.html b/www.i2p2/pages/myi2p.html
similarity index 90%
rename from pages/myi2p.html
rename to www.i2p2/pages/myi2p.html
index 1dd1a79ca..ae620f22d 100644
--- a/pages/myi2p.html
+++ b/www.i2p2/pages/myi2p.html
@@ -1,4 +1,6 @@
-<p>There has been discussion about a distributed blogging application for a few
+{% extends "_layout.html" %}
+{% block title %}MYI2P{% endblock %}
+{% block content %}<p>There has been discussion about a distributed blogging application for a few
 months now called "MyI2P".  While the original discussions were lost, we were 
 able to retrieve a google <a href="http://dev.i2p.net/~jrandom/i2p.net/myi2p.html">cache</a>
 of it.  It isn't pretty, but it includes the basic overview and some discussion
@@ -25,3 +27,4 @@ not get in the first pass either, though its implementation is essentially just
 a blog entry with private access, so perhaps some UI designer can come up with
 something.  Exporting the data to RSS or access through ATOM will be an option 
 down the road as well.</p>
+{% endblock %}
\ No newline at end of file
diff --git a/www.i2p2/pages/news.xml b/www.i2p2/pages/news.xml
new file mode 100755
index 000000000..b72927f15
--- /dev/null
+++ b/www.i2p2/pages/news.xml
@@ -0,0 +1,26 @@
+<i2p.news date="$Date: 2007-10-07 23:03:40 $">
+ <i2p.release version="0.6.1.30" date="2007/02/15" minVersion="0.6"
+              anonurl="http://i2p/NF2RLVUxVulR3IqK0sGJR0dHQcGXAzwa6rEO4WAWYXOHw-DoZhKnlbf1nzHXwMEJoex5nFTyiNMqxJMWlY54cvU~UenZdkyQQeUSBZXyuSweflUXFqKN-y8xIoK2w9Ylq1k8IcrAFDsITyOzjUKoOPfVq34rKNDo7fYyis4kT5bAHy~2N1EVMs34pi2RFabATIOBk38Qhab57Umpa6yEoE~rbyR~suDRvD7gjBvBiIKFqhFueXsR2uSrPB-yzwAGofTXuklofK3DdKspciclTVzqbDjsk5UXfu2nTrC1agkhLyqlOfjhyqC~t1IXm-Vs2o7911k7KKLGjB4lmH508YJ7G9fLAUyjuB-wwwhejoWqvg7oWvqo4oIok8LG6ECR71C3dzCvIjY2QcrhoaazA9G4zcGMm6NKND-H4XY6tUWhpB~5GefB3YczOqMbHq4wi0O9MzBFrOJEOs3X4hwboKWANf7DT5PZKJZ5KorQPsYRSq0E3wSOsFCSsdVCKUGsAAAA/i2p/i2pupdate.sud"
+              publicurl="http://mirror.i2p2.de/i2pupdate.sud"
+              anonannouncement="http://i2p/NF2RLVUxVulR3IqK0sGJR0dHQcGXAzwa6rEO4WAWYXOHw-DoZhKnlbf1nzHXwMEJoex5nFTyiNMqxJMWlY54cvU~UenZdkyQQeUSBZXyuSweflUXFqKN-y8xIoK2w9Ylq1k8IcrAFDsITyOzjUKoOPfVq34rKNDo7fYyis4kT5bAHy~2N1EVMs34pi2RFabATIOBk38Qhab57Umpa6yEoE~rbyR~suDRvD7gjBvBiIKFqhFueXsR2uSrPB-yzwAGofTXuklofK3DdKspciclTVzqbDjsk5UXfu2nTrC1agkhLyqlOfjhyqC~t1IXm-Vs2o7911k7KKLGjB4lmH508YJ7G9fLAUyjuB-wwwhejoWqvg7oWvqo4oIok8LG6ECR71C3dzCvIjY2QcrhoaazA9G4zcGMm6NKND-H4XY6tUWhpB~5GefB3YczOqMbHq4wi0O9MzBFrOJEOs3X4hwboKWANf7DT5PZKJZ5KorQPsYRSq0E3wSOsFCSsdVCKUGsAAAA/pipermail/i2p/2005-September/000878.html" 
+              publicannouncement="http://dev.i2p.net/pipermail/i2p/2005-September/000878.html" />
+ <i2p.notes date="2005/08/08"
+            anonurl="http://i2p/NF2RLVUxVulR3IqK0sGJR0dHQcGXAzwa6rEO4WAWYXOHw-DoZhKnlbf1nzHXwMEJoex5nFTyiNMqxJMWlY54cvU~UenZdkyQQeUSBZXyuSweflUXFqKN-y8xIoK2w9Ylq1k8IcrAFDsITyOzjUKoOPfVq34rKNDo7fYyis4kT5bAHy~2N1EVMs34pi2RFabATIOBk38Qhab57Umpa6yEoE~rbyR~suDRvD7gjBvBiIKFqhFueXsR2uSrPB-yzwAGofTXuklofK3DdKspciclTVzqbDjsk5UXfu2nTrC1agkhLyqlOfjhyqC~t1IXm-Vs2o7911k7KKLGjB4lmH508YJ7G9fLAUyjuB-wwwhejoWqvg7oWvqo4oIok8LG6ECR71C3dzCvIjY2QcrhoaazA9G4zcGMm6NKND-H4XY6tUWhpB~5GefB3YczOqMbHq4wi0O9MzBFrOJEOs3X4hwboKWANf7DT5PZKJZ5KorQPsYRSq0E3wSOsFCSsdVCKUGsAAAA/pipermail/i2p/2005-July/000826.html"
+            publicurl="http://dev.i2p.net/pipermail/i2p/2005-July/000826.html"
+            anonlogs="http://i2p/Nf3ab-ZFkmI-LyMt7GjgT-jfvZ3zKDl0L96pmGQXF1B82W2Bfjf0n7~288vafocjFLnQnVcmZd~-p0-Oolfo9aW2Rm-AhyqxnxyLlPBqGxsJBXjPhm1JBT4Ia8FB-VXt0BuY0fMKdAfWwN61-tj4zIcQWRxv3DFquwEf035K~Ra4SWOqiuJgTRJu7~o~DzHVljVgWIzwf8Z84cz0X33pv-mdG~~y0Bsc2qJVnYwjjR178YMcRSmNE0FVMcs6f17c6zqhMw-11qjKpY~EJfHYCx4lBWF37CD0obbWqTNUIbL~78vxqZRT3dgAgnLixog9nqTO-0Rh~NpVUZnoUi7fNR~awW5U3Cf7rU7nNEKKobLue78hjvRcWn7upHUF45QqTDuaM3yZa7OsjbcH-I909DOub2Q0Dno6vIwuA7yrysccN1sbnkwZbKlf4T6~iDdhaSLJd97QCyPOlbyUfYy9QLNExlRqKgNVJcMJRrIual~Lb1CLbnzt0uvobM57UpqSAAAA/meeting141"
+            publiclogs="http://www.i2p.net/meeting141" />
+&#149;
+2007-10-07: 0.6.1.30
+<a href="http://dev.i2p/pipermail/i2p/2007-October/001356.html">released</a>
+with
+streaming lib, eepget, and i2psnark improvements, and a memory leak fix.
+<br />
+<!--
+&#149;
+2007-04-10:
+<a href="http://dev.i2p/pipermail/i2p/2007-April/001343.html">status notes</a>
+and
+<a href="http://www.i2p/meeting206">meeting log</a>
+<br />
+-->
+</i2p.news>
diff --git a/www.i2p2/pages/not_found.html b/www.i2p2/pages/not_found.html
new file mode 100644
index 000000000..a74845c7b
--- /dev/null
+++ b/www.i2p2/pages/not_found.html
@@ -0,0 +1,5 @@
+{% extends "_layout.html" %}
+{% block title %}Not found{% endblock %}
+{% block content %}
+Yep... the resource, you were searching for, is named differently, doesnt exist or was removed.
+{% endblock %}
diff --git a/pages/performance.html b/www.i2p2/pages/performance.html
similarity index 98%
rename from pages/performance.html
rename to www.i2p2/pages/performance.html
index 86fa5f602..309e7ec06 100644
--- a/pages/performance.html
+++ b/www.i2p2/pages/performance.html
@@ -1,4 +1,6 @@
-<p>Probably one of the most frequent things people ask is "how fast is I2P?",
+{% extends "_layout.html" %}
+{% block title %}Performance{% endblock %}
+{% block content %}<p>Probably one of the most frequent things people ask is "how fast is I2P?",
 and no one seems to like the answer - "it depends".  After trying out I2P, the
 next thing they ask is "will it get faster?", and the answer to that is a most
 emphatic <b>yes</b>.</p>
@@ -149,3 +151,4 @@ could be done, but more efficient mechanisms are available.  When we rip out the
 I2CP that looks like an anonymous IP layer, and as such, we'll be able to
 implement the streaming library to take advantage of the design experiences of
 the TCP layer - selective ACKs, congestion detection, nagle, etc.</p>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/roadmap.html b/www.i2p2/pages/roadmap.html
similarity index 84%
rename from pages/roadmap.html
rename to www.i2p2/pages/roadmap.html
index 567533b3d..b5acabedd 100644
--- a/pages/roadmap.html
+++ b/www.i2p2/pages/roadmap.html
@@ -1,4 +1,6 @@
-<h2 id="0.6.2">0.6.2</h2>
+{% extends "_layout.html" %}
+{% block title %}Roadmap{% endblock %}
+{% block content %}<h2 id="0.6.2">0.6.2</h2>
 <ul>
 <li>NAT/firewall hole punching support for UDP (SSU introducers)</li>
 <li>Update the tunnel pools to include more options for
@@ -26,3 +28,4 @@
 </ul>
 
 <p>Please see the <a href="todo">todo</a> list for more detailed info about some of these tasks.</p>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/sam.html b/www.i2p2/pages/sam.html
similarity index 98%
rename from pages/sam.html
rename to www.i2p2/pages/sam.html
index 8eaa93788..d322262ab 100644
--- a/pages/sam.html
+++ b/www.i2p2/pages/sam.html
@@ -1,4 +1,6 @@
-<p>Specified below is a simple client protocol for interacting with
+{% extends "_layout.html" %}
+{% block title %}SAM{% endblock %}
+{% block content %}<p>Specified below is a simple client protocol for interacting with
 I2P based on discussions between human and jrandom.</p>
 
 <pre>----------------------------------------------------------------------
@@ -348,3 +350,4 @@ Client library implementations:
  Python: Python/I2P: http://dev.i2p.net/contrib/apps/sam/python/index.html
  Others: See apps/sam/ in I2P CVS.
 </pre>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/team.html b/www.i2p2/pages/team.html
similarity index 96%
rename from pages/team.html
rename to www.i2p2/pages/team.html
index 6d83d5295..f94e86680 100644
--- a/pages/team.html
+++ b/www.i2p2/pages/team.html
@@ -1,4 +1,6 @@
-<p>We are a small group of people spread around several continents, working to
+{% extends "_layout.html" %}
+{% block title %}Team{% endblock %}
+{% block content %}<p>We are a small group of people spread around several continents, working to
 advance different aspects of the project and discussing the design of the
 network.</p>
 
@@ -165,3 +167,4 @@ network.</p>
 	<td valign="top"><i>i2p-bt tracker development</i></td>
 </tr>
 </table>
+{% endblock %}
\ No newline at end of file
diff --git a/pages/todo.html b/www.i2p2/pages/todo.html
similarity index 99%
rename from pages/todo.html
rename to www.i2p2/pages/todo.html
index 89ca2efc7..d422ead0d 100644
--- a/pages/todo.html
+++ b/www.i2p2/pages/todo.html
@@ -1,4 +1,6 @@
-<p>Below is a more detailed (yet still incomplete) discussion of the major areas
+{% extends "_layout.html" %}
+{% block title %}Todo{% endblock %}
+{% block content %}<p>Below is a more detailed (yet still incomplete) discussion of the major areas
 of future development on the core I2P network, spanning the plausibly planned 
 releases.  This does not include stego transports, porting to wireless devices,
 or tools to secure the local machine, nor does it include client applications that
@@ -369,3 +371,4 @@ still a few avenues for further optimization:</p>
 </ul></li>
 
 </ul>
+{% endblock %}
\ No newline at end of file
diff --git a/favicon.ico b/www.i2p2/static/favicon.ico
similarity index 100%
rename from favicon.ico
rename to www.i2p2/static/favicon.ico
diff --git a/images/endToEndEncryption.png b/www.i2p2/static/images/endToEndEncryption.png
similarity index 100%
rename from images/endToEndEncryption.png
rename to www.i2p2/static/images/endToEndEncryption.png
diff --git a/images/i2plogo.png b/www.i2p2/static/images/i2plogo.png
similarity index 100%
rename from images/i2plogo.png
rename to www.i2p2/static/images/i2plogo.png
diff --git a/images/net.png b/www.i2p2/static/images/net.png
similarity index 100%
rename from images/net.png
rename to www.i2p2/static/images/net.png
diff --git a/images/plan.png b/www.i2p2/static/images/plan.png
similarity index 100%
rename from images/plan.png
rename to www.i2p2/static/images/plan.png
diff --git a/styles/default.css b/www.i2p2/static/styles/default.css
similarity index 100%
rename from styles/default.css
rename to www.i2p2/static/styles/default.css
-- 
GitLab