Reorganization cleanup, regenerated MANIFEST.

6 files changed, 180 insertions, 566 deletions

diff --git a/MANIFEST b/MANIFEST
index 03a0743..ebe41f9 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,532 +1,192 @@
-activity/activity.info
 activity/activity-wikipedia.svg
+activity/activity.info
 activity.py
 AUTHORS
-c/aclocal.m4
-c/AUTHORS
-c/blocks.c
-c/bootstrap.sh
-c/bzipreader.c
-c/bzipreader.h
-c/ChangeLog
-c/configure
-c/configure.ac
-c/COPYING
-c/debug.h
 cert8.db
-c/indexer.c
-c/indexer.i
-c/indexer.s
-c/INSTALL
-c/livesearch.c
-c/lsearcher.c
-c/lsearcher.h
-c/Makefile.am
-c/Makefile.in
-c/NEWS
-COPYING
-c/README
-c/safe.c
-c/safe.h
-c/search.c
-c/searcher.c
-c/search.h
-c/ternary.h
-c/wp.c
-c/wp.h
-images/0/00/Charlie_Chaplin.jpg
-images/0/00/Wesel_1945.jpg
-images/0/01/Flag_of_Niue.svg
-images/0/02/Augustin_Fresnel.jpg
-images/0/02/LocationSouthAmerica.png
-images/0/02/Newtons_cradle_animation_smooth.gif
-images/0/03/Anolaima.jpg
-images/0/03/Topographic30deg_S30E120.png
-images/0/04/USAF_F-16A_F-15C_F-15E_Desert_Storm_edit2.jpg
-images/0/05/CDKA_1948.jpg
-images/0/05/Structure_bacterienne.png
-images/0/06/Delaroche_-_Bonaparte_franchissant_les_Alpes.jpg
-images/0/06/Universum.jpg
-images/0/06/Yokohama_MinatoMirai21.jpg
-images/0/07/Flag_of_Guam.svg
-images/0/07/Julia_balcony.jpg
-images/0/07/Salto_Angel_from_Raton.JPG
-images/0/08/Convection.gif
-images/0/08/Pain_epices_DSC00141.jpg
-images/0/0b/The_How_and_Why_Library_019.jpg
-images/0/0c/Jupiter_Tonans.jpg
-images/0/0c/Kaufman_House_Palm_Springs.jpg
-images/0/0c/Mitochondria,_mammalian_lung_-_TEM.jpg
-images/0/0d/Saturn's_A_Ring_From_the_Inside_Out.jpg
-images/0/0e/Bharatanatyam_7.jpg
-images/1/10/Thetriumphofdeath.jpg
-images/1/11/Albert_Einstein_photo_1921.jpg
-images/1/11/Trees_and_sunshine.JPG
-images/1/13/M57_The_Ring_Nebula.JPG
-images/1/13/Personal_computer,_exploded_4.svg
-images/1/13/Phylogenetic_tree_of_life_2.svg
-images/1/14/AdditiveColorMixing.png
-images/1/14/Greco_Bautismo_de_Cristo_1597.jpg
-images/1/14/Image-Frankfurt,_European_Central_Bank_with_Euro-2.jpg
-images/1/15/Comet_P1_McNaught04_-_23-01-07.jpg
-images/1/15/LesLuthiers.jpg
-images/1/15/Roosters_2005-06.jpg
-images/1/15/Topographic30deg_N0E90.png
-images/1/16/Melting_icecubes.gif
-images/1/16/Simon_Bolivar.jpg
-images/1/17/Cork_Micrographia_Hooke.png
-images/1/17/Grav.lens1.arp.750pix.jpg
-images/1/19/Ciclo_celular_de_Escherichia_coli.jpg
-images/1/1a/Biological_cell.svg
-images/1/1a/Eshu-statue.jpg
-images/1/1a/Flag_of_Argentina.svg
-images/1/1c/Bar_derinkuyu.jpg
-images/1/1c/KingMerrimanNLA.jpg
-images/1/1d/Lokale_Gruppe_3D_Nachbarschaft.png
-images/1/1e/Imperio_Feteira.jpg
-images/1/1e/James_Clerk_Maxwell_big.jpg
-images/1/1e/William-Adolphe_Bouguereau_(1825-1905)_-_Maternal_Admiration_(1869).jpg
-images/1/1f/Brandenburger_Tor_Blaue_Stunde.jpg
-images/2/20/Ceramic_planter_from_the_Ming_Dynasty.jpg
-images/2/20/Red_Moon_04.jpg
-images/2/21/Santa_fe1mxc.jpg
-images/2/21/Virus-types.png
-images/2/22/Da_Vinci_Vitruve_Luc_Viatour.jpg
-images/2/22/Electromagnetic_spectrum_(es).gif
-images/2/23/Cell_Cycle.svg
-images/2/23/Flag_of_New_Caledonia.svg
-images/2/24/Cassini-science-br.jpg
-images/2/24/Emile_Durkheim.jpg
-images/2/24/Gran_marical_de_ayacucho.jpg
-images/2/24/Gustave_Courbet_038.jpg
-images/2/24/TAPA.jpg
-images/2/25/Don_Quixote.jpg
-images/2/25/Fmrtuebersicht.jpg
-images/2/25/H2O.jpg
-images/2/25/Nucleus_ER_golgi.jpg
-images/2/27/Eighth_note_run.png
-images/2/28/Copernicus.jpg
-images/2/28/Trilla_del_trigo_en_el_Antiguo_Egipto.jpg
-images/2/29/North_America_satellite_orthographic.jpg
-images/2/2a/Moon_PIA00304.jpg
-images/2/2a/Views_of_a_Foetus_in_the_Womb_detail.jpg
-images/2/2b/2004_Indian_Ocean_earthquake_Maldives_tsunami_wave.jpg
-images/2/2b/First_View_of_Earth_from_Moon.jpg
-images/2/2b/Huracán_Hugo.jpg
-images/2/2c/Piccadilly-Circus-Publicité-Nuit.jpg
-images/2/2c/Robert_Hooke_portrait.jpg
-images/2/2e/Theux_JPG06.jpg
-images/2/2f/Hubble_ultra_deep_field.jpg
-images/3/32/Anabaena_sperica.jpg
-images/3/32/EscherichiaColi_NIAID.jpg
-images/3/32/Glucokinase-1GLK.png
-images/3/32/Hubble_01.jpg
-images/3/33/Takatori_Catholic_Church.JPG
-images/3/34/Dpedro2.png
-images/3/34/The_London's_Gherkin_.JPG
-images/3/36/Cesar_vallejo_1929.jpg
-images/3/36/Hopetoun_falls.jpg
-images/3/36/Rembrandt_Harmensz._van_Rijn_038.jpg
-images/3/37/Acropolis_of_Athens_01361.JPG
-images/3/37/Auguste_Rodin_-_Grubleren_2005-02.jpg
-images/3/37/Map-of-human-migrations.jpg
-images/3/38/Richard_herring.jpg
-images/3/39/Bronchiolar_epithelium_3_-_SEM.jpg
-images/3/39/M87_jet.jpg
-images/3/3a/William-Adolphe_Bouguereau_(1825-1905)_-_The_Day_of_the_Dead_(1859).jpg
-images/3/3b/Banco_del_Sur.jpg
-images/3/3b/PhylogeneticTree_horizontal_transfers.png
-images/3/3b/Topographic30deg_S30W150.png
-images/3/3c/GoldenMedows.jpg
-images/3/3c/Solar_planets.jpg
-images/3/3e/Vista-hd.png
-images/3/3f/Pennies.jpg
-images/4/40/DNA_double_helix_vertikal.PNG
-images/4/40/Moon_PIA00305.jpg
-images/4/40/TEATROPUBLICO.jpg
-images/4/41/Bearded_man_Uruk_Louvre_AO5718.jpg
-images/4/41/Topographic30deg_N0W150.png
-images/4/42/Lac_operon.png
-images/4/45/Topographic30deg_N0E120.png
-images/4/46/Archaea_membrane.svg
-images/4/46/Kwashiorkor_6903.jpg
-images/4/47/Frankfurt_am_Main.jpg
-images/4/47/Vista-mymac.png
-images/4/48/Flag_of_Norfolk_Island.svg
-images/4/48/Forja.jpg
-images/4/49/Human_brain_NIH.jpg
-images/4/49/Parinacota.jpg
-images/4/49/Raffael-58a.jpg
-images/4/4b/Lightning3.jpg
-images/4/4b/Restaurant.jpg
-images/4/4b/Ursa_major_star_name.png
-images/4/4c/Calvario_copacabana.jpg
-images/4/4c/Ebohr1.svg
-images/4/4d/NASA_Apollo_17_Lunar_Roving_Vehicle.jpg
-images/4/4d/Streptococcus_mutans_Gram.jpg
-images/4/4d/Tamaños_relativos.jpg
-images/4/4e/Chocomap.jpg
-images/4/4e/Pleiades_large.jpg
-images/4/4e/Surveyor_3-Apollo_12.jpg
-images/4/4f/Urueña_almendro2_lou.jpg
-images/5/50/Attributes_of_painting,_sculpture_&_architecture.jpg
-images/5/51/Gliese.JPG
-images/5/51/Gottlieb-Jews_Praying_in_the_Synagogue_on_Yom_Kippur.jpg
-images/5/51/Uri.svg
-images/5/52/Filippo_Brunelleschi,_cutaway_of_the_Dome_of_Florence_Cathedral_(Santa_Maria_del_Fiore).JPG
-images/5/52/Hubble2005-01-barred-spiral-galaxy-NGC1300.jpg
-images/5/53/Egypte_louvre_299.jpg
-images/5/53/Flag_of_Tokelau_(local).svg
-images/5/53/Jordens_inre.svg
-images/5/55/Phylogenetic_tree-es.png
-images/5/57/Galunggung.jpg
-images/5/58/Scribe-accroupi.jpg
-images/5/59/Henri_de_Saint-simon_portrait.jpg
-images/5/59/India_Goa_Portuguese_Villa.jpg
-images/5/5a/KomodoDragon.jpg
-images/5/5a/PET2.jpg
-images/5/5a/Topographic30deg_S0W120.png
-images/5/5a/Wilderbeest.jpg
-images/5/5b/GoldNuggetUSGOV.jpg
-images/5/5d/Religionesdelmundo.jpg
-images/5/5e/57_The_Close,_Salisbury.jpg
-images/5/5f/Septem-artes-liberales_Herrad-von-Landsberg_Hortus-delicarium_1180.jpg
-images/6/60/EXCAVACION45.jpg
-images/6/60/Newton-Principia-Mathematica_1-500x700.jpg
-images/6/60/Red_King_sleeping.jpg
-images/6/60/Regensburg_Stadttheater_Zuschauerraum_2004.jpg
-images/6/61/Pasajeros_al_tren.jpg
-images/6/61/Religiones_de_europa.png
-images/6/62/HMS_Dreadnought_1906_H61017.jpg
-images/6/62/Hungarian_Grey_Cattle8.jpg
-images/6/62/Opening_of_the_first_parliament.jpg
-images/6/63/Michelangelos_David.jpg
-images/6/63/Paris.louvre.winged.500pix.jpg
-images/6/63/USA.NM.VeryLargeArray.02.jpg
-images/6/65/Fes_Medersa_Bou_Inania_Mosaique3_Calligraphy2.jpg
-images/6/66/FamiliaOjeda.JPG
-images/6/66/Ponteorinoco2006.jpg
-images/6/67/Fitness-landscape-cartoon.png
-images/6/67/Flag_of_Christmas_Island.svg
-images/6/69/2D_Wavefunction_(2,2)_Surface_Plot.png
-images/6/69/Alice_par_John_Tenniel_25.png
-images/6/69/Digitalartpaintsky.jpg
-images/6/6a/Mona_Lisa.jpg
-images/6/6b/Europa-philosophen-1-800.png
-images/6/6b/Leaving_Yongsan_Station.jpg
-images/6/6c/Manhattan_night_march_USa.jpg
-images/6/6c/OGLE-2005-BLG-390Lb.jpg
-images/6/6d/Cocacola-5cents-1900.jpg
-images/6/6e/SOHO_instruments_pnggray_300.png
-images/6/6f/Chicago_Downtown_Aerial_View.jpg
-images/6/6f/Mouths_of_amazon_geocover_1990.png
-images/6/6f/Sun_symbol.svg
-images/7/72/Andrea_Faria,_Conrado_e_filha.jpg
-images/7/72/Brain_chrischan_300.gif
-images/7/73/Estructura_celula_vegetal.png
-images/7/73/Frans_Hals_-_Portret_van_René_Descartes.jpg
-images/7/73/Moon_PIA00302.jpg
-images/7/73/Topographic30deg_N0W120.png
-images/7/74/Flag_of_the_Cocos_(Keeling)_Islands.svg
-images/7/75/Prussian_bayonet_clean.jpg
-images/7/77/Continental_models.gif
-images/7/78/Fusión_solar.png
-images/7/79/Glass_tesseract_still.png
-images/7/79/Gram_Stain_Anthrax.jpg
-images/7/79/Thompson's_Gazelle.jpeg
-images/7/7a/Esclapius_stick.svg
-images/7/7a/Philosophie-Epochen.png
-images/7/7a/Topographic30deg_S0E150.png
-images/7/7c/EtaCarinae.jpg
-images/7/7c/Heliconia_latispatha_Río_de_Janeiro.jpg
-images/7/7c/Peugeot_206_WRC.jpg
-images/7/7e/Antarctica.jpg
-images/7/7e/Glasmurmel_mit_Schatten_auf_kariertem_Grund_2007_02_14.JPG
-images/7/7e/Topographic30deg_S0E90.png
-images/7/7f/Betelgeuse_star_(Hubble).jpg
-images/8/81/Map_of_skin_hue_equi.png
-images/8/81/Oceans.png
-images/8/82/ALU_symbol.svg
-images/8/83/Antoni_van_Leeuwenhoek.png
-images/8/83/MercatormapFullEurope16thcentury.jpg
-images/8/83/Redoutable.jpg
-images/8/83/SAM_pol.png
-images/8/83/Vietcong.jpg
-images/8/86/Neandertal.jpg
-images/8/87/Flag_of_American_Samoa.svg
-images/8/87/Saami_Family_1900.jpg
-images/8/88/Astronaut-EVA.jpg
-images/8/88/Flag_of_the_Pitcairn_Islands.svg
-images/8/88/Peru_Machu_Picchu_Sunset.jpg
-images/8/88/Ship_diagram-numbers.svg
-images/8/8a/Topographic30deg_S30E90.png
-images/8/8c/Insulincrystals.jpg
-images/8/8d/Qgis08_grass6_toolbox.png
-images/8/8d/Young_monks_of_Drepung.jpg
-images/8/8e/Aradtruck.JPG
-images/9/90/Supermassiveblackhole_nasajpl.jpg
-images/9/91/Subestación_electricidad.jpg
-images/9/92/Black_triggerfish.jpg
-images/9/92/Paris-LOC_cph_3b40741.jpg
-images/9/93/CMYK_farbwuerfel.jpg
-images/9/93/Human.svg
-images/9/94/Guerra.png
-images/9/96/Antoine_lavoisier.jpg
-images/9/96/Approaching_Omaha.jpg
-images/9/96/Diamond_animation.gif
-images/9/97/The_Earth_seen_from_Apollo_17.jpg
-images/9/99/European_regions.png
-images/9/9c/Aldrin_Apollo_11.jpg
-images/9/9c/Castros.jpg
-images/9/9d/Viruscomplejo.png
-images/a/a0/Atomicclock.jpg
-images/a/a0/Templeofthegoldenpavilion.jpg
-images/a/a2/Farming_near_Klingerstown,_Pennsylvania.jpg
-images/a/a2/View_of_loch_lomond.JPG
-images/a/a3/Coronagraph_example.gif
-images/a/a3/Electricity_consumption_per_country_map.PNG
-images/a/a4/Couscous-1.jpg
-images/a/a4/DownTown_Toronto1.jpg
-images/a/a4/Socrates_Louvre.jpg
-images/a/a4/Velazquez-Meninas.jpg
-images/a/a6/CopanNSouthCatherwood.jpg
-images/a/a7/Eugène_Delacroix_-_La_liberté_guidant_le_peuple.jpg
-images/a/a7/Max_Planck_(1858-1947).jpg
-images/a/a7/Topographic30deg_S30E150.png
-images/a/a8/London.bankofengland.arp.jpg
-images/a/a8/Tango-Show-Buenos-Aires-01.jpg
-images/a/a9/Atacama1.jpg
-images/a/a9/Wikipedia_growth.png
-images/a/a9/World_geologic_provinces.jpg
-images/a/aa/Ägyptischer_Maler_um_1400_v._Chr._001.jpg
-images/a/aa/Sun920607.jpg
-images/a/ac/SubtractiveColorMixing.png
-images/a/ae/Flag_of_the_United_Kingdom.svg
-images/a/af/Bust_Pericles_Chiaramonti.jpg
-images/b/b0/Galileo-sustermans.jpg
-images/b/b0/Nasa_swift_satellite.jpg
-images/b/b1/Europe_satellite_globe.jpg
-images/b/b2/Isaac_Newton.jpeg
-images/b/b3/Auguste_Comte.jpg
-images/b/b4/SalmonellaNIAID.jpg
-images/b/b4/Tower_of_London_interior.jpg
-images/b/b5/USA_Antelope-Canyon.jpg
-images/b/b6/Herder.jpg
-images/b/b7/Female_mallard_nest_-_natures_pics_edit2.jpg
-images/b/b7/Jean-Jacques_Rousseau_(painted_portrait).jpg
-images/b/b9/Flag_of_Australia.svg
-images/b/ba/EXC._II.jpg
-images/b/ba/NosferatuShadow.jpg
-images/b/bb/DNA_ORF.gif
-images/b/bb/Geodinámico.JPG
-images/b/bd/Angelo_Bronzino_001.jpg
-images/b/bd/Water_drop_animation_enhanced_small.gif
-images/c/c0/Field,_corn,_Liechtenstein,_Mountains,_Alps,_Vaduz,_sky,_clouds,_landscape.jpg
-images/c/c0/Shamans_Drum.jpg
-images/c/c2/Nebra-1.jpg
-images/c/c2/SnowflakesWilsonBentley.jpg
-images/c/c3/Cellulose_strand.jpg
-images/c/c3/Erik_Lemming.jpg
-images/c/c3/Flag_of_France.svg
-images/c/c3/NGC_4414_(NASA-med).jpg
-images/c/c4/Topographic30deg_S30W120.png
-images/c/c5/Viracocha.jpg
-images/c/c6/Cole_Thomas_The_Architect-s_Dream_1840.jpg
-images/c/c6/Moon_symbol_decrescent.svg
-images/c/c6/Tree_Fern.jpg
-images/c/c7/Apfel_partikel.jpg
-images/c/c8/Ahu_Tahai.jpg
-images/c/c9/Allisvanity.jpg
-images/c/c9/C-141_Starlifter_contrail.jpg
-images/c/c9/Penicillium_labeled.jpg
-images/c/ca/Kiss_Briseis_Painter_Louvre_G278.jpg
-images/c/ca/Supraleitung.jpg
-images/c/cb/Almanach_Chronique_de_Jersey_1892_Hodgetts_tabac.jpg
-images/c/cd/VanGogh-starry_night.jpg
-images/c/cf/Dirac_4.jpg
-images/c/cf/HAtomOrbitals.png
-images/c/cf/River_Plate.jpg
-images/d/d0/Japanese_Macaques_sleeping.JPG
-images/d/d1/Modelo_de_Bohr.png
-images/d/d2/DSC00733_Notre_Dame_Paris_from_east.jpg
-images/d/d2/Flag_of_Wallis_and_Futuna.svg
-images/d/d2/Internet_map_1024.jpg
-images/d/d3/AF-kindergarten.jpg
-images/d/d3/Box_Log_Falls.jpg
-images/d/d5/Gyroscope_operation.gif
-images/d/d5/Niels_Bohr_Albert_Einstein_by_Ehrenfest.jpg
-images/d/d6/EMpylori.jpg
-images/d/d7/Alphadecay.jpg
-images/d/d9/Goliath_beetle.jpg
-images/d/d9/Zuni-girl-with-jar2.png
-images/d/da/AGMA_Hérodote.jpg
-images/d/da/Epenwöhrden_schwangeres_haus.jpg
-images/d/da/Stonehenge_back_wide.jpg
-images/d/da/TALLERES_MUÑOZ_I.jpg
-images/d/db/Flag_of_French_Polynesia.svg
-images/d/dc/Tectonic_plates.png
-images/d/dd/101_016_DRI_Ingolstadt.jpg
-images/d/dd/Full_Moon_Luc_Viatour.jpg
-images/d/dd/Goya-Guerra_(05).jpg
-images/d/dd/Muybridge_race_horse_animated.gif
-images/d/de/Renier.jpg
-images/d/de/Topographic30deg_S0E120.png
-images/d/df/Gerome_-_Diogenes.jpg
-images/d/df/Sun_in_X-Ray.png
-images/e/e0/Flag_of_the_Northern_Mariana_Islands.svg
-images/e/e0/Nagasakibomb.jpg
-images/e/e1/D_orbitals.svg
-images/e/e1/MyPyramid1.png
-images/e/e2/Full_moon.png
-images/e/e2/Salmonlarvakils.jpg
-images/e/e3/Kheops-Pyramid.jpg
-images/e/e3/Krishna.jpg
-images/e/e4/CellMembraneDrawing_(es).png
-images/e/e4/Prokaryote_cell_diagram_international.svg
-images/e/e5/Topographic30deg_S0W150.png
-images/e/e6/Omaha-beach-cemetery.jpg
-images/e/e7/Earth_symbol.svg
-images/e/e7/Pediastrumboryanum.jpg
-images/e/e7/Raffael_053.jpg
-images/e/e9/Banco_Hispano_Americano_(Madrid)_03.jpg
-images/e/ed/Moreau,_Europa_and_the_Bull.jpg
-images/e/ee/Braun_HF_1.jpg
-images/e/ee/Dust.devil.mars.arp.750pix.jpg
-images/e/ee/Filogenia-vida-plantas-verdes.gif
-images/e/ef/Flag_of_Hawaii.svg
-images/f/f0/Geostático.JPG
-images/f/f3/Entrevista_de_Guayaquil.jpg
-images/f/f3/Jade_pot_from_the_Qing_Dynasty.jpg
-images/f/f3/Magnetosphere_rendition.jpg
-images/f/f4/NIAID-west-Nile.jpg
-images/f/f4/TrenFerrosurRoca.jpg
-images/f/f5/Grand_prismatic_spring.jpg
-images/f/f6/Amazon_rainforest.jpg
-images/f/f6/FallingwaterWright.jpg
-images/f/f6/Moon_Earth_Comparison.png
-images/f/f6/Pinochet_y_Videla.jpg
-images/f/f7/Feuerreiben.gif
-images/f/f9/ChampiEnForet.jpg
-images/f/fa/Topographic30deg_N0E150.png
-images/f/fb/Moon_PIA00303.jpg
-images/f/fc/Chip.jpg
-images/f/fc/Karl_Marx.jpg
-images/f/fd/BD-fishermen.jpg
-images/f/fd/Carnaval_de_Rio_-_Costume.jpg
-images/f/ff/Andromeda_galaxy.jpg
-images/f/ff/Lenguas_de_europa.png
-js/instaview-0.6.1.js
-js/instaview-0.6.4.js
-js/wiki2html.js
-mad_popular2.xml.bz2.index.txt
-mad_popular2.xml.bz2.blocks.db
-mad_popular2.xml.bz2.locate.db
-mad_popular2.xml.bz2.locate.prefixdb
-mad_popular2.xml.bz2.processed
-template_blacklist
-MANIFEST
+es_PE/template_blacklist
+es_PE/es_PE.xml.bz2.index.txt
+es_PE/es_PE.xml.bz2.locate.db
+es_PE/es_PE.xml.bz2.locate.prefixdb
+es_PE/es_PE.xml.bz2.processed
+es_PE/es_PE.xml.bz2.blocks.db
+mwlib/mwapidb.py
+mwlib/rendermath.pyc
+mwlib/zipwiki.py
+mwlib/uparser.py
+mwlib/rendermath.py
+mwlib/_expander.re
+mwlib/expander.pyc
+mwlib/log.py
+mwlib/_mwscan.so
+mwlib/lang.py
+mwlib/_version.py
+mwlib/scanner.pyc
+mwlib/_expander.so
+mwlib/imgmap.py
+mwlib/licenses.py
+mwlib/htmlwriter.py
+mwlib/recorddb.py
+mwlib/advtree.py
+mwlib/timeline.py
+mwlib/utils.py
+mwlib/web.py
+mwlib/expr.pyc
+mwlib/scanfile.py
+mwlib/overlay.py
+mwlib/allnodes.py
+mwlib/texmap.py
+mwlib/expander.py
+mwlib/magics.py
+mwlib/cdbwiki.py
+mwlib/cdb.py
+mwlib/resources/pedia.css
+mwlib/resources/__init__.pyc
+mwlib/resources/outgoing_link.gif
+mwlib/resources/__init__.py
+mwlib/scanner.py
+mwlib/mwscan.py
+mwlib/metabook.py
+mwlib/netdb.py
+mwlib/Makefile
+mwlib/lang.txt
+mwlib/log.pyc
+mwlib/apps.py
+mwlib/timeline.pyc
+mwlib/__init__.pyc
+mwlib/parser.py
+mwlib/htmlwriter.pyc
+mwlib/caller.py
+mwlib/lang.pyc
+mwlib/dummydb.py
+mwlib/parser.pyc
+mwlib/texmap.pyc
+mwlib/_mwscan.cc
+mwlib/expr.py
+mwlib/sanitychecker.py
+mwlib/_expander.cc
+mwlib/EasyTimeline.pl
+mwlib/magics.pyc
+mwlib/wiki.py
+mwlib/_mwscan.re
+mwlib/__init__.py
+mwlib/mwscan.pyc
 NEWS
