Updated to the great merge package

README.md

@@ -6,7 +6,7 @@ Ethereum
 Ethereum Go developer client (c) Jeffrey Wilcke
 
 Ethereum is currently in its testing phase. The current state is "Proof
-of Concept 1". For build instructions see the [Wiki](https://github.com/ethereum/go-ethereum/wiki/Building-Edge).
+of Concept 2". For build instructions see the [Wiki](https://github.com/ethereum/go-ethereum/wiki/Building-Edge).
 
 Ethereum Go is split up in several sub packages Please refer to each
 individual package for more information.

dev_console.go

@@ -6,10 +6,10 @@ import (
 	"errors"
 	"fmt"
 	"github.com/ethereum/eth-go"
-	"github.com/ethereum/ethchain-go"
+	"github.com/ethereum/eth-go/ethchain"
-	"github.com/ethereum/ethdb-go"
+	"github.com/ethereum/eth-go/ethdb"
-	"github.com/ethereum/ethutil-go"
+	"github.com/ethereum/eth-go/ethutil"
-	"github.com/ethereum/ethwire-go"
+	"github.com/ethereum/eth-go/ethwire"
 	_ "math/big"
 	"os"
 	"strings"

ethereum.go

@@ -3,8 +3,8 @@ package main
 import (
 	"fmt"
 	"github.com/ethereum/eth-go"
-	"github.com/ethereum/ethchain-go"
+	"github.com/ethereum/eth-go/ethchain"
-	"github.com/ethereum/ethutil-go"
+	"github.com/ethereum/eth-go/ethutil"
 	"github.com/obscuren/secp256k1-go"
 	"log"
 	"os"