stellar-deprecated · irisli · Jun 22, 2016 · May 12, 2016 · May 18, 2016 · May 18, 2016
diff --git a/learn/get-started/test-net.md → learn/concepts/test-net.md b/learn/get-started/test-net.md → learn/concepts/test-net.md
@@ -2,7 +2,7 @@
 title: Testnet
 ---
 
-The testnet is a small test Stellar network, open to developers. 
+The testnet is a small test Stellar network, open to developers.
 
 Stellar.org runs 3 stellar-core validators on this test network. Set your stellar-core to connect to us by using this [configuration](https://github.com/stellar/stellar-core/blob/master/docs/stellar-core_testnet.cfg). You can also find a [Horizon instance](https://horizon-testnet.stellar.org/) that is connected to the testnet.
 

diff --git a/...des/building-blocks/account-management.md → learn/get-started/account-management.md b/...des/building-blocks/account-management.md → learn/get-started/account-management.md
diff --git a/learn/get-started/readme.md b/learn/get-started/readme.md
@@ -0,0 +1,8 @@
+---
+title: Stellar Overview
+---
+![Stellar Ecosystem](https://www.stellar.org/wp-content/uploads/2015/08/ecosystem-overview-2.png)
+
+The Stellar ecosystem is made up of several pieces of software. Depending on what you're doing with Stellar, you'll interact with or run different pieces of the ecosystem.
+
+[placeholder: this will be the lay of the land doc]
diff --git a/learn/get-started/transactions.md b/learn/get-started/transactions.md
@@ -0,0 +1,4 @@
+---
+title: Sending and Receiving Money
+---
+[placeholder]
diff --git a/other/things-to-build.md → learn/things-to-build.md b/other/things-to-build.md → learn/things-to-build.md
@@ -1,9 +1,12 @@
-Build cool things on Stellar! This list outlines a few ideas for applications. Feel free to add your own or take one here and run with it. 
+---
+title: Build Stellar Apps
+---
+Build cool things on Stellar! This list outlines a few ideas for applications. Feel free to add your own or take one here and run with it.
 As always, if you need help building anything with Stellar, just ask us ([Slack chat](http://slack.stellar.org/)),[IRC](https://kiwiirc.com/client/irc.freenode.net/#stellar-dev), or [email protected]) .
 
 If you're not looking for a full-blown project but still want to help out, look for `help wanted` issue labels in any of our [repos](https://github.com/stellar).
 
-# Slack Bot 
+# Slack Bot
 - Report a stream of all stellar transactions to a channel.
 - *Advanced*: Allow people to send money/points/+1's to other Slack team members `/send @bob $5`.
 
@@ -32,7 +35,7 @@ Allow anyone to send lumens from their Stellar client to any email address. They
 
 This would be a service hosted at `domain.com` that does the following:
 - Runs a federation server.
-- Will federate payment addresses with an email prefix like `[email protected]*domain.com`. 
+- Will federate payment addresses with an email prefix like `[email protected]*domain.com`.
 - If there is a federation request for an address you don't know that starts with a valid email address:
   - Generate a key pair
   - return the generated public key as the accountID
@@ -46,7 +49,7 @@ This would be a service hosted at `domain.com` that does the following:
 Let's say you have a public-facing service, perhaps for streaming or open wifi. You want to allow other people to use this service if they pay you small amounts. These payments could be used as spam prevention or to support your business. This is a job for the **toll collector**...
 
 ## Toll Collector
-A simple service that keeps track of any XLM sent to a `toll address`. The toll collector has a database of public keys and amounts of XLM it has sent to the toll address. It watches for payments to the toll address on the Stellar network and adds them to this DB. 
+A simple service that keeps track of any XLM sent to a `toll address`. The toll collector has a database of public keys and amounts of XLM it has sent to the toll address. It watches for payments to the toll address on the Stellar network and adds them to this DB.
 
 The toll collector service has one RPC or endpoint that you can call:
 
@@ -67,7 +70,7 @@ Ideally the multisig coordinator includes the following features:
 - Create a tx that you would like to be signed by multiple parties
 - Enter the public keys that you would like to sign the tx
 - If any of these keys have previously associated their email address, then they will be sent a message
-- When you come to the site you see a list of all pending transactions: 
+- When you come to the site you see a list of all pending transactions:
   - You can see the details of each transaction
   - You can see who initiated the transaction
   - You can see who else has signed the transaction
@@ -84,7 +87,7 @@ A web page that shows the state of the network quorum graph. Ideally the quorum
 
 You should be able to view the quorum graph from the point of view of any given validator. You would probably need to run stellar-core to build the quorum monitor. You can get the data from the stellar-core logs and the /quorum command.
 
-*Advanced*: Build a server that connects to stellar-core and monitors the externalized messages and the various validator broadcasts. 
+*Advanced*: Build a server that connects to stellar-core and monitors the externalized messages and the various validator broadcasts.
 
 # Libraries
 Build a library in your favorite language:

diff --git a/software/readme.md b/software/readme.md
@@ -0,0 +1,21 @@
+---
+title: Stellar Software
+---
+# Software
+
+Pre-built software and services you can run on your own infrastructure, provided by Stellar.org.
+
+## [Stellar Core](../stellar-core/learn/admin.html)
+Stellar Core is the backbone of the Stellar network and does the hard work of validating and agreeing on the status of every transaction with other instances of Core through the Stellar Consensus Protocol (SCP).
+
+## [Horizon](https://github.com/stellar/horizon)
+Horizon is the client-facing API server for the Stellar ecosystem. It acts as the interface between Stellar Core and applications that want to access the Stellar network. If you are running Stellar Core, you will probably also want to run Horizon.
+
+## [Federation Server](https://github.com/stellar/federation)
+Go implementation of Federation protocol server. This federation server is designed to be dropped in to your existing infrastructure. It can be configured to pull the data it needs out of your existing DB.
+
+## [Bridge Server](https://github.com/stellar/bridge-server)
+Stellar’s Bridge server is an easier-to-use version of Horizon, meant to simplify compliance operations and other more complicated integrations. Because it stores and manages keys and account information, access to it should be well protected. Unlike Horizon, it should never be exposed to the public internet.
+
+## [Archivist](https://github.com/stellar/archivist)
+This is a small tool, written in Go, for working with stellar-core history archives directly. It is a standalone tool that does not require stellar-core, or any other programs.
diff --git a/tools/readme.md b/tools/readme.md
@@ -1,8 +1,16 @@
 ---
-title: Tools Overview
+title: Stellar Tools
 ---
-# [Laboratory](https://www.stellar.org/laboratory)
+# Tools
+
+## [Laboratory](https://www.stellar.org/laboratory)
 Interactive way to learn the Stellar API. The source is available [here](https://github.com/stellar/laboratory).
 
-# [Account Viewer](https://www.stellar.org/account-viewer/)
+
+# Reference applications and sample code
+
+## [Account Viewer](https://github.com/stellar/account-viewer)
 Check your balance and send simple payments. This basic client is built on top of [Interstellar](https://github.com/stellar/interstellar) and connects to the live Stellar network. The source is available [here](https://github.com/stellar/account-viewer).
+
+## [SMS Client](https://github.com/stellar/stellar-sms-client)
+This is a demo of Stellar SMS Client. It was originally developed during Stellar Hack Day.