-py/get_images.py
-py/mwlib/advtree.py
-py/mwlib/allnodes.py
-py/mwlib/apps.py
-py/mwlib/caller.py
-py/mwlib/cdb.py
-py/mwlib/cdbwiki.py
-py/mwlib/dummydb.py
-py/mwlib/EasyTimeline.pl
-py/mwlib/_expander.cc
-py/mwlib/expander.py
-py/mwlib/expander.pyc
-py/mwlib/_expander.re
-py/mwlib/_expander.so
-py/mwlib/expr.py
-py/mwlib/expr.pyc
-py/mwlib/htmlwriter.py
-py/mwlib/htmlwriter.pyc
-py/mwlib/imgmap.py
-py/mwlib/imgmap.pyc
-py/mwlib/__init__.py
-py/mwlib/__init__.pyc
-py/mwlib/lang.py
-py/mwlib/lang.pyc
-py/mwlib/lang.txt
-py/mwlib/licenses.py
-py/mwlib/log.py
-py/mwlib/log.pyc
-py/mwlib/magics.py
-py/mwlib/magics.pyc
-py/mwlib/Makefile
-py/mwlib/metabook.py
-py/mwlib/mwapidb.py
-py/mwlib/_mwscan.cc
-py/mwlib/mwscan.py
-py/mwlib/mwscan.pyc
-py/mwlib/_mwscan.re
-py/mwlib/_mwscan.so
-py/mwlib/netdb.py
-py/mwlib/overlay.py
-py/mwlib/parser.py
-py/mwlib/parser.pyc
-py/mwlib/recorddb.py
-py/mwlib/rendermath.py
-py/mwlib/rendermath.pyc
-py/mwlib/resources/__init__.py
-py/mwlib/resources/__init__.pyc
-py/mwlib/resources/outgoing_link.gif
-py/mwlib/resources/pedia.css
-py/mwlib/sanitychecker.py
-py/mwlib/scanfile.py
-py/mwlib/scanner.py
-py/mwlib/scanner.pyc
-py/mwlib/texmap.py
-py/mwlib/texmap.pyc
-py/mwlib/timeline.py
-py/mwlib/timeline.pyc
-py/mwlib/uparser.py
-py/mwlib/utils.py
-py/mwlib/_version.py
-py/mwlib/web.py
-py/mwlib/wiki.py
-py/mwlib/zipwiki.py
-py/server.py
-py/wp.py
-py/wp.pyc
-py/wp/setup.py
-py/_wp.so
-py/wp/wp.i
 searchtoolbar.py
