restructure wiki (again)

1 files changed, 18 insertions, 14 deletions

diff --git a/Index.page b/Index.page
index dea84aa..da0d677 100644
--- a/Index.page
+++ b/Index.page
@@ -14,29 +14,33 @@ the archives [here](http://mailman.rooter.is/mailman/listinfo/talk).
 
 # Proposed System Design
 
-* **[Overview and Features](/design/overview)**
+* **[Overview](/design/overview)**
 * **[Hardware Specifications](/design/hardware)**
 
 # Development Notes
 
-* **[Benchmarks](/benchmarks)** of existing hardware
-* **[User Experience](/user_experience)**
-* **[Operating System](/distribution)**
-* **[Software Services](/services) and [Applications](/applications)**
-* **[Packet Routing](/routing)**
-* **[Quality Assurance](/qa)**: testing and metrics
-* **[Configuration Management](/configuration)**
+* **[User Experience](/dev/user_experience)**
+* **[Quality Assurance](/dev/qa)**: testing and metrics
 * **[Ideas](/ideas)**
 * **[Questions](/questions)** to be resolved
 
-# Links and Other Stuff
+# Background Research
 
+* **[Configuration Management](/dev/configuration)**
+* **[Operating System](/research/distribution)**
+* **[research/benchmarks]()** of existing hardware
+* [research/applications]()
+* [research/services]()
+* [research/devices](): background research of other devices on the market
+  (both commercial and community-based)
+* [research/cpu](): background research of CPU options
+* [research/altnet](): alternative networking (mesh etc)
+
+# Other Stuff
+
+* [funding]()
 * [events](): gatherings of interest in real life
-* [altnet](): alternative networking ([mesh](), etc)
-* [refs](): community resources, other links
-* [hardware/devices](): background research of other devices on the market
-  (commercial and community-based)
-* [hardware/cpu](): background research of CPU options
+* [community](): community resources, complementary projects, other links
 * [unsorted](): links and other projects, not yet organized
 * [All Pages](/_index)