More folders arrangments

Makefile

@@ -5,9 +5,9 @@ ETCD_FLAGS := TELEPORT_TEST_ETCD_NODES=${ETCD_NODES}
 .PHONY: install test test-with-etcd remove-temp files test-package update test-grep-package cover-package cover-package-with-etcd run profile sloccount set-etcd install-assets docs-serve
 
 install: remove-temp-files
-	go install github.com/gravitational/teleport/teleport
+	go install github.com/gravitational/teleport/tool/teleport
 	go install github.com/gravitational/teleport/tool/tctl
-	go install github.com/gravitational/teleport/telescope/telescope
+	go install github.com/gravitational/teleport/tool/telescope/telescope
 	go install github.com/gravitational/teleport/tool/tscopectl
 
 install-assets:

lib/auth/ap.go

@@ -4,7 +4,7 @@ import (
 	"time"
 
 	"github.com/gravitational/teleport/lib/backend"
-	"github.com/gravitational/teleport/services"
+	"github.com/gravitational/teleport/lib/services"
 )
 
 // AccessPoint is a interface needed by nodes to control the access

lib/auth/api.go

@@ -7,7 +7,7 @@ import (
 	"github.com/gravitational/teleport/lib/events"
 	"github.com/gravitational/teleport/lib/recorder"
 	"github.com/gravitational/teleport/lib/session"
-	"github.com/gravitational/teleport/utils"
+	"github.com/gravitational/teleport/lib/utils"
 
 	"github.com/gravitational/teleport/Godeps/_workspace/src/github.com/gravitational/log"
 	"github.com/gravitational/teleport/Godeps/_workspace/src/github.com/mailgun/oxy/trace"

lib/auth/auth.go

@@ -14,7 +14,7 @@ import (
 	"github.com/gravitational/teleport/Godeps/_workspace/src/github.com/gravitational/session"
 	"github.com/gravitational/teleport/Godeps/_workspace/src/github.com/mailgun/lemma/secret"
 	"github.com/gravitational/teleport/lib/backend/encryptedbk"
-	"github.com/gravitational/teleport/services"
+	"github.com/gravitational/teleport/lib/services"
 )
 
 // Authority implements minimal key-management facility for generating OpenSSH

lib/auth/auth_test.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/gravitational/teleport"
 	"github.com/gravitational/teleport/Godeps/_workspace/src/github.com/mailgun/lemma/secret"
-	authority "github.com/gravitational/teleport/auth/native"
+	authority "github.com/gravitational/teleport/lib/auth/native"
 	"github.com/gravitational/teleport/lib/backend/boltbk"
 	"github.com/gravitational/teleport/lib/backend/encryptedbk"
 

lib/auth/clt.go

@@ -14,9 +14,9 @@ import (
 	"github.com/gravitational/teleport/lib/backend/encryptedbk/encryptor"
 	"github.com/gravitational/teleport/lib/events"
 	"github.com/gravitational/teleport/lib/recorder"
-	"github.com/gravitational/teleport/services"
+	"github.com/gravitational/teleport/lib/services"
 	"github.com/gravitational/teleport/lib/session"
-	"github.com/gravitational/teleport/utils"
+	"github.com/gravitational/teleport/lib/utils"
 
 	"github.com/gravitational/teleport/Godeps/_workspace/src/github.com/codahale/lunk"
 	"github.com/gravitational/teleport/Godeps/_workspace/src/github.com/gravitational/roundtrip"

lib/auth/init.go

@@ -9,9 +9,9 @@ import (
 
 	"github.com/gravitational/teleport"
 	"github.com/gravitational/teleport/lib/backend/encryptedbk"
-	"github.com/gravitational/teleport/services"
+	"github.com/gravitational/teleport/lib/services"
 	"github.com/gravitational/teleport/lib/sshutils"
-	"github.com/gravitational/teleport/utils"
+	"github.com/gravitational/teleport/lib/utils"
 
 	"github.com/gravitational/teleport/Godeps/_workspace/src/github.com/gravitational/log"
 	"github.com/gravitational/teleport/Godeps/_workspace/src/github.com/mailgun/lemma/secret"

lib/auth/native/native_test.go

@@ -3,7 +3,7 @@ package native
 import (
 	"testing"
 
-	"github.com/gravitational/teleport/auth/test"
+	"github.com/gravitational/teleport/lib/auth/test"
 
 	. "github.com/gravitational/teleport/Godeps/_workspace/src/gopkg.in/check.v1"
 )

lib/auth/openssh/oauth_test.go

@@ -3,7 +3,7 @@ package openssh
 import (
 	"testing"
 
-	"github.com/gravitational/teleport/auth/test"
+	"github.com/gravitational/teleport/lib/auth/test"
 
 	. "github.com/gravitational/teleport/Godeps/_workspace/src/gopkg.in/check.v1"
 )

lib/auth/register.go

@@ -9,7 +9,7 @@ import (
 	"strings"
 
 	"github.com/gravitational/teleport/lib/backend/encryptedbk/encryptor"
-	"github.com/gravitational/teleport/utils"
+	"github.com/gravitational/teleport/lib/utils"
 
 	"github.com/gravitational/teleport/Godeps/_workspace/src/github.com/gravitational/trace"
 	"github.com/gravitational/teleport/Godeps/_workspace/src/golang.org/x/crypto/ssh"

lib/auth/srv.go

@@ -13,7 +13,7 @@ import (
 	"github.com/gravitational/teleport/lib/backend/encryptedbk/encryptor"
 	"github.com/gravitational/teleport/lib/events"
 	"github.com/gravitational/teleport/lib/recorder"
-	"github.com/gravitational/teleport/services"
+	"github.com/gravitational/teleport/lib/services"
 	"github.com/gravitational/teleport/lib/session"
 
 	"github.com/gravitational/teleport/Godeps/_workspace/src/github.com/codahale/lunk"

lib/auth/srv_test.go

@@ -7,13 +7,13 @@ import (
 	"time"
 
 	"github.com/gravitational/teleport"
-	authority "github.com/gravitational/teleport/auth/native"
+	authority "github.com/gravitational/teleport/lib/auth/native"
 	"github.com/gravitational/teleport/lib/backend/boltbk"
 	"github.com/gravitational/teleport/lib/backend/encryptedbk"
 	"github.com/gravitational/teleport/lib/events/boltlog"
 	etest "github.com/gravitational/teleport/lib/events/test"
 	rtest "github.com/gravitational/teleport/lib/recorder/test"
-	"github.com/gravitational/teleport/services"
+	"github.com/gravitational/teleport/lib/services"
 
 	"github.com/gravitational/teleport/lib/recorder"
 	"github.com/gravitational/teleport/lib/recorder/boltrec"

lib/auth/test/suite.go

@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/gravitational/teleport/Godeps/_workspace/src/golang.org/x/crypto/ssh"
-	"github.com/gravitational/teleport/auth"
+	"github.com/gravitational/teleport/lib/auth"
 
 	. "github.com/gravitational/teleport/Godeps/_workspace/src/gopkg.in/check.v1"
 )

lib/auth/tun.go

@@ -11,7 +11,7 @@ import (
 
 	"github.com/gravitational/teleport/lib/backend/encryptedbk/encryptor"
 	"github.com/gravitational/teleport/lib/sshutils"
-	"github.com/gravitational/teleport/utils"
+	"github.com/gravitational/teleport/lib/utils"
 
 	"github.com/gravitational/teleport/Godeps/_workspace/src/github.com/gravitational/log"
 	"github.com/gravitational/teleport/Godeps/_workspace/src/github.com/gravitational/roundtrip"

lib/auth/tun_test.go

@@ -8,16 +8,16 @@ import (
 	"net/url"
 	"path/filepath"
 
-	authority "github.com/gravitational/teleport/auth/native"
+	authority "github.com/gravitational/teleport/lib/auth/native"
 	"github.com/gravitational/teleport/lib/backend/boltbk"
 	"github.com/gravitational/teleport/lib/backend/encryptedbk"
 	"github.com/gravitational/teleport/lib/events/boltlog"
 	"github.com/gravitational/teleport/lib/recorder"
 	"github.com/gravitational/teleport/lib/recorder/boltrec"
-	"github.com/gravitational/teleport/services"
+	"github.com/gravitational/teleport/lib/services"
 	"github.com/gravitational/teleport/lib/session"
 	"github.com/gravitational/teleport/lib/sshutils"
-	"github.com/gravitational/teleport/utils"
+	"github.com/gravitational/teleport/lib/utils"
 
 	"github.com/gravitational/teleport/Godeps/_workspace/src/github.com/gravitational/log"
 	"github.com/gravitational/teleport/Godeps/_workspace/src/github.com/mailgun/lemma/secret"

lib/cp/auth.go

@@ -7,9 +7,9 @@ import (
 	"io"
 	"net/http"
 
-	"github.com/gravitational/teleport/auth"
+	"github.com/gravitational/teleport/lib/auth"
 	"github.com/gravitational/teleport/lib/sshutils"
-	"github.com/gravitational/teleport/utils"
+	"github.com/gravitational/teleport/lib/utils"
 
 	"github.com/gravitational/teleport/Godeps/_workspace/src/github.com/gravitational/log"
 	"github.com/gravitational/teleport/Godeps/_workspace/src/github.com/julienschmidt/httprouter"

lib/cp/cp.go

@@ -15,9 +15,9 @@ import (
 	"github.com/gravitational/teleport"
 	"github.com/gravitational/teleport/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid"
 	"github.com/gravitational/teleport/lib/events"
-	"github.com/gravitational/teleport/services"
+	"github.com/gravitational/teleport/lib/services"
 	"github.com/gravitational/teleport/lib/sshutils/scp"
-	"github.com/gravitational/teleport/utils"
+	"github.com/gravitational/teleport/lib/utils"
 
 	"github.com/gravitational/teleport/Godeps/_workspace/src/github.com/codahale/lunk"
 	"github.com/gravitational/teleport/Godeps/_workspace/src/github.com/gravitational/form"

lib/cp/proxy.go

@@ -8,8 +8,8 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/gravitational/teleport/auth"
-	"github.com/gravitational/teleport/utils"
+	"github.com/gravitational/teleport/lib/auth"
+	"github.com/gravitational/teleport/lib/utils"
 
 	"github.com/gravitational/teleport/Godeps/_workspace/src/github.com/gravitational/log"
 	"github.com/gravitational/teleport/Godeps/_workspace/src/github.com/mailgun/oxy/forward"

lib/cp/srv.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/gravitational/teleport/utils"
+	"github.com/gravitational/teleport/lib/utils"
 )
 
 // CPSrv implements Control Panel server

lib/service/service.go

@@ -5,22 +5,22 @@ import (
 	"path"
 	"time"
 
-	"github.com/gravitational/teleport/auth"
-	authority "github.com/gravitational/teleport/auth/native"
+	"github.com/gravitational/teleport/lib/auth"
+	authority "github.com/gravitational/teleport/lib/auth/native"
 	"github.com/gravitational/teleport/lib/backend"
 	"github.com/gravitational/teleport/lib/backend/boltbk"
 	"github.com/gravitational/teleport/lib/backend/encryptedbk"
 	"github.com/gravitational/teleport/lib/backend/encryptedbk/encryptor"
 	"github.com/gravitational/teleport/lib/backend/etcdbk"
-	"github.com/gravitational/teleport/cp"
+	"github.com/gravitational/teleport/lib/cp"
 	"github.com/gravitational/teleport/lib/events"
 	"github.com/gravitational/teleport/lib/events/boltlog"
 	"github.com/gravitational/teleport/lib/recorder"
 	"github.com/gravitational/teleport/lib/recorder/boltrec"
 	"github.com/gravitational/teleport/lib/session"
-	"github.com/gravitational/teleport/srv"
-	"github.com/gravitational/teleport/tun"
-	"github.com/gravitational/teleport/utils"
+	"github.com/gravitational/teleport/lib/srv"
+	"github.com/gravitational/teleport/lib/tun"
+	"github.com/gravitational/teleport/lib/utils"
 
 	"github.com/gravitational/teleport/Godeps/_workspace/src/github.com/codahale/lunk"
 	"github.com/gravitational/teleport/Godeps/_workspace/src/github.com/gravitational/log"

lib/srv/ls.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/gravitational/teleport/Godeps/_workspace/src/github.com/gravitational/log"
 	"github.com/gravitational/teleport/Godeps/_workspace/src/golang.org/x/crypto/ssh"
-	"github.com/gravitational/teleport/utils"
+	"github.com/gravitational/teleport/lib/utils"
 )
 
 type lsSubsys struct {

lib/srv/resolver.go

@@ -3,7 +3,7 @@ package srv
 import (
 	"strings"
 
-	"github.com/gravitational/teleport/auth"
+	"github.com/gravitational/teleport/lib/auth"
 )
 
 // resolver is an interface implementing a query resolver,

lib/srv/srv.go

@@ -9,14 +9,14 @@ import (
 	"sync"
 	"time"
 
-	"github.com/gravitational/teleport/auth"
+	"github.com/gravitational/teleport/lib/auth"
 	"github.com/gravitational/teleport/lib/events"
 	"github.com/gravitational/teleport/lib/recorder"
-	"github.com/gravitational/teleport/services"
+	"github.com/gravitational/teleport/lib/services"
 	rsession "github.com/gravitational/teleport/lib/session"
 	"github.com/gravitational/teleport/lib/sshutils"
 	"github.com/gravitational/teleport/lib/sshutils/scp"
-	"github.com/gravitational/teleport/utils"
+	"github.com/gravitational/teleport/lib/utils"
 
 	"github.com/gravitational/teleport/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid"
 	"github.com/gravitational/teleport/Godeps/_workspace/src/github.com/codahale/lunk"

lib/srv/srv_test.go

@@ -8,13 +8,13 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/gravitational/teleport/auth"
-	authority "github.com/gravitational/teleport/auth/native"
+	"github.com/gravitational/teleport/lib/auth"
+	authority "github.com/gravitational/teleport/lib/auth/native"
 	"github.com/gravitational/teleport/lib/backend/boltbk"
 	"github.com/gravitational/teleport/lib/backend/encryptedbk"
-	"github.com/gravitational/teleport/services"
+	"github.com/gravitational/teleport/lib/services"
 	"github.com/gravitational/teleport/lib/sshutils"
-	"github.com/gravitational/teleport/utils"
+	"github.com/gravitational/teleport/lib/utils"
 
 	"github.com/gravitational/teleport/Godeps/_workspace/src/github.com/mailgun/lemma/secret"
 	"github.com/gravitational/teleport/Godeps/_workspace/src/golang.org/x/crypto/ssh"

lib/sshutils/server.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/gravitational/teleport/Godeps/_workspace/src/github.com/gravitational/log"
 	"github.com/gravitational/teleport/Godeps/_workspace/src/golang.org/x/crypto/ssh"
-	"github.com/gravitational/teleport/utils"
+	"github.com/gravitational/teleport/lib/utils"
 )
 
 type Server struct {

lib/sshutils/server_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/gravitational/teleport/utils"
+	"github.com/gravitational/teleport/lib/utils"
 
 	"github.com/gravitational/teleport/Godeps/_workspace/src/github.com/gravitational/log"
 	"github.com/gravitational/teleport/Godeps/_workspace/src/golang.org/x/crypto/ssh"

lib/tun/agent.go

@@ -7,10 +7,10 @@ import (
 	"sync"
 	"time"
 
-	"github.com/gravitational/teleport/auth"
-	"github.com/gravitational/teleport/services"
+	"github.com/gravitational/teleport/lib/auth"
+	"github.com/gravitational/teleport/lib/services"
 	"github.com/gravitational/teleport/lib/sshutils"
-	"github.com/gravitational/teleport/utils"
+	"github.com/gravitational/teleport/lib/utils"
 
 	"github.com/gravitational/teleport/Godeps/_workspace/src/github.com/codahale/lunk"
 	"github.com/gravitational/teleport/Godeps/_workspace/src/github.com/gravitational/log"

lib/tun/srv.go

@@ -7,11 +7,11 @@ import (
 	"sync"
 	"time"
 
-	"github.com/gravitational/teleport/auth"
+	"github.com/gravitational/teleport/lib/auth"
 	"github.com/gravitational/teleport/lib/events"
-	"github.com/gravitational/teleport/services"
+	"github.com/gravitational/teleport/lib/services"
 	"github.com/gravitational/teleport/lib/sshutils"
-	"github.com/gravitational/teleport/utils"
+	"github.com/gravitational/teleport/lib/utils"
 
 	"github.com/gravitational/teleport/Godeps/_workspace/src/github.com/codahale/lunk"
 	"github.com/gravitational/teleport/Godeps/_workspace/src/github.com/gravitational/log"

tool/tctl/command/ca.go

@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"github.com/gravitational/teleport/Godeps/_workspace/src/github.com/buger/goterm"
-	"github.com/gravitational/teleport/services"
+	"github.com/gravitational/teleport/lib/services"
 )
 
 func (cmd *Command) ResetHostCA(confirm bool) {

tool/tctl/command/cmd.go

@@ -9,8 +9,8 @@ import (
 
 	"github.com/gravitational/teleport/Godeps/_workspace/src/github.com/buger/goterm"
 	"github.com/gravitational/teleport/Godeps/_workspace/src/gopkg.in/alecthomas/kingpin.v2"
-	"github.com/gravitational/teleport/auth"
-	"github.com/gravitational/teleport/utils"
+	"github.com/gravitational/teleport/lib/auth"
+	"github.com/gravitational/teleport/lib/utils"
 )
 
 type Command struct {

tool/tctl/command/cmd_test.go

@@ -11,16 +11,16 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/gravitational/teleport/auth"
-	authority "github.com/gravitational/teleport/auth/native"
+	"github.com/gravitational/teleport/lib/auth"
+	authority "github.com/gravitational/teleport/lib/auth/native"
 	"github.com/gravitational/teleport/lib/backend/boltbk"
 	"github.com/gravitational/teleport/lib/backend/encryptedbk"
 	"github.com/gravitational/teleport/lib/events/boltlog"
 	"github.com/gravitational/teleport/lib/recorder"
 	"github.com/gravitational/teleport/lib/recorder/boltrec"
-	"github.com/gravitational/teleport/services"
+	"github.com/gravitational/teleport/lib/services"
 	"github.com/gravitational/teleport/lib/session"
-	"github.com/gravitational/teleport/utils"
+	"github.com/gravitational/teleport/lib/utils"
 
 	"github.com/gravitational/teleport/Godeps/_workspace/src/github.com/gravitational/log"
 	"github.com/gravitational/teleport/Godeps/_workspace/src/github.com/mailgun/lemma/secret"

tool/tctl/command/user.go

@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"github.com/gravitational/teleport/Godeps/_workspace/src/github.com/buger/goterm"
-	"github.com/gravitational/teleport/services"
+	"github.com/gravitational/teleport/lib/services"
 )
 
 func (cmd *Command) SetPass(user, pass string) {

tool/teleport/main.go

@@ -5,8 +5,8 @@ import (
 	"os"
 
 	"github.com/gravitational/teleport/Godeps/_workspace/src/github.com/gravitational/log"
-	"github.com/gravitational/teleport/service"
-	"github.com/gravitational/teleport/utils"
+	"github.com/gravitational/teleport/lib/service"
+	"github.com/gravitational/teleport/lib/utils"
 
 	"github.com/gravitational/teleport/Godeps/_workspace/src/gopkg.in/alecthomas/kingpin.v2"
 )