Restructure project

We previously didn't really had any structure in our project apart from creating a new folder for each package in our project root. Now that we have accumulated some packages, we use the well-known Golang project layout in order to clearly communicate our intent with packages. See https://github.com/golang-standards/project-layout
2021-07-16 09:19:42 +02:00
parent 2f1383b743
commit 8b26ecbe5f
66 changed files with 95 additions and 95 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,5 +1,5 @@
 # Project binary
-poseidon
+/poseidon

 # Configuration file
 configuration.yaml
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -77,7 +77,7 @@ dockerimage:
    # Prevent pull rate limit but still have normal alpine image in Dockerfile
    - docker pull $DOCKER_REGISTRY/library/alpine:latest
    - docker tag $DOCKER_REGISTRY/library/alpine:latest alpine:latest
-    - docker build -t $IMAGE_NAME_ENV .
+    - docker build -t $IMAGE_NAME_ENV -f deploy/poseidon/Dockerfile .
    # Run vulnerability scan before pushing the image
    - make trivy-scan-docker DOCKER_TAG=$IMAGE_NAME_ENV
    - docker push $IMAGE_NAME_ENV
@ -98,7 +98,7 @@ nomadimage:
      alias: docker
  needs: []
  script:
-    - cd ci
+    - cd deploy/nomad-ci
    - docker login -u $DOCKER_REGISTRY_USER -p $DOCKER_REGISTRY_PASSWORD $DOCKER_REGISTRY
    - docker pull $DOCKER_REGISTRY/library/golang:latest
    - docker tag $DOCKER_REGISTRY/library/golang:latest golang:latest
@ -131,7 +131,7 @@ test_e2e:
    - nomad agent -dev -log-level=WARN &
    - sleep 5
    - export NOMAD_NAMESPACE="default"
-    - ./ci/nomad-run-env-job.sh ci/demo-job.tpl.nomad ci/demo-job.nomad
+    - ./deploy/nomad-run-env-job.sh deploy/demo-job.tpl.nomad deploy/demo-job.nomad
    - sleep 5
    # Start Poseidon and wait for it
    - ./poseidon &
@ -151,15 +151,15 @@ test_e2e:
    - nomad namespace apply $NOMAD_NAMESPACE
  script:
    # Only replace set env vars
-    - envsubst "$(env | sed -e 's/=.*//' -e 's/^/\$/g')" < ci/api.tpl.nomad > ci/api.nomad
+    - envsubst "$(env | sed -e 's/=.*//' -e 's/^/\$/g')" < deploy/api.tpl.nomad > deploy/api.nomad
    # Make sure to set NOMAD_ADDR, NOMAD_SKIP_VERIFY and NOMAD_TOKEN env vars in CI settings appropriately
-    - nomad validate ci/api.nomad
+    - nomad validate deploy/api.nomad
    # nomad plan returns 1 if allocation is created or destroyed which is what we want here
-    - nomad plan     ci/api.nomad || [ $? == 1 ]
-    - nomad-run-and-wait ci/api.nomad
+    - nomad plan     deploy/api.nomad || [ $? == 1 ]
+    - nomad-run-and-wait deploy/api.nomad
  artifacts:
    paths:
-      - ci/api.nomad
+      - deploy/api.nomad
    expire_in: 1 month
    expose_as: api-nomad

@ -174,7 +174,7 @@ deploy_review:
  before_script:
    - export NOMAD_NAMESPACE="$NOMAD_SLUG"
    - nomad namespace apply $NOMAD_NAMESPACE
-    - ./ci/nomad-run-env-job.sh ci/demo-job.tpl.nomad ci/demo-job.nomad
+    - ./deploy/nomad-run-env-job.sh deploy/demo-job.tpl.nomad deploy/demo-job.nomad
  only:
    - branches
    - tags
--- a/8
+++ b/8
@ -1,5 +1,5 @@
 PROJECT_NAME := "poseidon"
-PKG := "gitlab.hpi.de/codeocean/codemoon/$(PROJECT_NAME)"
+PKG := "gitlab.hpi.de/codeocean/codemoon/$(PROJECT_NAME)/cmd/$(PROJECT_NAME)"
 UNIT_TESTS = $(shell go list ./... | grep -v /e2e)

 DOCKER_E2E_CONTAINER_NAME := "$(PROJECT_NAME)-e2e-tests"