+server.py
 setup.py
 static/acerca.html
-static/audio.png
-static/biology.png
-static/bullet.gif
-static/common.css
-static/discussionitem_icon.gif
-static/document.png
-static/earth.png
+static/lock_icon.gif
 static/es-gfdl.html
-static/external.png
+static/document.png
+static/wikipedia.png
 static/file_icon.gif
-static/headbg.jpg
-static/humanities.png
-static/index.html
-static/link_icon.gif
-static/lock_icon.gif
-static/magnify-clip.png
-static/mail_icon.gif
-static/math.png
 static/monobook.css
-static/news_icon.png
-static/outgoing_link.gif
+static/bullet.gif
 static/pedia.css
-static/phys_science.png
-static/required.gif
 static/shared.css
-static/socialscience.png
-static/society.png
-static/styles.css
+static/math.png
 static/technology.png
-static/user.gif
+static/society.png
+static/news_icon.png
+static/biology.png
+static/phys_science.png
+static/earth.png
+static/mail_icon.gif
+static/socialscience.png
+static/required.gif
+static/outgoing_link.gif
+static/index.html
+static/headbg.jpg
+static/external.png
+static/common.css
 static/video.png
-static/wikipedia.png
+static/magnify-clip.png
+static/link_icon.gif
+static/humanities.png
+static/user.gif
+static/audio.png
+static/styles.css
+static/discussionitem_icon.gif
+tools/CountLinks.pl
+tools/GetTemplates.pl
+tools/PageLinks.pl
+tools/GetPagesAboveThreshold.pl
+tools/GetPageCounts.pl
+tools/GetPages.pl
+tools/RankImages.pl
+tools/get_images.py
+woip/c/lsearcher.h
+woip/c/Makefile.in
+woip/c/README
+woip/c/lsearcher.c
+woip/c/wp.h
+woip/c/wp.c
+woip/c/indexer.s
+woip/c/bzipreader.h
+woip/c/safe.h
+woip/c/bootstrap.sh
+woip/c/Makefile.am
+woip/c/search.h
+woip/c/searcher.c
+woip/c/AUTHORS
+woip/c/configure.ac
+woip/c/indexer.i
+woip/c/aclocal.m4
+woip/c/autom4te.cache/output.1
+woip/c/autom4te.cache/traces.0
+woip/c/autom4te.cache/output.0
+woip/c/autom4te.cache/traces.1
+woip/c/autom4te.cache/requests
+woip/c/ternary.h
+woip/c/debug.h
+woip/c/ChangeLog
+woip/c/indexer.c
+woip/c/NEWS
+woip/c/COPYING
+woip/c/bzipreader.c
+woip/c/search.c
+woip/c/safe.c
+woip/c/INSTALL
+woip/c/livesearch.c
+woip/c/configure
+woip/c/blocks.c
+woip/README
+woip/app/ReadStream.h
+woip/app/ReadStream.m
+woip/app/WikiApp.m
+woip/app/main.m
+woip/app/WPParser.m
+woip/app/SearchView.m
+woip/app/Makefile
+woip/app/WebKitView.h
+woip/app/SearchBar.h
+woip/app/WPParser.h
+woip/app/WebKitView.m
+woip/app/WikiApp.h
+woip/app/SearchView.h
+woip/app/ArticleView.m
+woip/app/ArticleView.h
+woip/app/SearchBar.m
+woip/app/SearchResult.m
+woip/app/SearchResult.h
+woip/AUTHORS
+woip/rb/livesearch.rb
+woip/rb/bzipreader.rb
+woip/rb/common.rb
+woip/rb/xapian-index.rb
+woip/rb/server.rb
+woip/rb/article.rb
+woip/rb/index.rb
+woip/rb/xmlprocess.rb
+woip/rb/titles.rb
+woip/rb/#bzipreader.rb#
+woip/COPYING
+woip/py/wp.i
+woip/py/setup.py
+woip/sh/server
+woip/sh/scan
+woip/sh/process
+woip/sh/livesearch
+woip/sh/test
+wp.py
+_wp.so
diff --git a/template_blacklist b/es_PE/template_blacklist
index 0c09a93..0c09a93 100644
--- a/template_blacklist
+++ b/es_PE/template_blacklist
diff --git a/mwlib/expander.py b/mwlib/expander.py
index a3a529d..5e92105 100755
--- a/mwlib/expander.py
+++ b/mwlib/expander.py
@@ -387,7 +387,7 @@ class Expander(object):
         self.parsedTemplateCache = {}
 
         self.blacklist = set()
