diff --git a/README.md b/README.md
index 794fc97ef..dffeb26ae 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ Basecoin is a sample [ABCI application](https://github.com/tendermint/abci) desi
 ## Contents
 
   1. [Installation](#installation)
-  1. [(Advice for go novices)](./GoBasics.md)
+  1. [Learn Go](#learn_go)
   1. [Using the plugin system](#plugins)
   1. [Forking the codebase](#forking)
   1. [Tutorials and other reading](#tutorials)
@@ -28,6 +28,10 @@ make install
 
 This will create the `basecoin` binary.
 
+## Learn Go
+
+Check out our [guide to programming in Go](/docs/go_basics.md).
+
 ## Plugins
 
 Basecoin handles public-key authentication of transaction, maintaining the balance of arbitrary types of currency (BTC, ATOM, ETH, MYCOIN, ...), sending currency (one-to-one or n-to-n multisig), and providing merkle-proofs of the state. These are common factors that many people wish to have in a crypto-currency system, so instead of trying to start from scratch, you can take advantage of the basecoin plugin system.
@@ -70,5 +74,3 @@ If you don't have much experience forking in go, there are a few tricks you want
 ## Tutorials
 
 We are working on some tutorials that will show you how to set up the genesis block, build a plugin to add custom logic, deploy to a tendermint testnet, and connect a UI to your blockchain.  They should be published during the course of February 2017, so stay tuned....
-
-
diff --git a/GoBasics.md b/docs/go_basics.md
similarity index 100%
rename from GoBasics.md
rename to docs/go_basics.md