@ -28,16 +28,16 @@ git-hooks: .git/hooks/pre-commit ## Install the git-hooks

 .PHONY: build
 build: deps ## Build the binary
-	@go build -v $(PKG)
+	@go build -o $(PROJECT_NAME) -v $(PKG)

 .PHONY: clean
 clean: ## Remove previous build
-	@rm -f $(PROJECT_NAME)
+	@rm -f poseidon

 .PHONY: docker
 docker:
 	@CGO_ENABLED=0 make build
-	@docker build -t $(DOCKER_TAG) .
+	@docker build -t $(DOCKER_TAG) -f deploy/poseidon/Dockerfile .

 .PHONY: lint-deps
 lint-deps: ## Install linter dependencies
--- a/README.md
+++ b/README.md
@ -11,7 +11,7 @@ To get your local setup going, run `make bootstrap`. It will install all require

 The project can be compiled using `make build`. This should create a binary which can then be executed.

-Alternatively, the `go run .` command can be used to automatically compile and run the project.
+Alternatively, the `go run ./cmd/poseidon` command can be used to automatically compile and run the project.

 ### Docker

@ -55,7 +55,7 @@ If a value is not specified, the value of the subsequent possibility is used.

 ### Documentation

-For the OpenAPI 3.0 definition of the API Poseidon provides, see [`swagger.yaml`](docs/swagger.yaml).
+For the OpenAPI 3.0 definition of the API Poseidon provides, see [`swagger.yaml`](api/swagger.yaml).

 ### Authentication