-        with open("template_blacklist", 'r') as f:
+        with open("es_PE/template_blacklist", 'r') as f:
             for line in f.readlines():
                 self.blacklist.add(line.rstrip())
 
diff --git a/server.py b/server.py
index 882a53f..2ab5f47 100644..100755
--- a/server.py
+++ b/server.py
@@ -25,15 +25,6 @@ except ImportError:
 import mwlib.htmlwriter
 from mwlib import parser, scanner, expander
 
-parsers = [
-    '/js/wiki2html.js',
-    '/js/instaview-0.6.1.js',
-    '/js/instaview-0.6.4.js',
-    'mwlib',
-]
-
-default_parser = 3
-
 class LinkStats:
     allhits = 1
     alltotal = 1
@@ -442,32 +433,7 @@ class WikiRequestHandler(SimpleHTTPRequestHandler):
 
         return article_text
     
-    def send_wiki_html_js(self, article_text, parser):
-        self.wfile.write("<script type='text/javascript' src='%s'></script>" % parser)
-
-        #self.wfile.write("Internal hits on this page: %d<br>" % LinkStats.pagehits)
-        #self.wfile.write("Total links on this page: %d<br>" % LinkStats.pagetotal)
-        #page_percent = ((1.0 * LinkStats.pagehits / LinkStats.pagetotal) * 100)
-        #self.wfile.write("Percentage: %.2f<br>" % page_percent)
-        #self.wfile.write("Internal hits so far: %d<br>" % LinkStats.allhits)
-        #self.wfile.write("Total links so far: %d<br>" % LinkStats.alltotal)
-        #total_percent = ((1.0 * LinkStats.allhits / LinkStats.alltotal) * 100)
-        #self.wfile.write("Percentage: %.2f<br>" % total_percent)        
-        
-        # Link resolution.
-        article_text = self.resolve_links(article_text)
-
-        # Embed article text and call parser.
-        jstext = ''
-        for l in article_text.split('\n'):
-            jstext += re.escape(l) + '\\n\\\n'
-
-        self.wfile.write("<script type='text/javascript'>");
-        self.wfile.write("var wikitext = \"%s\";" % jstext.encode('utf8'));
-        self.wfile.write("document.write(convert_wiki_to_html(unescape(wikitext)));");
-        self.wfile.write("</script>")
-
-    def send_wiki_html_mwlib(self, title, article_text):
+    def send_wiki_html(self, title, article_text):
         tokens = scanner.tokenize(article_text, title)
 
         wiki_parsed = parser.Parser(tokens, title).parse()
