diff --git a/_config.yml b/_config.yml
index 73d91d9..8ca3ce6 100644
--- a/_config.yml
+++ b/_config.yml
@@ -10,6 +10,20 @@ avatar_url: /static/img/avatar.jpg
enableTags: true
tagarray: []
+collections:
+ getting_started:
+ type: section
+ output: true
+ contribute:
+ type: section
+ output: false
+ mailing_list:
+ type: section
+ output: false
+ sources:
+ type: sources
+ output: true
+
social:
- icon: fa-twitter
link: "https://twitter.com/_cryptoanarchy"
diff --git a/_contribute/contribute.md b/_contribute/contribute.md
new file mode 100644
index 0000000..c09362e
--- /dev/null
+++ b/_contribute/contribute.md
@@ -0,0 +1,5 @@
+---
+title: cryptoanarchywiki.github.io
+external_link: true
+external_url: https://github.com/cryptoanarchywiki/cryptoanarchywiki.github.io/
+---
diff --git a/sections/getting-started/what-is-a-cypherpunk.md b/_getting_started/what-is-a-cypherpunk.md
similarity index 99%
rename from sections/getting-started/what-is-a-cypherpunk.md
rename to _getting_started/what-is-a-cypherpunk.md
index 2188f34..8290137 100644
--- a/sections/getting-started/what-is-a-cypherpunk.md
+++ b/_getting_started/what-is-a-cypherpunk.md
@@ -2,7 +2,7 @@
layout: static-informational
permalink: /getting-started/what-is-a-cypherpunk
title: What is a Cypherpunk?
-categories: [getting-started]
+order: 2
---
Wikipedia defines "[Cypherpunk](https://en.wikipedia.org/wiki/Cypherpunk)" as follows (2018-05-26):
diff --git a/sections/getting-started/what-is-bitcoin.md b/_getting_started/what-is-bitcoin.md
similarity index 99%
rename from sections/getting-started/what-is-bitcoin.md
rename to _getting_started/what-is-bitcoin.md
index fd3d242..774829a 100644
--- a/sections/getting-started/what-is-bitcoin.md
+++ b/_getting_started/what-is-bitcoin.md
@@ -2,7 +2,7 @@
layout: static-informational
permalink: /getting-started/what-is-bitcoin
title: What is Bitcoin (And How is it Related)?
-categories: [getting-started]
+order: 4
---
Wikipedia defines "[Bitcoin](https://en.wikipedia.org/wiki/Bitcoin)" as follows (2018-05-26):
diff --git a/sections/getting-started/what-is-crypto-anarchy.md b/_getting_started/what-is-crypto-anarchy.md
similarity index 98%
rename from sections/getting-started/what-is-crypto-anarchy.md
rename to _getting_started/what-is-crypto-anarchy.md
index fee78a2..a123921 100644
--- a/sections/getting-started/what-is-crypto-anarchy.md
+++ b/_getting_started/what-is-crypto-anarchy.md
@@ -2,7 +2,7 @@
layout: static-informational
permalink: /getting-started/what-is-crypto-anarchy
title: What is Crypto Anarchy?
-categories: [getting-started]
+order: 1
---
Wikipedia defines "[Crypto-Anarchism](https://en.wikipedia.org/wiki/Crypto-anarchism)" as follows (2018-05-26):
diff --git a/sections/getting-started/what-is-the-cypherpunks-mailing-list.md b/_getting_started/what-is-the-cypherpunks-mailing-list.md
similarity index 99%
rename from sections/getting-started/what-is-the-cypherpunks-mailing-list.md
rename to _getting_started/what-is-the-cypherpunks-mailing-list.md
index beaea4b..bd4e364 100644
--- a/sections/getting-started/what-is-the-cypherpunks-mailing-list.md
+++ b/_getting_started/what-is-the-cypherpunks-mailing-list.md
@@ -2,7 +2,7 @@
layout: static-informational
permalink: /getting-started/what-is-the-cypherpunks-mailing-list
title: What is the Cypherpunks Mailing List?
-categories: [getting-started]
+order: 3
---
From the Wikipedia "[Cypherpunk](https://en.wikipedia.org/wiki/Cypherpunk)" artice (2018-05-26):
diff --git a/_includes/.gitkeep b/_includes/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/_includes/index_section.html b/_includes/index_section.html
new file mode 100644
index 0000000..c21bf38
--- /dev/null
+++ b/_includes/index_section.html
@@ -0,0 +1,17 @@
+
+
{{ include.title }}
+{% if include.description %}
+ {{ include.description }}
+{% endif %}
+
+ {% assign items = site[include.collection_name] | sort: 'order' %}
+ {% for item in items %}
+ {% if item.external_link == true %}
+ - {{ item.title }}
+ {% elsif item.no_content == true %}
+ - {{ item.title }}
+ {% else %}
+ - {{ item.title }}
+ {% endif %}
+ {% endfor %}
+
diff --git a/_mailing_list/cyphernomicon.md b/_mailing_list/cyphernomicon.md
new file mode 100644
index 0000000..1d5d49b
--- /dev/null
+++ b/_mailing_list/cyphernomicon.md
@@ -0,0 +1,6 @@
+---
+title: The Cyphernomicon (Cypherpunks Mailing List FAQ)
+external_link: true
+external_url: https://www.cypherpunks.to/faq/cyphernomicron/cyphernomicon.html
+order: 2
+---
diff --git a/_mailing_list/mailing_list_archive.md b/_mailing_list/mailing_list_archive.md
new file mode 100644
index 0000000..5e23e9a
--- /dev/null
+++ b/_mailing_list/mailing_list_archive.md
@@ -0,0 +1,5 @@
+---
+title: Mailing List Archive
+no_content: true
+order: 1
+---
diff --git a/_sources/books.md b/_sources/books.md
new file mode 100644
index 0000000..5506e8b
--- /dev/null
+++ b/_sources/books.md
@@ -0,0 +1,13 @@
+---
+layout: static-informational
+permalink: /sources/books
+title: Books
+order: 5
+---
+
+* 1948 - [Codes and Secret Writing](https://www.goodreads.com/book/show/1113675.Codes_and_Secret_Writing) by Herbert S. Zim - _Children's book on codes and ciphers which inspired Phil Zimmermann to pursue cryptography as an interest_
+* 1967 (and 1996) - [The Codebreakers – The Story of Secret Writing](https://en.wikipedia.org/wiki/The_Codebreakers) by David Kahn - _this book is a complete chronicle of codebreaking and code making since Ancient Egypt and assisted Whitfield Diffie in his quest to break the government's monopoly on cryptographic information. (A PDF of the abridged first edition is available via google search, but as it's not the full version, and doesn't include infromation about Alan Turing's work on Enigma, I'm not including it)_
+* Jul 1968 - [The Broken Seal](https://www.goodreads.com/book/show/2225948.The_Broken_Seal) by Ladislas Farago - _This details pre-Pearl Harbor cryptanalytic work against Japanese naval codes_
+* 19-Sep-1982 - [The Puzzle Palace: A Report on America's Most Secret Agency](https://en.wikipedia.org/wiki/The_Puzzle_Palace) by James Bramford - _An exposé on the workings of the US National Security Agency, which had traditionally sought to monopolise cryptographic information and talent within its own walls_ - _[scribd link](https://www.scribd.com/doc/57791980/The-Puzzle-Palace)_
+* 16-Apr-2001 - [Crypto Anarchy, Cyberstates, and Pirate Utopias](https://mitpress.mit.edu/books/crypto-anarchy-cyberstates-and-pirate-utopias) - _A colletion of essays from the same era as the cypherpunk mailing list; some of them from the list itself. A favourite book of [Cody Wilson](people/cody_wilson.md)_ - _[pdf link](https://monoskop.org/images/4/42/Ludlow_Peter_Crypto_Anarchy_Cyberstates_and_Pirate_Utopias.pdf)_
+* 31-Dec-2001 - [Crypto: How the Code Rebels Beat the Government Saving Privacy in the Digital Age](https://en.wikipedia.org/wiki/Crypto:_How_the_Code_Rebels_Beat_the_Government%E2%80%94Saving_Privacy_in_the_Digital_Age) by Steven Levy - _I personally recommend this book as it provides a lot of contextual information about the world the cypherpunks of the 90s lived in_
diff --git a/_sources/full-cryptography-primer-courses.md b/_sources/full-cryptography-primer-courses.md
new file mode 100644
index 0000000..cbe3fac
--- /dev/null
+++ b/_sources/full-cryptography-primer-courses.md
@@ -0,0 +1,17 @@
+---
+layout: static-informational
+permalink: /sources/full-cryptography-primer-courses
+title: Full Cryptography Primer Courses
+order: 1
+---
+
+* [Discrete Mathematics: Elementary and Beyond](http://home.anadolu.edu.tr/~eakyar/dersler/ayrik/kitap/kitap.pdf) by L. Lovász, J. Pelikán, K. Vesztergombi - _Good primer on a lot of the pure mathematics involved in cryptography_
+* [Introduction to Cryptography with Christof Paar (Full University Lecture Series)](https://www.youtube.com/channel/UC1usFRN4LCMcfIV7UjHNuQg/videos) - _This lecture series is one of the best collections of introductory material relating to modern cryptography. I wholeheartedly recommend this along with its companion textbook "Understanding Cryptography" by Christoff Paar and Jan Pelzl._
+ * [crypto-textbook.com](http://www.crypto-textbook.com/) - _Website for the textbook "Understanding Cryptography"_.
+ * [Odd-Numbered Questions Solution Manual](http://wiki.crypto.rub.de/Buch/en/download/Understanding_Cryptography_Odd_Solutions.pdf) - The solution manual for the exercises in the textbook. However, it only contains the solution to the odd-numbered questions.
+ * [All Problems and Solutions](https://tom.busby.ninja/understanding-cryptography-full-solution-set/) - A set of solutions (not yet complete - 2018-05-27) to the problems set in the textbook, maintained by me, including even-numbered questions. Includes links to the PDFs detailing the exercises.
+* [The Handbook of Applied Cryptography](http://cacr.uwaterloo.ca/hac/) by Alfred J. Menezes, Paul C. van Oorschot and Scott A. Vanstone
+* [Applied Cryptography (Second Edition)](https://ia600202.us.archive.org/10/items/AppliedCryptographyBruceSchneier/Applied%20Cryptography%20%28Bruce%20Schneier%29.pdf) by Bruce Schneier - _I personally found this book fairly impenetrable, maybe try The Handbook of Applied Cryptography unless you have a strong mathematics background_
+* [An Introduction to Mathematical Cryptography](http://citeseerx.ist.psu.edu/viewdoc/download?doi=10.1.1.182.9999&rep=rep1&type=pdf) by Jeffrey Hoffstein, Jill Pipher, Joseph H. Silverman
+* [Elementary Cryptanalysis: A Study of Ciphers and Their Solution](http://informatika.stei.itb.ac.id/~rinaldi.munir/Kriptografi/2010-2011/cryptanalysis.pdf) by Helen Fouché Gaines - _Recommended by David Kahn in "The Codebreakers" as the best introductory book on the subject of breaking historical ciphers_
+* [American Cryptogram Association Magazine](http://www.cryptogram.org/) - _Mentioned in the books "The Codebreakers" and "Crypto". Members can join from the US or overseas to receive a bi-monthy magazine of cryptograms and their solutions. Those interested in classical cryptanalysis will likely want to join this organisation to sharpen their skills_
diff --git a/_sources/historical_sources_and_media_articles.md b/_sources/historical_sources_and_media_articles.md
new file mode 100644
index 0000000..93f1996
--- /dev/null
+++ b/_sources/historical_sources_and_media_articles.md
@@ -0,0 +1,36 @@
+---
+layout: static-informational
+permalink: /sources/historical-sources-and-media-articles
+title: Historical Sources & Media Articles
+order: 4
+---
+
+* 01-Feb-1993 Wired Magazine - [Crypto Rebels](https://www.wired.com/1993/02/crypto-rebels/) by Steven Levy
+* 01-Jun-1994 Wired Magazine - [Anonymously Yours – How to Launder Your E-mail](https://www.wired.com/1994/06/anonymous-2/) by Steven Levy
+* 12-Jun-1994 The New York Times - [Battle of the Clipper Chip](http://www.nytimes.com/1994/06/12/magazine/battle-of-the-clipper-chip.html?pagewanted=all) by Stephen Levy
+* 01-Nov-1994 Wired Magazine - [Prophet of Privacy](https://www.wired.com/1994/11/diffie/)
+* 01-Dec-1994 Wired Magazine - [E-Money (That's What I Want)](https://www.wired.com/1994/12/emoney/)
+* 01-Oct-1996 Wired Magazine - [The Future of Money](https://www.wired.com/1996/10/wriston/) by Thomas A. Bass
+* 17-Feb-1997 Wired Magazine - [Homeless Cypherpunks Turn to Usenet](https://www.wired.com/1997/02/homeless-cypherpunks-turn-to-usenet/)
+* 01-Apr-1999 Wired Magazine - [The Open Secret](https://www.wired.com/1999/04/crypto/) by Steven Levy
+* 17-May-1999 Wired Magazine - [The First True Cypherpunk Novel](https://www.wired.com/1999/05/the-first-true-cypherpunk-novel/) by Declan McCullagh
+* 14-Apr-2000 Wired Magazine - [Crypto-Convict Won't Recant](https://www.wired.com/2000/04/crypto-convict-wont-recant/)
+* 19-Mar-2013 BitcoinTalk.org - [Bitcoin and me](https://bitcointalk.org/index.php?topic=155054.0) by [Hal Finney](people/hal_finney.md)
+* Jun 2013-Present TheGuardian.com - [The NSA Files](https://www.theguardian.com/us-news/the-nsa-files)
+* Jun 2013-Present Archive.org - [Global Surveillance Disclosures - Documents released by and relating to global surveillance.](https://archive.org/details/nsia-snowden-documents)
+* 18-Nov-2013 Forbes Magazine - [Meet The 'Assassination Market' Creator Who's Crowdfunding Murder With Bitcoins](https://www.forbes.com/sites/andygreenberg/2013/11/18/meet-the-assassination-market-creator-whos-crowdfunding-murder-with-bitcoins/#7a17e37b3d9b) by Andy Greenberg
+* 11-Jul-2014 Wired Magazine - [Waiting for Dark: Inside Two Anarchists' Quest for Untraceable Money](https://www.wired.com/2017/05/one-scrappy-startup-survived-early-bitcoin-wars/) by Andy Greenberg
+* 28-Dec-2014 Oleg Andreev's Blog - [Real crypto-anarchy](http://blog.oleganza.com/post/71410377996/real-crypto-anarchy)
+* 30-Mar-2015 Wired Magazine - [DEA Agent Charged With Acting as a Paid Mole for Silk Road](https://www.wired.com/2015/03/dea-agent-charged-acting-paid-mole-silk-road/) by Andy Greenberg
+* April 2015 Wired Magazine - [The Untold Story of Silk Road, Part 1 - The Rise of Silk Road](https://www.wired.com/2015/04/silk-road-1/) by Joshuah Bearman
+* May 2015 Wired Magazine - [The Untold Story of Silk Road, Part 2 - The Fall](https://www.wired.com/2015/04/silk-road-1/) by Joshuah Bearman
+* 03-Aug-2015 The Intercept - [GCHQ and Me](https://theintercept.com/2015/08/03/life-unmasking-british-eavesdroppers/) by Duncan Campbell
+* 25-Sep-2015 The Intercept - [From Radio to Porn, British Spies Track Web Users’ Online Identities](https://theintercept.com/2015/09/25/gchq-radio-porn-spies-track-web-users-online-identities/) by Ryan Gallagher
+* Mar 2016 American Scientist - [Cypherpunks Write Code](https://www.americanscientist.org/article/cypherpunks-write-code) by Jamie Bartlett
+* 10-Mar-2016 Atavist Magazine - [The Mastermind - 7 Part Article Series](https://magazine.atavist.com/the-mastermind) by Evan Ratliff - _article series about [Paul Calder Le Roux](people/paul_calder_le_roux.md)_
+* 18-Jun-2016 Wired Magazine - [A $50 Million Hack Just Showed That the DAO Was All Too Human](https://www.wired.com/2016/06/50-million-hack-just-showed-dao-human/) by Klint Finley
+* 31-Jul-2016 Wired Magazine - [Meet Moxie Marlinspike, the Anarchist Bringing Encryption to All of Us](https://www.wired.com/2016/07/meet-moxie-marlinspike-anarchist-bringing-encryption-us/) by Andy Greenberg
+* 29-Mar-2017 Wired Magazine - [How an Anarchist Bitcoin Coder Found Himself Fighting in Syria](https://www.wired.com/2017/03/anarchist-bitcoin-coder-found-fighting-isis-syria/) by Andy Greenberg
+* 31-May-2017 Wired Magazine - [Silk Road Creator Ross Ulbricht Loses His Life Sentence Appeal](https://www.wired.com/2017/05/silk-road-creator-ross-ulbricht-loses-life-sentence-appeal/) by Andy Greenberg
+* 04-June-2017 The Guardian - [Forget far-right populism – crypto-anarchists are the new masters](https://www.theguardian.com/technology/2017/jun/04/forget-far-right-populism-crypto-anarchists-are-the-new-masters-internet-politics) by Jamie Bartlett
+* 24-Aug-2017 Bitcoin Blockchain - [The First SegWit transaction on Bitcoin](http://srv1.yogh.io/#tx:id:8F907925D2EBE48765103E6845C06F1F2BB77C6ADC1CC002865865EB5CFD5C1C)
diff --git a/_sources/philosophical_and_ideological_sources.md b/_sources/philosophical_and_ideological_sources.md
new file mode 100644
index 0000000..68bb403
--- /dev/null
+++ b/_sources/philosophical_and_ideological_sources.md
@@ -0,0 +1,28 @@
+---
+layout: static-informational
+permalink: /sources/philosophical-and-ideological-sources
+title: Philosophical/Ideological Sources
+order: 2
+---
+
+* 1973 DavidDFriedman.com (Full Book) - [The Machinery of Freedom](http://www.daviddfriedman.com/The_Machinery_of_Freedom_.pdf) by [David D. Friedman](people/david_d_friedman.md)
+* 1978 Mises.org - [Denationalisation of Money: The Argument Refined](https://mises.org/document/3970/Denationalisation-of-Money-The-Argument-Refined) by Friedrich A. Hayek
+* Nov 1979 NakamotoInstitute.org - [From Crossbows To Cryptography: Techno-Thwarting The State](http://nakamotoinstitute.org/static/docs/from-crossbows-to-cryptography.pdf) by Chuck Hammill
+* 1990s Various BBSs - [Electronic Magazines](http://www.textfiles.com/magazines/) - _not strictly Cypherpunk, but a window into the Anarchic Late-80s/Early-90s internet culture_
+* 1991 PhilZimmermann.com - [Why I Wrote PGP](https://www.philZimmermann.com/EN/essays/WhyIWrotePGP.html) by [Phil Zimmermann](people/phil_zimmermann.md)
+* 01-Sep-1992 Cypherpunk Mailing List - [Libertaria in Cyberspace](https://www.activism.net/cypherpunk/libertaria.html) by [Timothy C. May](people/timothy_c_may.md)
+* 22-Nov-1992 Cypherpunk Mailing List - [The Crypto-Anarchist Manifesto](https://www.activism.net/cypherpunk/crypto-anarchy.html) by [Timothy C. May](people/timothy_c_may.md)
+* 09-Mar-1993 Cypherpunk Mailing List - [A Cypherpunk's Manifesto](https://www.activism.net/cypherpunk/manifesto.html) by [Eric Hughes](people/eric_hughes.md) - _the phrase "Cypherpunks write code" comes from this document_
+* 11-Sep-1994 Cypherpunk Mailing List - [The Cyphernomicon (Mailing List FAQ)](https://www.cypherpunks.to/faq/cyphernomicron/cyphernomicon.html) by [Timothy C. May](people/timothy_c_may.md)
+* Dec 1994 Cypherpunk Mailing List - [Crypto Anarchy and Virtual Communities](http://nakamotoinstitute.org/virtual-communities/) by [Timothy C. May](people/timothy_c_may.md)
+* 08-Feb-1996 - [A Declaration of the Independence of Cyberspace](https://www.eff.org/cyberspace-independence) by [John Perry Barlow](people/john_perry_barlow.md)
+* Feb 1997 gnu.org - [The Right to Read](https://www.gnu.org/philosophy/right-to-read.html) by Richard Stallman
+* 04-Apr-1997 - [Assassination Politics](http://cryptome.org/ap.htm) by [Jim Bell](people/jim_bell.md)
+* 04-May-2000 DavidDFriedman.com - [Contracts in Cyberspace](http://www.daviddfriedman.com/Academic/contracts_in_%20cyberspace/contracts_in_cyberspace.htm)
+* 02-Aug-2002 NakamotoInstitute.org - [The Cathedral and the Bazaar](http://nakamotoinstitute.org/the-cathedral-and-the-bazaar/) by Eric S. Raymond - _[link to original](http://www.catb.org/~esr/writings/cathedral-bazaar/cathedral-bazaar/)_
+* 2003 NakamotoInstitute.org - [The Art of Unix Programming](http://nakamotoinstitute.org/static/docs/taoup.pdf) by Eric S. Raymond - _[link to original](http://www.catb.org/esr/writings/taoup/html/)_
+* 2005 DavidDFriedman.com - [From Imperial China to Cyberspace: Contracting Without the State](http://www.daviddfriedman.com/Academic/Course_Pages/analytical_methods_08/china_to_cyberspace.htm)
+* 03-Dec-2006 NakamotoInstitute.org - [State and Terrorist Conspiracies & Conspiracy as Governance ](http://nakamotoinstitute.org/static/docs/julian-assange-conspiracies.pdf) by [Julian Assange](people/julian_assange.md)
+* 2008 Mises.org - [Deflation and Liberty](https://mises.org/document/3726/Deflation-and-Liberty) by Jörg Guido Hülsmann
+* mid-2010s paralelnipolis.cz - [Paralelni Polis - statement](https://www.paralelnipolis.cz/o-nas/en/)
+* Dec 2015 (Academic Paper) - [The Moral Character of Cryptographic Work](http://web.cs.ucdavis.edu/~rogaway/papers/moral-fn.pdf) by Phillip Rogaway
diff --git a/_sources/technical_sources.md b/_sources/technical_sources.md
new file mode 100644
index 0000000..be7c83a
--- /dev/null
+++ b/_sources/technical_sources.md
@@ -0,0 +1,71 @@
+---
+layout: static-informational
+permalink: /sources/technical-sources
+title: Technical Sources
+order: 3
+---
+
+* [List of Important Publications in Cryptography on Wikipedia](https://en.wikipedia.org/wiki/List_of_important_publications_in_cryptography)
+* Jul 1948 The Bell System Technical Journal - [A Mathematical Theory of Communication](http://math.harvard.edu/~ctm/home/text/others/shannon/entropy/entropy.pdf) By Claude Shannon
+* Oct 1949 The Bell System Technical Journal - [Communication Theory of Secrecy Systems](http://www.mast.queensu.ca/~math474/shannon-secrecy49.pdf) by Claude Shannon
+* 1957 Internet Archive - [An Introduction to Probability Theory and Its Applications, Vol. I](https://ia600304.us.archive.org/2/items/AnIntroductionToProbabilityTheoryAndItsApplicationsVolume1/Feller-AnIntroductionToProbabilityTheoryAndItsApplicationsVolume1.pdf).pdf) by William Feller
+* Nov 1976 IEEE Transactions on Information Theory, VOL. IT-22, NO. 6 - [New Directions in Cryptography](https://www-ee.stanford.edu/~hellman/publications/24.pdf) by Whitfield Diffie and Martin Hellman - _this paper describes Diffie-Hellman key exchange_
+* Feb 1978 people.csail.mit.edu/rivest/ - [A Method for Obtaining Digital Signatures and Public-key Cryptosystems](http://people.csail.mit.edu/rivest/Rsapaper.pdf) by Ronald L. Rivest, Adi Shamir, and Leonard M. Adleman
+* Apr 1978 merkle.com - [Protocols for Public Key Cryptosystems](http://www.merkle.com/papers/Protocols.pdf) by [Ralph C. Merkle](people/ralph_c_merkle.md)
+* Apr 1978 merkle.com - [Secure Communications over Insecure Channels](http://www.merkle.com/1974/Puzzles1975.12.07.pdf) by [Ralph C. Merkle](people/ralph_c_merkle.md)
+* 1981 Research Paper - [Untraceable Electronic Mail, Return Addresses, and Digital Pseudonyms](http://nakamotoinstitute.org/static/docs/untraceable-electronic-mail.pdf) by [David Chaum](people/david_chaum.md)
+* 1982 Research Paper - [Blind Signatures for Untraceable Payments](http://sceweb.sce.uhcl.edu/yang/teaching/csci5234WebSecurityFall2011/Chaum-blind-signatures.PDF) by [David Chaum](people/david_chaum.md)
+* Jul 1982 lamport.azurewebsites.net/pubs - [The Byzantine Generals Problem](http://lamport.azurewebsites.net/pubs/byz.pdf) by Leslie Lamport, Robert Shostak, and Marshall Pease
+* Aug 1984 Communication of the ACM, Vol. 27, No. 8 - [Reflections on Trusting Trust](http://www.win.tue.nl/~aeb/linux/hh/thompson/trust.html) by Ken Thompson (co-creator of Unix)
+* 1988 Research Paper - [The Dining Cryptographers Problem: Unconditional Sender and Recipient Untraceability](https://www.cise.ufl.edu/~nemo/anonymity/papers/chaum-dc.pdf) by [David Chaum](people/david_chaum.md)
+* 1998-2000 iang.org - [Financial Cryptography in 7 Layers](http://iang.org/papers/fc7.html) by [Ian Grigg](people/ian_grigg.md)
+* 1989 Research Paper - [Online Cash Checks](http://nakamotoinstitute.org/online-cash-checks/) by [David Chaum](people/david_chaum.md)
+* Dec 1990 NakamotoInstitute.org - [Implementing Fault-Tolerant Services Using the State Machine Approach: A Tutorial](http://nakamotoinstitute.org/static/docs/implementing-fault-tolerant-services.pdf) by Fred B. Schneider
+* 1991 anf.es - [How to Time-Stamp a Digital Document](https://www.anf.es/pdf/Haber_Stornetta.pdf) by Stuart Haber and W. Scott Stornetta
+* Jul 1991 people.csail.mit.edu/silvio/ - [Proofs that Yield Nothing But Their Validity or All Languages in NP Have Zero-Knowledge Proof Systems](http://people.csail.mit.edu/silvio/Selected%20Scientific%20Papers/Zero%20Knowledge/Proofs_That_Yield_Nothing_But_Their_Validity_or_All_Languages_in_NP_Have_Zero-Knowledge_Proof_Systems.pdf) by Oded Goldreich, Silvio Micali, and Avi Wigderson
+* 1992 Scientific American - [Achieving Electronic Privacy](http://www.chaum.com/publications/ScientificAmerican-AEP.pdf) by [David Chaum](people/david_chaum.md)
+* Mar 1999 math.columbia.edu - [Improving the Efficiency and Reliability of Digital Time-Stamping](http://www.math.columbia.edu/~bayer/papers/Timestamp_BHS93.pdf) by Stuart Haber, W. Scott Stornetta, and Dave Bayer
+* 22-Nov-1992 Cypherpunk Mailing List - [Crypto Glossary](http://nakamotoinstitute.org/static/docs/crypto-glossary.txt) by [Eric Hughes](people/eric_hughes.md) and [Timothy C. May](people/timothy_c_may.md)
+* 1993 szabo.best.vwh.net (Web Archive) - [Multinational Small Business](http://web.archive.org/web/20160620183937/http://szabo.best.vwh.net/multi_small.html) by [Nick Szabo](people/nick_szabo.md)
+* 19-Aug-1993 Cypherpunk Mailing List (I think) - [Digital Cash & Privacy](http://fennetic.net/irc/finney.org/~hal/dig_cash_priv.html) by [Hal Finney](people/hal_finney.md)
+* 15-Oct-1993 (Rev. 13-Mar-1996) www.finney.org/~hal/ (Web Archive) - [Detecting Double Spending](http://nakamotoinstitute.org/literature/detecting-double-spending/) by [Hal Finney](people/hal_finney.md)
+* 30-Mar-1994 Cypherpunk Mailing List (I think) - [PGP Web of Trust Misconceptions](http://fennetic.net/irc/finney.org/~hal/web_of_trust.html) by [Hal Finney](people/hal_finney.md)
+* 1996 szabo.best.vwh.net (Web Archive) - [Negative Reputation](http://web.archive.org/web/20160704085927/http://szabo.best.vwh.net/negative_rep.html) by [Nick Szabo](people/nick_szabo.md)
+* 1997 szabo.best.vwh.net (Web Archive) - [Formalizing and Securing Relationships on Public Networks](http://web.archive.org/web/20160920045707/http://szabo.best.vwh.net/formalize.html) by [Nick Szabo](people/nick_szabo.md)
+* Apr 1997 NakamotoInstitute.org - [Secure Names for Bit-Strings](http://nakamotoinstitute.org/static/docs/secure-names-bit-strings.pdf) by Stuart Haber and W. Scott Stornetta
+* 1998/1999 szabo.best.vwh.net (Web Archive) - [Secure Property Titles with Owner Authority](https://web.archive.org/web/20020202165211/http://szabo.best.vwh.net/securetitle.html) by [Nick Szabo](people/nick_szabo.md)
+* Apr 1998-Dec 1999 NakamotoInstitute.org - [The Geodesic Market](http://nakamotoinstitute.org/the-geodesic-market/) by Robert Hettinga - _[pdf link](http://www.ibuc.com/pdfs/Geoecon.pdf)_
+* May 1999 szabo.best.vwh.net (Web Archive) - [Micropayments and Mental Transaction Costs](http://web.archive.org/web/20160620183941/http://szabo.best.vwh.net/berlinmentalmicro.pdf) by [Nick Szabo](people/nick_szabo.md)
+* 1999 szabo.best.vwh.net (Web Archive) - [Intrapolynomial Cryptography](https://web.archive.org/web/20011217091748/http://szabo.best.vwh.net/intrapoly.html) by [Nick Szabo](people/nick_szabo.md)
+* 1999 szabo.best.vwh.net (Web Archive) - [Contracts with Bearer](http://web.archive.org/web/20160620184022/http://szabo.best.vwh.net/bearer_contracts.html) by [Nick Szabo](people/nick_szabo.md)
+* 1999 www.theiia.org (Web Archive) - [The God Protocols](http://web.archive.org/web/20061230075325/http://www.theiia.org/ITAudit/index.cfm?act=itaudit.archive&fid=216) by [Nick Szabo](people/nick_szabo.md)
+* May 1999 Proceedings of IEEE - [Design of a Secure Timestamping Service with Minimal Trust Requirements](http://nakamotoinstitute.org/static/docs/secure-timestamping-service.pdf) by Henri Massias, Xavier Serret-Avila, and Jean-Jacques Quisquater
+* 2000 erights.org - [Capability-based Financial Instruments](http://www.erights.org/elib/capability/ode/ode.pdf) by Mark S. Miller, Chip Morningstar, and Bill Frantz - _[HTML version](http://www.erights.org/elib/capability/ode/index.html)_
+* 2002 szabo.best.vwh.net (Web Archive) - [Trusted Third Parties are Security Holes](http://web.archive.org/web/20160705000502/http://szabo.best.vwh.net/ttps.html) by [Nick Szabo](people/nick_szabo.md)
+* 2002 szabo.best.vwh.net (Web Archive) - [A Formal Language for Analyzing Contracts](http://web.archive.org/web/20160810220820/http://szabo.best.vwh.net/contractlanguage.html) by [Nick Szabo](people/nick_szabo.md)
+* 2002 szabo.best.vwh.net (Web Archive) - [Shelling Out: The Origins of Money](http://web.archive.org/web/20160921140955/http://szabo.best.vwh.net/shell.html) by [Nick Szabo](people/nick_szabo.md)
+* 2002 szabo.best.vwh.net (Web Archive) - [The Playdough Protocols](http://nakamotoinstitute.org/literature/the-playdough-protocols/) by [Nick Szabo](people/nick_szabo.md)
+* 2002 szabo.best.vwh.net (Web Archive) - [Measuring Value](http://web.archive.org/web/20160919162114/http://szabo.best.vwh.net/measuringvalue.html) by [Nick Szabo](people/nick_szabo.md)
+* 2002 pages.upf.pf/Alban.Gabillon/ - [Improving Time Stamping Schemes: A Distributed Point of View](http://pages.upf.pf/Alban.Gabillon/articles/AnnalTelecom.pdf) by Alexis Bonnecaze, Pierre Liardet, Alban Gabillon, and Kaouther Blibech
+* 2002 microsoft.com/en-us/research/ - [The Sybil Attack](https://www.microsoft.com/en-us/research/wp-content/uploads/2002/01/IPTPS2002.pdf) by John R. Douceur
+* 01-Aug-2002 - [Hashcash - Denial of Service Counter-Measure](http://www.hashcash.org/papers/hashcash.pdf) by [Adam Back](people/adam_back.md)
+* 2003 szabo.best.vwh.net (Web Archive) - [Advances in Distributed Security](http://web.archive.org/web/20160715035054/http://szabo.best.vwh.net/distributed.html) by [Nick Szabo](people/nick_szabo.md)
+* 2004 szabo.best.vwh.net (Web Archive) - [Scarce Objects](http://web.archive.org/web/20160620184010/http://szabo.best.vwh.net/scarce.html) by [Nick Szabo](people/nick_szabo.md)
+* 06-Jul-2004 iang.org - [The Ricardian Contract](http://iang.org/papers/ricardian_contract.html) by [Ian Grigg](people/ian_grigg.md)
+* 18-May-2004 svn.torproject.org - [Tor: The Second-Generation Onion Router](https://svn.torproject.org/svn/projects/design-paper/tor-design.pdf) by Roger Dingledine, Nick Mathewson, Paul Syverson
+* 15-Aug-2004 Cypherpunk Mailing List - [RPOW - Reusable Proofs of Work](https://cryptome.org/rpow.htm) by [Hal Finney](people/hal_finney.md) - _[link to archive of RPOW website](http://nakamotoinstitute.org/finney/rpow/index.html)_, _[link to archive of RPOW codebase](https://github.com/NakamotoInstitute/RPOW)_
+* 2005 epointsystem.org/~nagydani/ - [On Digital Cash-Like Payment Systems](http://www.epointsystem.org/~nagydani/ICETE2005.pdf) by Daniel A. Nagy
+* Dec 2005 Unenumerated (Nick Szabo's Blog) - [Bit gold](http://unenumerated.blogspot.co.uk/2005/12/bit-gold.html)
+* 25-Dec-2005 iang.org - [Triple Entry Accounting](http://iang.org/papers/triple_entry.html) by [Ian Grigg](people/ian_grigg.md)
+* 2008 NakamotoInstitute.org - [Truledger in Plain English](http://nakamotoinstitute.org/truledger/) by Bill St. Clair - _[link to original](http://truledger.com/doc/plain-english.html)_
+* 30-Oct-2008 NakamotoInstitute.org - [Lucre: Anonymous Electronic Tokens v1.8](http://nakamotoinstitute.org/static/docs/lucre.pdf) by Ben Laurie
+* 31-Oct-2008 Cryptography Mailing List - [The Bitcoin Whitepaper](https://bitcoin.org/bitcoin.pdf) by [Satoshi Nakamoto](people/satoshi_nakamoto.md) - _[link to original announcement](http://www.mail-archive.com/cryptography@metzdowd.com/msg09959.html)_
+* 24-Jul-2014 IPFS.io - [IPFS - Content Addressed, Versioned, P2P File System (DRAFT 3)](https://ipfs.io/ipfs/QmR7GSQM93Cx5eAg6a6yRzNde1FQv7uL6X1o4k7zrJa3LX/ipfs.draft3.pdf) by [Juan Benet](people/juan_benet.md)
+* Dec 2014 O'Reilly Books - [Mastering Bitcoin (free to read on GitHub)](https://github.com/bitcoinbook/bitcoinbook) by [Andreas Antonopoulos](people/andreas_antonopoulos.md)
+* 05-Sep-2015 Garret Fogerlie - [How Tor Users Got Caught - Defcon 22](https://www.youtube.com/watch?v=7G1LjQSYM5Q)
+* 07-Dec-2015 bitcoin-dev Mailing List - [Capacity increases for the Bitcoin system - (Core's Roadmap)](https://lists.linuxfoundation.org/pipermail/bitcoin-dev/2015-December/011865.html)
+* 87-Apr-2016 Università di Trento - [Distributed Algorithms for Peer-to-Peer Systems](http://disi.unitn.it/~montreso/ds/handouts/10-p2p.pdf)
+* 28-Oct-2016 Bitcoincore.org - [Segregated Witness Costs and Risks](https://bitcoincore.org/en/2016/10/28/segwit-costs/)
+* 13-Apr-2017 The Merkle - [What is a BIP](https://themerkle.com/what-is-a-bip/)
+* 10-Jul-2017 HackerNoon.com - [Ethereum: Turing-Completeness and Rich Statefulness Explained](https://hackernoon.com/ethereum-turing-completeness-and-rich-statefulness-explained-e650db7fc1fb) by Kyle Wang
+* 14-Aug-2017 Filecoin.io - [Filecoin: A Decentralized Storage Network](https://filecoin.io/filecoin.pdf) by Protocol Labs
diff --git a/index.html b/index.html
new file mode 100644
index 0000000..18dccac
--- /dev/null
+++ b/index.html
@@ -0,0 +1,98 @@
+---
+layout: default
+---
+
+
+
+
+
+Recent Blog Posts
+
+
+ {% for post in site.posts limit:3 %}
+ - {{ post.title }} – {{ post.date | date_to_string }}
+ {% endfor %}
+
+
+{% include index_section.html title='Getting Started' collection_name='getting_started' %}
+
+{% include index_section.html
+ title='Contribute'
+ collection_name='contribute'
+ description='Maybe in the future, this site will have full wiki functionality.
+ For now, contributors can submit pull requests to the following repository:
'
+%}
+
+{% include index_section.html title='Cypherpunks Mailing List' collection_name='mailing_list' %}
+
+{% include index_section.html title='Sources' collection_name='sources' %}
+
+People & Organisations
+
+Note that the same person may occur on multiple lists.
+
+
+ - Pioneers of Modern Cryptography
+ - Early Cypherpunks
+ - Cryptocurrency Notables
+ - Later Cypherpunks and Crypto-Anarchists
+ - Notable Organsations
+ - Cypherpunk Successor Online Communities
+ - Cypherpunk/Cryptocurrency Publications
+ - Miscelaneous
+
+
+Events
+
+
+ - 1970s - The Discovery of Public Key Cryptography
+ - 1990s - Crypto Wars, Phil Zimmermann and PGP
+ - 2008/2009 - The Creation of Bitcoin and Early Community
+ - Jun 2011 - The Great Bitcoin Bubble of 2011
+ - Feb 2011-Oct 2013 - The Rise and Fall of the Silk Road
+ - Mar 2012 - The Bitcoinica Hack
+ - June 2013 - The Snowden Leaks
+ - Apr-Dec 2013 - The Second and Third Bitcoin Bubbles
+ - Feb 2014 - The Collapse of Mt Gox (The Final Goxxing)
+ - Feb 2015 - The Trial of Ross Ulbricht
+ - May 2016 - The Craig Wright Affair (and other attempts to identify Satoshi)
+ - June 2016 - The DAO Hack
+ - Early 2017 - The Altcoin/ICO Bubble and Fourth Bitcoin Bubble
+ - Jul/Aug 2017 - Bitcoin Scaling Battles (Big vs Small Blockers)
+
+
+Key Concepts
+
+
+ - Public/Private Key Cryptography
+ - Hash Functions
+ - Cryptographic Signatures
+ - End-to-End Encryption
+ - PGP
+ - Anonymous Remailers
+ - BitTorrent
+ - Onion Routing
+ - Blockchains
+ - Merkle Trees
+ - Bloom Filters
+ - Distributed Hash Tables
+ - P2P Routing Algorithms
+ - Mesh Networks
+
+
+Notable Projects
+
+
+ - Bitcoin
+ - BitTorrent
+ - Ethereum
+ - IPFS
+ - JoinMarket
+ - OpenBazaar
+ - Opendime
+ - PGP
+ - Tor
+
diff --git a/index.md b/index.md
deleted file mode 100644
index b09b633..0000000
--- a/index.md
+++ /dev/null
@@ -1,103 +0,0 @@
----
-layout: default
----
-
-
-
----
-
-## Recent Blog Posts
-
-{% for post in site.posts limit:3 %}
- + [{{ post.title }}]({{ post.url }}) -- _{{ post.date | date_to_string }}_
-{% endfor %}
-
-## Getting Started
-
-+ [What is Crypto Anarchy?](/getting-started/what-is-crypto-anarchy)
-+ [What is a Cypherpunk?](/getting-started/what-is-a-cypherpunk)
-+ [What is the Cypherpunks Mailing List?](/getting-started/what-is-the-cypherpunks-mailing-list)
-+ [What is Bitcoin (And How is it Related)?](/getting-started/what-is-bitcoin)
-
-## Contribute
-
-Maybe in the future, this site will have full wiki functionality.
-
-For now, contributors can submit pull requests to the following repository:
-
-+ [cryptoanarchywiki.github.io](https://github.com/cryptoanarchywiki/cryptoanarchywiki.github.io/)
-
-## Cypherpunks Mailing List
-
-+ Mailing List Archive
-+ [The Cyphernomicon (Cypherpunks Mailing List FAQ)](https://www.cypherpunks.to/faq/cyphernomicron/cyphernomicon.html)
-
-## Sources
-+ Full Cryptography Primer Courses
-+ Philosophical/Ideological Sources
-+ Technical Sources
-+ Historical Sources & Media Articles
-+ Books
-
-## People & Organisations
-
-+ Pioneers of Modern Cryptography
-+ Early Cypherpunks
-+ Cryptocurrency Notables
-+ Later Cypherpunks and Crypto-Anarchists
-+ Notable Organsations
-+ Cypherpunk Successor Online Communities
-+ Cypherpunk/Cryptocurrency Publications
-+ Miscelaneous
-
-## Events
-
-+ 1970s - The Discovery of Public Key Cryptography
-+ 1990s - Crypto Wars, Phil Zimmermann and PGP
-+ 2008/2009 - The Creation of Bitcoin and Early Community
-+ Jun 2011 - The Great Bitcoin Bubble of 2011
-+ Feb 2011-Oct 2013 - The Rise and Fall of the Silk Road
-+ Mar 2012 - The Bitcoinica Hack
-+ June 2013 - The Snowden Leaks
-+ Apr-Dec 2013 - The Second and Third Bitcoin Bubbles
-+ Feb 2014 - The Collapse of Mt Gox (The Final Goxxing)
-+ Feb 2015 - The Trial of Ross Ulbricht
-+ May 2016 - The Craig Wright Affair (and other attempts to identify Satoshi)
-+ June 2016 - The DAO Hack
-+ Early 2017 - The Altcoin/ICO Bubble and Fourth Bitcoin Bubble
-+ Jul/Aug 2017 - Bitcoin Scaling Battles (Big vs Small Blockers)
-
-## Key Concepts
-
-+ Public/Private Key Cryptography
-+ Hash Functions
-+ Cryptographic Signatures
-+ End-to-End Encryption
-+ PGP
-+ Anonymous Remailers
-+ BitTorrent
-+ Onion Routing
-+ Blockchains
-+ Merkle Trees
-+ Bloom Filters
-+ Distributed Hash Tables
-+ P2P Routing Algorithms
-+ Mesh Networks
-
-## Notable Projects
-
-+ Bitcoin
-+ BitTorrent
-+ Ethereum
-+ IPFS
-+ JoinMarket
-+ OpenBazaar
-+ Opendime
-+ PGP
-+ Tor