Use internal/pkg structure

3 files changed, 4 insertions, 40 deletions

diff --git a/cmd/api/main.go b/cmd/api/main.go
index 96f7a2f..633f339 100644
--- a/cmd/api/main.go
+++ b/cmd/api/main.go
@@ -5,9 +5,9 @@ import (
 	"net/http"
 	"os"
 
-	"github.com/boozec/rahanna/api/database"
-	"github.com/boozec/rahanna/api/handlers"
-	"github.com/boozec/rahanna/api/middleware"
+	"github.com/boozec/rahanna/internal/api/database"
+	"github.com/boozec/rahanna/internal/api/handlers"
+	"github.com/boozec/rahanna/internal/api/middleware"
 	"github.com/gorilla/mux"
 	"github.com/rs/cors"
 )
diff --git a/cmd/relay/main.go b/cmd/relay/main.go
deleted file mode 100644
index 150da8a..0000000
--- a/cmd/relay/main.go
+++ /dev/null
@@ -1,36 +0,0 @@
-package main
-
-import (
-	"net"
-	"os"
-
-	"github.com/boozec/rahanna/relay"
-	pb "github.com/boozec/rahanna/relay/proto"
-	"go.uber.org/zap"
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/reflection"
-)
-
-func main() {
-	logger, _ := zap.NewProduction()
-	defer logger.Sync()
-	lis, err := net.Listen("tcp", ":50051")
-
-	if err != nil {
-		logger.Sugar().Errorln("Failed to listen", "err", err)
-		os.Exit(1)
-	}
-
-	s := grpc.NewServer()
-	server := &relay.Server{}
-	pb.RegisterRelayServer(s, server)
-
-	reflection.Register(s)
-
-	logger.Sugar().Infoln("Server listening", "address", lis.Addr())
-
-	if err := s.Serve(lis); err != nil {
-		logger.Sugar().Errorln("Failed to serve", "err", err)
-		os.Exit(1)
-	}
-}
diff --git a/cmd/ui/main.go b/cmd/ui/main.go
index 4bdcce9..0b8d4bb 100644
--- a/cmd/ui/main.go
+++ b/cmd/ui/main.go
@@ -3,7 +3,7 @@ package main
 import (
 	"log"
 
-	"github.com/boozec/rahanna/ui/views"
+	"github.com/boozec/rahanna/pkg/ui/views"
 	tea "github.com/charmbracelet/bubbletea"
 )