Reorganize file layout.

Makefile

@@ -1,17 +1,28 @@
-GOPATH := $(PWD)
+# Use shadowsocks as command prefix to avoid name conflict
+# Maybe ss-local/server is better because easier to type
+PREFIX := shadowsocks
+LOCAL := $(GOBIN)/$(PREFIX)-local
+SERVER := $(GOBIN)/$(PREFIX)-server
+TEST := $(GOBIN)/$(PREFIX)-test
 
-all: bin/local bin/server bin/test
+# TODO define the install package path for use in clean and detect whether
+# package need re-build
+
+all: $(LOCAL) $(SERVER) $(TEST)
 
 .PHONY: clean
 
 clean:
-	rm -rf bin/* pkg/*
+	rm -rf $(LOCAL) $(SERVER) $(TEST)
 
-bin/local: src/shadowsocks/*.go src/local/*.go
-	go install local
+$(LOCAL): shadowsocks/*.go cmd/$(PREFIX)-local/*.go
+	cd shadowsocks; go install
+	cd cmd/$(PREFIX)-local; go install
 
-bin/server: src/shadowsocks/*.go src/server/*.go
-	go install server
+$(SERVER): shadowsocks/*.go cmd/$(PREFIX)-server/*.go
+	cd shadowsocks; go install
+	cd cmd/$(PREFIX)-server; go install
 
-bin/test: src/shadowsocks/*.go src/test/*.go
-	go install test
+$(TEST): shadowsocks/*.go cmd/$(PREFIX)-test/*.go
+	cd shadowsocks; go install
+	cd cmd/$(PREFIX)-test; go install

src/local/local.go → cmd/shadowsocks-local/local.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"log"
 	"net"
-	"shadowsocks"
+	"github.com/cyfdecyf/shadowsocks-go/shadowsocks"
 )
 
 func handleConnection(conn net.Conn, server string) {

src/server/server.go → cmd/shadowsocks-server/server.go

@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"log"
 	"net"
-	"shadowsocks"
+	"github.com/cyfdecyf/shadowsocks-go/shadowsocks"
 )
 
 func handleConnection(conn shadowsocks.Conn) {

src/test/test.go → cmd/shadowsocks-test/test.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	"shadowsocks"
+	"github.com/cyfdecyf/shadowsocks-go/shadowsocks"
 	"log"
 )