--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
--- a/docs/websocket.schema.json
+++ b/docs/websocket.schema.json
--- a/cmd/poseidon/main.go
+++ b/cmd/poseidon/main.go
@ -3,12 +3,12 @@ package main
 import (
 	"context"
 	"errors"
-	"gitlab.hpi.de/codeocean/codemoon/poseidon/api"
-	"gitlab.hpi.de/codeocean/codemoon/poseidon/config"
-	"gitlab.hpi.de/codeocean/codemoon/poseidon/environment"
-	"gitlab.hpi.de/codeocean/codemoon/poseidon/logging"
-	"gitlab.hpi.de/codeocean/codemoon/poseidon/nomad"
-	"gitlab.hpi.de/codeocean/codemoon/poseidon/runner"
+	"gitlab.hpi.de/codeocean/codemoon/poseidon/internal/api"
+	"gitlab.hpi.de/codeocean/codemoon/poseidon/internal/config"
+	"gitlab.hpi.de/codeocean/codemoon/poseidon/internal/environment"
+	"gitlab.hpi.de/codeocean/codemoon/poseidon/internal/nomad"
+	"gitlab.hpi.de/codeocean/codemoon/poseidon/internal/runner"
+	"gitlab.hpi.de/codeocean/codemoon/poseidon/pkg/logging"
 	"net/http"
 	"os"
 	"os/signal"
--- a/deploy/api.tpl.nomad
+++ b/deploy/api.tpl.nomad
--- a/deploy/demo-job.tpl.nomad
+++ b/deploy/demo-job.tpl.nomad
--- a/deploy/docker-make/Dockerfile
+++ b/deploy/docker-make/Dockerfile
--- a/deploy/nomad-ci/Dockerfile
+++ b/deploy/nomad-ci/Dockerfile
--- a/deploy/nomad-ci/nomad-run-and-wait
+++ b/deploy/nomad-ci/nomad-run-and-wait
--- a/deploy/nomad-run-env-job.sh
+++ b/deploy/nomad-run-env-job.sh
--- a/deploy/poseidon/Dockerfile
+++ b/deploy/poseidon/Dockerfile
--- a/internal/api/api.go
+++ b/internal/api/api.go
@ -2,10 +2,10 @@ package api

 import (
 	"github.com/gorilla/mux"
-	"gitlab.hpi.de/codeocean/codemoon/poseidon/api/auth"
-	"gitlab.hpi.de/codeocean/codemoon/poseidon/environment"
-	"gitlab.hpi.de/codeocean/codemoon/poseidon/logging"
-	"gitlab.hpi.de/codeocean/codemoon/poseidon/runner"
+	"gitlab.hpi.de/codeocean/codemoon/poseidon/internal/api/auth"
+	"gitlab.hpi.de/codeocean/codemoon/poseidon/internal/environment"
+	"gitlab.hpi.de/codeocean/codemoon/poseidon/internal/runner"
+	"gitlab.hpi.de/codeocean/codemoon/poseidon/pkg/logging"
 	"net/http"
 )

--- a/internal/api/api_test.go
+++ b/internal/api/api_test.go
@ -3,7 +3,7 @@ package api
 import (
 	"github.com/gorilla/mux"
 	"github.com/stretchr/testify/assert"
-	"gitlab.hpi.de/codeocean/codemoon/poseidon/config"
+	"gitlab.hpi.de/codeocean/codemoon/poseidon/internal/config"
 	"net/http"
 	"net/http/httptest"
 	"testing"
--- a/internal/api/auth/auth.go
+++ b/internal/api/auth/auth.go
@ -2,8 +2,8 @@ package auth

 import (
 	"crypto/subtle"
-	"gitlab.hpi.de/codeocean/codemoon/poseidon/config"
-	"gitlab.hpi.de/codeocean/codemoon/poseidon/logging"
+	"gitlab.hpi.de/codeocean/codemoon/poseidon/internal/config"
+	"gitlab.hpi.de/codeocean/codemoon/poseidon/pkg/logging"
 	"net/http"
 )

--- a/internal/api/auth/auth_test.go
+++ b/internal/api/auth/auth_test.go
@ -5,7 +5,7 @@ import (
 	"github.com/sirupsen/logrus/hooks/test"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/suite"
-	"gitlab.hpi.de/codeocean/codemoon/poseidon/config"
+	"gitlab.hpi.de/codeocean/codemoon/poseidon/internal/config"
 	"net/http"
 	"net/http/httptest"
 	"testing"
--- a/internal/api/environments.go
+++ b/internal/api/environments.go
@ -5,9 +5,9 @@ import (
 	"errors"
 	"fmt"
 	"github.com/gorilla/mux"
-	"gitlab.hpi.de/codeocean/codemoon/poseidon/api/dto"
-	"gitlab.hpi.de/codeocean/codemoon/poseidon/environment"
-	"gitlab.hpi.de/codeocean/codemoon/poseidon/runner"
+	"gitlab.hpi.de/codeocean/codemoon/poseidon/internal/environment"
+	"gitlab.hpi.de/codeocean/codemoon/poseidon/internal/runner"
+	"gitlab.hpi.de/codeocean/codemoon/poseidon/pkg/dto"
 	"net/http"
 )

--- a/internal/api/environments_test.go
+++ b/internal/api/environments_test.go
@ -6,9 +6,9 @@ import (
 	"github.com/gorilla/mux"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/suite"
-	"gitlab.hpi.de/codeocean/codemoon/poseidon/api/dto"
-	"gitlab.hpi.de/codeocean/codemoon/poseidon/environment"
-	"gitlab.hpi.de/codeocean/codemoon/poseidon/runner"
+	"gitlab.hpi.de/codeocean/codemoon/poseidon/internal/environment"
+	"gitlab.hpi.de/codeocean/codemoon/poseidon/internal/runner"
+	"gitlab.hpi.de/codeocean/codemoon/poseidon/pkg/dto"
 	"gitlab.hpi.de/codeocean/codemoon/poseidon/tests"
 	"math"
 	"net/http"
--- a/internal/api/health.go
+++ b/internal/api/health.go
--- a/internal/api/health_test.go
+++ b/internal/api/health_test.go
--- a/internal/api/helpers.go
+++ b/internal/api/helpers.go
@ -3,7 +3,7 @@ package api
 import (
 	"encoding/json"
 	"fmt"
-	"gitlab.hpi.de/codeocean/codemoon/poseidon/api/dto"
+	"gitlab.hpi.de/codeocean/codemoon/poseidon/pkg/dto"
 	"net/http"
 )

--- a/internal/api/runners.go
+++ b/internal/api/runners.go
@ -5,9 +5,9 @@ import (
 	"fmt"
 	"github.com/google/uuid"
 	"github.com/gorilla/mux"
-	"gitlab.hpi.de/codeocean/codemoon/poseidon/api/dto"
-	"gitlab.hpi.de/codeocean/codemoon/poseidon/config"
-	"gitlab.hpi.de/codeocean/codemoon/poseidon/runner"
+	"gitlab.hpi.de/codeocean/codemoon/poseidon/internal/config"
+	"gitlab.hpi.de/codeocean/codemoon/poseidon/internal/runner"
+	"gitlab.hpi.de/codeocean/codemoon/poseidon/pkg/dto"
 	"net/http"
 	"net/url"
 )
--- a/internal/api/runners_test.go
+++ b/internal/api/runners_test.go
@ -7,8 +7,8 @@ import (
 	"github.com/gorilla/mux"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/suite"
-	"gitlab.hpi.de/codeocean/codemoon/poseidon/api/dto"
-	"gitlab.hpi.de/codeocean/codemoon/poseidon/runner"
+	"gitlab.hpi.de/codeocean/codemoon/poseidon/internal/runner"
+	"gitlab.hpi.de/codeocean/codemoon/poseidon/pkg/dto"
 	"gitlab.hpi.de/codeocean/codemoon/poseidon/tests"
 	"net/http"
 	"net/http/httptest"
--- a/internal/api/websocket.go
+++ b/internal/api/websocket.go
@ -6,8 +6,8 @@ import (
 	"errors"
 	"fmt"
 	"github.com/gorilla/websocket"
-	"gitlab.hpi.de/codeocean/codemoon/poseidon/api/dto"
-	"gitlab.hpi.de/codeocean/codemoon/poseidon/runner"
+	"gitlab.hpi.de/codeocean/codemoon/poseidon/internal/runner"
+	"gitlab.hpi.de/codeocean/codemoon/poseidon/pkg/dto"
 	"io"
 	"net/http"
 )
--- a/internal/api/websocket_connection_mock.go
+++ b/internal/api/websocket_connection_mock.go
--- a/internal/api/websocket_test.go
+++ b/internal/api/websocket_test.go
@ -12,9 +12,9 @@ import (
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
-	"gitlab.hpi.de/codeocean/codemoon/poseidon/api/dto"
-	"gitlab.hpi.de/codeocean/codemoon/poseidon/nomad"
-	"gitlab.hpi.de/codeocean/codemoon/poseidon/runner"
+	"gitlab.hpi.de/codeocean/codemoon/poseidon/internal/nomad"
+	"gitlab.hpi.de/codeocean/codemoon/poseidon/internal/runner"
+	"gitlab.hpi.de/codeocean/codemoon/poseidon/pkg/dto"
 	"gitlab.hpi.de/codeocean/codemoon/poseidon/tests"
 	"gitlab.hpi.de/codeocean/codemoon/poseidon/tests/helpers"
 	"io"
--- a/internal/config/config.go
+++ b/internal/config/config.go
@ -6,7 +6,7 @@ import (
 	"flag"
 	"fmt"
 	"github.com/sirupsen/logrus"
-	"gitlab.hpi.de/codeocean/codemoon/poseidon/logging"
+	"gitlab.hpi.de/codeocean/codemoon/poseidon/pkg/logging"
 	"gopkg.in/yaml.v3"
 	"net/url"
 	"os"
--- a/internal/config/config_test.go
+++ b/internal/config/config_test.go
--- a/internal/environment/manager.go
+++ b/internal/environment/manager.go
@ -6,10 +6,10 @@ import (
 	nomadApi "github.com/hashicorp/nomad/api"
 	"github.com/hashicorp/nomad/jobspec2"
 	"github.com/hashicorp/nomad/nomad/structs"
-	"gitlab.hpi.de/codeocean/codemoon/poseidon/api/dto"
-	"gitlab.hpi.de/codeocean/codemoon/poseidon/logging"
-	"gitlab.hpi.de/codeocean/codemoon/poseidon/nomad"
-	"gitlab.hpi.de/codeocean/codemoon/poseidon/runner"
+	"gitlab.hpi.de/codeocean/codemoon/poseidon/internal/nomad"
+	"gitlab.hpi.de/codeocean/codemoon/poseidon/internal/runner"
+	"gitlab.hpi.de/codeocean/codemoon/poseidon/pkg/dto"
+	"gitlab.hpi.de/codeocean/codemoon/poseidon/pkg/logging"
 	"strconv"
 )

--- a/internal/environment/manager_mock.go
+++ b/internal/environment/manager_mock.go
@ -4,9 +4,9 @@ package environment

 import (
 	mock "github.com/stretchr/testify/mock"
-	dto "gitlab.hpi.de/codeocean/codemoon/poseidon/api/dto"
+	dto "gitlab.hpi.de/codeocean/codemoon/poseidon/pkg/dto"

-	runner "gitlab.hpi.de/codeocean/codemoon/poseidon/runner"
+	runner "gitlab.hpi.de/codeocean/codemoon/poseidon/internal/runner"
 )

 // ManagerMock is an autogenerated mock type for the Manager type
--- a/internal/environment/manager_test.go
+++ b/internal/environment/manager_test.go
@ -7,9 +7,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/suite"
-	"gitlab.hpi.de/codeocean/codemoon/poseidon/api/dto"
-	"gitlab.hpi.de/codeocean/codemoon/poseidon/nomad"
-	"gitlab.hpi.de/codeocean/codemoon/poseidon/runner"
+	"gitlab.hpi.de/codeocean/codemoon/poseidon/internal/nomad"
+	"gitlab.hpi.de/codeocean/codemoon/poseidon/internal/runner"
+	"gitlab.hpi.de/codeocean/codemoon/poseidon/pkg/dto"
 	"gitlab.hpi.de/codeocean/codemoon/poseidon/tests"
 	"testing"
 )
--- a/internal/environment/template-environment-job.hcl
+++ b/internal/environment/template-environment-job.hcl
--- a/internal/nomad/api_querier.go
+++ b/internal/nomad/api_querier.go
--- a/internal/nomad/api_querier_mock.go
+++ b/internal/nomad/api_querier_mock.go
--- a/internal/nomad/executor_api_mock.go
+++ b/internal/nomad/executor_api_mock.go
--- a/internal/nomad/job.go
+++ b/internal/nomad/job.go
--- a/internal/nomad/job_test.go
+++ b/internal/nomad/job_test.go
--- a/internal/nomad/nomad.go
+++ b/internal/nomad/nomad.go
@ -6,9 +6,9 @@ import (
 	"fmt"
 	nomadApi "github.com/hashicorp/nomad/api"
 	"github.com/hashicorp/nomad/nomad/structs"
-	"gitlab.hpi.de/codeocean/codemoon/poseidon/config"
-	"gitlab.hpi.de/codeocean/codemoon/poseidon/logging"
-	"gitlab.hpi.de/codeocean/codemoon/poseidon/util"
+	"gitlab.hpi.de/codeocean/codemoon/poseidon/internal/config"
+	"gitlab.hpi.de/codeocean/codemoon/poseidon/pkg/logging"
+	"gitlab.hpi.de/codeocean/codemoon/poseidon/pkg/nullreader"
 	"io"
 	"net/url"
 	"strconv"
@ -348,7 +348,7 @@ func (a *APIClient) executeCommandInteractivelyWithStderr(allocationID string, c
 	go func() {
 		// Catch stderr in separate execution.
 		exit, err := a.Execute(allocationID, ctx, stderrFifoCommand(currentNanoTime), true,
-			util.NullReader{}, stderr, io.Discard)
+			nullreader.NullReader{}, stderr, io.Discard)
 		if err != nil {
 			log.WithError(err).WithField("runner", allocationID).Warn("Stderr task finished with error")
 		}
--- a/internal/nomad/nomad_test.go
+++ b/internal/nomad/nomad_test.go
@ -11,9 +11,9 @@ import (
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
-	"gitlab.hpi.de/codeocean/codemoon/poseidon/config"
+	"gitlab.hpi.de/codeocean/codemoon/poseidon/internal/config"
+	"gitlab.hpi.de/codeocean/codemoon/poseidon/pkg/nullreader"
 	"gitlab.hpi.de/codeocean/codemoon/poseidon/tests"
-	"gitlab.hpi.de/codeocean/codemoon/poseidon/util"
 	"io"
 	"net/url"
 	"regexp"
@ -678,7 +678,7 @@ func (s *ExecuteCommandTestSuite) TestWithSeparateStderr() {
 	})

 	exitCode, err := s.nomadAPIClient.
-		ExecuteCommand(s.allocationID, s.ctx, s.testCommandArray, withTTY, util.NullReader{}, &stdout, &stderr)
+		ExecuteCommand(s.allocationID, s.ctx, s.testCommandArray, withTTY, nullreader.NullReader{}, &stdout, &stderr)
 	s.Require().NoError(err)

 	s.apiMock.AssertNumberOfCalls(s.T(), "Execute", 2)
@ -709,7 +709,7 @@ func (s *ExecuteCommandTestSuite) TestWithSeparateStderrReturnsCommandError() {
 	s.mockExecute(s.testCommandArray, 1, tests.ErrDefault, func(args mock.Arguments) {})
 	s.mockExecute(mock.AnythingOfType("[]string"), 1, nil, func(args mock.Arguments) {})
 	_, err := s.nomadAPIClient.
-		ExecuteCommand(s.allocationID, s.ctx, s.testCommandArray, withTTY, util.NullReader{}, io.Discard, io.Discard)
+		ExecuteCommand(s.allocationID, s.ctx, s.testCommandArray, withTTY, nullreader.NullReader{}, io.Discard, io.Discard)
 	s.Equal(tests.ErrDefault, err)
 }

@ -731,7 +731,7 @@ func (s *ExecuteCommandTestSuite) TestWithoutSeparateStderr() {
 	})

 	exitCode, err := s.nomadAPIClient.
-		ExecuteCommand(s.allocationID, s.ctx, s.testCommandArray, withTTY, util.NullReader{}, &stdout, &stderr)
+		ExecuteCommand(s.allocationID, s.ctx, s.testCommandArray, withTTY, nullreader.NullReader{}, &stdout, &stderr)
 	s.Require().NoError(err)

 	s.apiMock.AssertNumberOfCalls(s.T(), "Execute", 1)
@ -744,7 +744,7 @@ func (s *ExecuteCommandTestSuite) TestWithoutSeparateStderrReturnsCommandError()
 	config.Config.Server.InteractiveStderr = false
 	s.mockExecute(s.testCommandArray, 1, tests.ErrDefault, func(args mock.Arguments) {})
 	_, err := s.nomadAPIClient.
-		ExecuteCommand(s.allocationID, s.ctx, s.testCommandArray, withTTY, util.NullReader{}, io.Discard, io.Discard)
+		ExecuteCommand(s.allocationID, s.ctx, s.testCommandArray, withTTY, nullreader.NullReader{}, io.Discard, io.Discard)
 	s.ErrorIs(err, tests.ErrDefault)
 }

--- a/internal/runner/constants_test.go
+++ b/internal/runner/constants_test.go
--- a/internal/runner/execution_storage.go
+++ b/internal/runner/execution_storage.go
@ -1,7 +1,7 @@
 package runner

 import (
-	"gitlab.hpi.de/codeocean/codemoon/poseidon/api/dto"
+	"gitlab.hpi.de/codeocean/codemoon/poseidon/pkg/dto"
 	"sync"
 )

--- a/internal/runner/inactivity_timer_mock.go
+++ b/internal/runner/inactivity_timer_mock.go
--- a/internal/runner/manager.go
+++ b/internal/runner/manager.go
@ -7,8 +7,8 @@ import (
 	"github.com/google/uuid"
 	nomadApi "github.com/hashicorp/nomad/api"
 	"github.com/sirupsen/logrus"
-	"gitlab.hpi.de/codeocean/codemoon/poseidon/logging"
-	"gitlab.hpi.de/codeocean/codemoon/poseidon/nomad"
+	"gitlab.hpi.de/codeocean/codemoon/poseidon/internal/nomad"
+	"gitlab.hpi.de/codeocean/codemoon/poseidon/pkg/logging"
 	"strconv"
 	"strings"
 	"time"
--- a/internal/runner/manager_mock.go
+++ b/internal/runner/manager_mock.go
--- a/internal/runner/manager_test.go
+++ b/internal/runner/manager_test.go
@ -7,7 +7,7 @@ import (
 	"github.com/sirupsen/logrus/hooks/test"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/suite"
-	"gitlab.hpi.de/codeocean/codemoon/poseidon/nomad"
+	"gitlab.hpi.de/codeocean/codemoon/poseidon/internal/nomad"
 	"gitlab.hpi.de/codeocean/codemoon/poseidon/tests"
 	"gitlab.hpi.de/codeocean/codemoon/poseidon/tests/helpers"
 	"strconv"
--- a/internal/runner/nomad_environment_storage.go
+++ b/internal/runner/nomad_environment_storage.go
--- a/internal/runner/nomad_environment_storage_test.go
+++ b/internal/runner/nomad_environment_storage_test.go
--- a/internal/runner/runner.go
+++ b/internal/runner/runner.go
@ -8,8 +8,8 @@ import (
 	"errors"
 	"fmt"
 	nomadApi "github.com/hashicorp/nomad/api"
-	"gitlab.hpi.de/codeocean/codemoon/poseidon/api/dto"
-	"gitlab.hpi.de/codeocean/codemoon/poseidon/nomad"
+	"gitlab.hpi.de/codeocean/codemoon/poseidon/internal/nomad"
+	"gitlab.hpi.de/codeocean/codemoon/poseidon/pkg/dto"
 	"io"
 	"strings"
 	"sync"
--- a/internal/runner/runner_mock.go
+++ b/internal/runner/runner_mock.go
@ -6,7 +6,7 @@ import (
 	context "context"
 	io "io"

-	dto "gitlab.hpi.de/codeocean/codemoon/poseidon/api/dto"
+	dto "gitlab.hpi.de/codeocean/codemoon/poseidon/pkg/dto"

 	mock "github.com/stretchr/testify/mock"

--- a/internal/runner/runner_test.go
+++ b/internal/runner/runner_test.go
@ -10,8 +10,8 @@ import (
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
-	"gitlab.hpi.de/codeocean/codemoon/poseidon/api/dto"
-	"gitlab.hpi.de/codeocean/codemoon/poseidon/nomad"
+	"gitlab.hpi.de/codeocean/codemoon/poseidon/internal/nomad"
+	"gitlab.hpi.de/codeocean/codemoon/poseidon/pkg/dto"
 	"gitlab.hpi.de/codeocean/codemoon/poseidon/tests"
 	"io"
 	"regexp"
--- a/internal/runner/storage.go
+++ b/internal/runner/storage.go
--- a/internal/runner/storage_test.go
+++ b/internal/runner/storage_test.go
@ -2,7 +2,7 @@ package runner

 import (
 	"github.com/stretchr/testify/suite"
-	"gitlab.hpi.de/codeocean/codemoon/poseidon/api/dto"
+	"gitlab.hpi.de/codeocean/codemoon/poseidon/pkg/dto"
 	"gitlab.hpi.de/codeocean/codemoon/poseidon/tests"
 	"testing"
 )
--- a/pkg/dto/dto.go
+++ b/pkg/dto/dto.go
--- a/pkg/logging/logging.go
+++ b/pkg/logging/logging.go
--- a/pkg/logging/logging_test.go
+++ b/pkg/logging/logging_test.go
--- a/pkg/nullreader/nullreader.go
+++ b/pkg/nullreader/nullreader.go
@ -1,4 +1,4 @@
-package util
+package nullreader

 // NullReader is a struct that implements the io.Reader interface and returns nothing when reading
 // from it.
--- a/pkg/nullreader/nullreader_test.go
+++ b/pkg/nullreader/nullreader_test.go
@ -1,4 +1,4 @@
-package util
+package nullreader

 import (
 	"github.com/stretchr/testify/assert"
--- a/tests/constants.go
+++ b/tests/constants.go
@ -3,7 +3,7 @@ package tests
 import (
 	"errors"
 	nomadApi "github.com/hashicorp/nomad/api"
-	"gitlab.hpi.de/codeocean/codemoon/poseidon/api/dto"
+	"gitlab.hpi.de/codeocean/codemoon/poseidon/pkg/dto"
 	"time"
 )

--- a/tests/e2e/e2e_test.go
+++ b/tests/e2e/e2e_test.go
@ -4,10 +4,10 @@ import (
 	"flag"
 	nomadApi "github.com/hashicorp/nomad/api"
 	"github.com/stretchr/testify/suite"
-	"gitlab.hpi.de/codeocean/codemoon/poseidon/api"
-	"gitlab.hpi.de/codeocean/codemoon/poseidon/api/dto"
-	"gitlab.hpi.de/codeocean/codemoon/poseidon/config"
-	"gitlab.hpi.de/codeocean/codemoon/poseidon/logging"
+	"gitlab.hpi.de/codeocean/codemoon/poseidon/internal/api"
+	"gitlab.hpi.de/codeocean/codemoon/poseidon/internal/config"
+	"gitlab.hpi.de/codeocean/codemoon/poseidon/pkg/dto"
+	"gitlab.hpi.de/codeocean/codemoon/poseidon/pkg/logging"
 	"gitlab.hpi.de/codeocean/codemoon/poseidon/tests"
 	"gitlab.hpi.de/codeocean/codemoon/poseidon/tests/helpers"
 	"net/http"
--- a/tests/e2e/environments_test.go
+++ b/tests/e2e/environments_test.go
@ -4,9 +4,9 @@ import (
 	nomadApi "github.com/hashicorp/nomad/api"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"gitlab.hpi.de/codeocean/codemoon/poseidon/api"
-	"gitlab.hpi.de/codeocean/codemoon/poseidon/api/dto"
-	"gitlab.hpi.de/codeocean/codemoon/poseidon/runner"
+	"gitlab.hpi.de/codeocean/codemoon/poseidon/internal/api"
+	"gitlab.hpi.de/codeocean/codemoon/poseidon/internal/runner"
+	"gitlab.hpi.de/codeocean/codemoon/poseidon/pkg/dto"
 	"gitlab.hpi.de/codeocean/codemoon/poseidon/tests"
 	"gitlab.hpi.de/codeocean/codemoon/poseidon/tests/helpers"
 	"io"
--- a/tests/e2e/health_test.go
+++ b/tests/e2e/health_test.go
@ -2,7 +2,7 @@ package e2e

 import (
 	"github.com/stretchr/testify/assert"
-	"gitlab.hpi.de/codeocean/codemoon/poseidon/api"
+	"gitlab.hpi.de/codeocean/codemoon/poseidon/internal/api"
 	"gitlab.hpi.de/codeocean/codemoon/poseidon/tests/helpers"
 	"net/http"
 	"testing"
--- a/tests/e2e/runners_test.go
+++ b/tests/e2e/runners_test.go
@ -5,8 +5,8 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/gorilla/websocket"
-	"gitlab.hpi.de/codeocean/codemoon/poseidon/api"
-	"gitlab.hpi.de/codeocean/codemoon/poseidon/api/dto"
+	"gitlab.hpi.de/codeocean/codemoon/poseidon/internal/api"
+	"gitlab.hpi.de/codeocean/codemoon/poseidon/pkg/dto"
 	"gitlab.hpi.de/codeocean/codemoon/poseidon/tests"
 	"gitlab.hpi.de/codeocean/codemoon/poseidon/tests/helpers"
 	"io"
--- a/tests/e2e/websocket_test.go
+++ b/tests/e2e/websocket_test.go
@ -7,9 +7,9 @@ import (
 	"fmt"
 	"github.com/gorilla/websocket"
 	"github.com/stretchr/testify/suite"
-	"gitlab.hpi.de/codeocean/codemoon/poseidon/api"
-	"gitlab.hpi.de/codeocean/codemoon/poseidon/api/dto"
-	"gitlab.hpi.de/codeocean/codemoon/poseidon/nomad"
+	"gitlab.hpi.de/codeocean/codemoon/poseidon/internal/api"
+	"gitlab.hpi.de/codeocean/codemoon/poseidon/internal/nomad"
+	"gitlab.hpi.de/codeocean/codemoon/poseidon/pkg/dto"
 	"gitlab.hpi.de/codeocean/codemoon/poseidon/tests"
 	"gitlab.hpi.de/codeocean/codemoon/poseidon/tests/helpers"
 	"net/http"
--- a/tests/helpers/test_helpers.go
+++ b/tests/helpers/test_helpers.go
@ -10,8 +10,8 @@ import (
 	"github.com/gorilla/mux"
 	"github.com/gorilla/websocket"
 	nomadApi "github.com/hashicorp/nomad/api"
-	"gitlab.hpi.de/codeocean/codemoon/poseidon/api/dto"
-	"gitlab.hpi.de/codeocean/codemoon/poseidon/config"
+	"gitlab.hpi.de/codeocean/codemoon/poseidon/internal/config"
+	"gitlab.hpi.de/codeocean/codemoon/poseidon/pkg/dto"
 	"gitlab.hpi.de/codeocean/codemoon/poseidon/tests"
 	"io"
 	"net/http"