@@ -12,4 +12,4 @@ jobs:
       - uses: actions/setup-go@v2
         with:
           go-version: '^1.16.0'
-      - run: go test
+      - run: go test ./... --tags=test
@@ -2,4 +2,3 @@ config/
 data/
 .idea/
 Gokapi
-test/
@@ -10,7 +10,7 @@ RUN cd /compile && go mod download
 
 COPY . /compile  
 
-RUN cd /compile && go generate && CGO_ENABLED=0 go build -ldflags="-s -w -X 'Gokapi/internal/environment.IsDocker=true' -X 'Gokapi/internal/environment.Builder=Project Docker File' -X 'Gokapi/internal/environment.BuildTime=$(date)'" -o /compile/gokapi
+RUN cd /compile && go generate Gokapi/cmd/gokapi && CGO_ENABLED=0 go build -ldflags="-s -w -X 'Gokapi/internal/environment.IsDocker=true' -X 'Gokapi/internal/environment.Builder=Project Docker File' -X 'Gokapi/internal/environment.BuildTime=$(date)'" -o /compile/gokapi Gokapi/cmd/gokapi
 
 FROM alpine:3.13
 
 
@@ -29,7 +29,7 @@ Download Link![image](https://user-images.githubusercontent.com/1593467/11347760
 
 ### Bare Metal
 
-Simply download the latest release for your platform and execute the binary (recommended). If you want to compile the source yourself, clone this repository and execute `go build`.
+Simply download the latest release for your platform and execute the binary (recommended). If you want to compile the source yourself, clone this repository and execute `go build Gokapi/cmd/gokapi` (requires Go 1.16+).
 
 ### Docker
 
@@ -94,7 +94,7 @@ By default, all files are included in the executable. If you want to change the
 * Copy either the folder `static`, `templates` or both from the `web` folder to the directory where the executable is located
 * Make changes to the folders. `static` contains images, CSS files and JavaScript. `templates` contains the HTML code.
 * Restart the server. If the folders exist, the server will use the local files instead of the embedded files
-* Optional: To embed the files permanently, the executable needs to be recompiled with `go build`.
+* Optional: To embed the files permanently, copy the modified files back to the original folders and recompiled with `go build Gokapi/cmd/gokapi`.
 
 
 ## Contributors
 
@@ -6,18 +6,18 @@ set -e
 targets=${@-"darwin/amd64 linux/amd64 linux/386 linux/arm linux/arm64 windows/amd64 windows/386"}
 
 cd /usr/src/myapp
-go generate
+go generate Gokapi/cmd/gokapi
 
 for target in $targets; do
   os="$(echo $target | cut -d '/' -f1)"
   arch="$(echo $target | cut -d '/' -f2)"
-  output=".release/gokapi-${os}_${arch}"
+  output="build/gokapi-${os}_${arch}"
   if [ $os = "windows" ]; then
     output+='.exe'
   fi
 
   echo "----> Building project for: $target"
-  GOOS=$os GOARCH=$arch CGO_ENABLED=0 go build -ldflags="-s -w -X 'Gokapi/internal/environment.Builder=Github Release Builder' -X 'Gokapi/internal/environment.BuildTime=$(date)'" -o $output
+  GOOS=$os GOARCH=$arch CGO_ENABLED=0 go build -ldflags="-s -w -X 'Gokapi/internal/environment.Builder=Github Release Builder' -X 'Gokapi/internal/environment.BuildTime=$(date)'" -o $output Gokapi/cmd/gokapi
   zip -j $output.zip $output > /dev/null
   rm $output
 done
 
@@ -1,4 +1,4 @@
 #!/bin/sh
 #Called by go generate
 #Sets the version number in the template automatically
- sed -i 's/{{define "version"}}.*{{end}}/{{define "version"}}'$1'{{end}}/g' ./web/templates/string_constants.tmpl
+ sed -i 's/{{define "version"}}.*{{end}}/{{define "version"}}'$1'{{end}}/g' ../../internal/webserver/web/templates/string_constants.tmpl
@@ -9,7 +9,6 @@ import (
 	"Gokapi/internal/environment"
 	"Gokapi/internal/storage"
 	"Gokapi/internal/webserver"
-	"embed"
 	"fmt"
 	"math/rand"
 	"os"
@@ -20,7 +19,7 @@ import (
 // The go generate call below needs to be modified as well
 const Version = "1.1.4-dev"
 
-//go:generate sh "./build/setVersionTemplate.sh" "1.1.4-dev"
+//go:generate sh "../../build/setVersionTemplate.sh" "1.1.4-dev"
 
 // Main routine that is called on startup
 func main() {
@@ -31,7 +30,7 @@ func main() {
 	configuration.Load()
 	checkArguments()
 	go storage.CleanUp(true)
-	webserver.Start(&StaticFolderEmbedded, &TemplateFolderEmbedded, true)
+	webserver.Start()
 }
 
 // Checks for command line arguments that have to be parsed before loading the configuration
@@ -59,16 +58,6 @@ func checkArguments() {
 	}
 }
 
-// StaticFolderEmbedded is the embedded version of the "static" folder
-// This contains JS files, CSS, images etc
-//go:embed web/static
-var StaticFolderEmbedded embed.FS
-
-// TemplateFolderEmbedded is the embedded version of the "templates" folder
-// This contains templates that Gokapi uses for creating the HTML output
-//go:embed web/templates
-var TemplateFolderEmbedded embed.FS
-
 // ASCII art logo
 const logo = `
 ██████   ██████  ██   ██  █████  ██████  ██ 
 
@@ -3,6 +3,7 @@ module Gokapi
 go 1.16
 
 require (
+	github.com/otiai10/copy v1.5.1
 	golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83
 	golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect
 )
@@ -1,10 +1,10 @@
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
-github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/otiai10/copy v1.5.1 h1:a/cs2E1/1V0az8K5nblbl+ymEa4E11AfaOLMar8V34w=
+github.com/otiai10/copy v1.5.1/go.mod h1:XWfuS3CrI0R6IE0FbgHsEazaXO8G0LpMp9o8tos0x4E=
+github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95/go.mod h1:9qAhocn7zKJG+0mI8eUu6xqkFDYS2kb2saOteoSB3cE=
+github.com/otiai10/curr v1.0.0/go.mod h1:LskTG5wDwr8Rs+nNQ+1LlxRjAtTZZjtJW4rMXl6j4vs=
+github.com/otiai10/mint v1.3.0/go.mod h1:F5AjcsTsWUqX+Na9fpHb52P8pcRX2CI6A3ctIT91xUo=
+github.com/otiai10/mint v1.3.2 h1:VYWnrP5fXmz1MXvjuUvcBrXSjGE6xjON+axB/UrpO3E=
+github.com/otiai10/mint v1.3.2/go.mod h1:/yxELlJQ0ufhjUwhshSj+wFjZ78CnZ48/1wtmBH1OTc=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 h1:/ZScEX8SfEmUGRHs0gxpqteO5nfNW6axyZbBdw9A12g=
 golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
@@ -17,7 +17,3 @@ golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXR
 golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d h1:SZxvLBoTP5yHO3Frd4z4vrF+DBX9vMVanchswa69toE=
 golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-Original file line number
+Diff line change
@@ @@ -2,4 +2,3 @@ config/ @@
 data/
 .idea/
 Gokapi
 -test/
Original file line number	Diff line number	Diff line change
@@ -3,6 +3,7 @@ module Gokapi
3	3	go 1.16
4	4
5	5	require (
	6	+ github.com/otiai10/copy v1.5.1
6	7	golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83
7	8	golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect
8	9	)