@@ -522,13 +488,7 @@ class WikiRequestHandler(SimpleHTTPRequestHandler):
             
             self.wfile.write("<body>")
             
-            parser_index = int(self.params.get('parser', default_parser))
-            parser = parsers[parser_index]
-            
-            if parser == 'mwlib':
-                self.send_wiki_html_mwlib(title, article_text)
-            else:
-                self.send_wiki_html_js(article_text, parser)
+            self.send_wiki_html(title, article_text)
 
             self.wfile.write('<center>Contenido disponible bajo los términos de la <a href="/static/es-gfdl.html">Licencia de documentación libre de GNU</a>. <br/> Wikipedia es una marca registrada de la organización sin ánimo de lucro Wikimedia Foundation, Inc.<br/><a href="/static/acerca.html">Acerca de Wikipedia</a> </center>')
             self.wfile.write("</body></html>")
diff --git a/tools/get_images.py b/tools/get_images.py
index 91da39e..91da39e 100644..100755
--- a/tools/get_images.py
+++ b/tools/get_images.py
diff --git a/woip/AUTHORS b/woip/AUTHORS
index 9a58d5a..d5d7b5d 100644
--- a/woip/AUTHORS
+++ b/woip/AUTHORS
@@ -1,9 +1,3 @@
 Patrick Collison <patrick@collison.ie>
 
 Some code from bzip2 and the FreeBSD implementation of locate has been used; more details are provided in README
-
-OLPC adaptation by:
-* Chris Ball <cjb@laptop.org>
-* Wade Brainerd <wadetb@gmail.com>
-* Benjamin M. Schwartz <bmschwar@fas.harvard.edu>
-* Madeleine Price Ball <mad@printf.net>