diff --git a/cmd/svg-templater/main.go b/cmd/svg-templater/main.go
index d5dcb82..b6de69e 100644
--- a/cmd/svg-templater/main.go
+++ b/cmd/svg-templater/main.go
@@ -1,19 +1,10 @@
 package main
 
 import (
-	"flag"
-	"fmt"
 	"log"
-	"net/http"
 
+	"tomatentum.net/svg-templater/internal/command"
 	"tomatentum.net/svg-templater/internal/database"
-	svgtemplater "tomatentum.net/svg-templater/internal/svg-templater"
-	"tomatentum.net/svg-templater/pkg/auth"
-)
-
-var (
-	generateTokenFlag bool
-	deleteTokenFlag   bool
 )
 
 func main() {
@@ -23,30 +14,6 @@ func main() {
 	}
 	defer database.Close()
 	database.InitDB()
-	prepareCommandLine()
-	prepareHTTP()
-	handleCommandline()
-}
-
-func prepareCommandLine() {
-	flag.BoolVar(&generateTokenFlag, "tokengen", false, "svg-templater --tokengen <name> : Generate token with name")
-	flag.BoolVar(&deleteTokenFlag, "tokendel", false, "svg-templater --tokendel <name> : Delete token with name")
-}
-
-func prepareHTTP() {
-	http.HandleFunc("/", auth.AuthMiddleware(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		fmt.Fprintln(w, "You are authorized!")
-	})))
-}
-
-func handleCommandline() {
-	flag.Parse()
-	if generateTokenFlag {
-		svgtemplater.GenerateTokenCommand()
-	} else if deleteTokenFlag {
-		svgtemplater.DeleteTokenCommand()
-	} else {
-		log.Println("Starting http server on :3000")
-		http.ListenAndServe(":3000", nil)
-	}
+	command.PrepareCommandLine()
+	command.HandleCommandline()
 }
diff --git a/internal/command/commandline.go b/internal/command/commandline.go
new file mode 100644
index 0000000..32b528b
--- /dev/null
+++ b/internal/command/commandline.go
@@ -0,0 +1,37 @@
+package command
+
+import (
+	"flag"
+
+	"tomatentum.net/svg-templater/internal/server"
+	"tomatentum.net/svg-templater/pkg/svg"
+)
+
+var (
+	help              bool
+	generateTokenFlag bool
+	deleteTokenFlag   bool
+	datapath          string
+)
+
+func PrepareCommandLine() {
+	flag.BoolVar(&help, "help", false, "Displays the help String")
+	flag.BoolVar(&generateTokenFlag, "tokengen", false, "Generate token with name")
+	flag.BoolVar(&deleteTokenFlag, "tokendel", false, "Delete token with name")
+	flag.StringVar(&datapath, "data", "/var/lib/svg-templater", "Override data directory")
+}
+
+func HandleCommandline() {
+	flag.Parse()
+	if generateTokenFlag {
+		GenerateTokenCommand()
+	} else if deleteTokenFlag {
+		DeleteTokenCommand()
+	} else if help {
+		flag.PrintDefaults()
+	} else {
+		svg.Storage = svg.NewFileStorage(datapath)
+		server.PrepareHTTP()
+		server.Start()
+	}
+}
diff --git a/internal/svg-templater/tokencommands.go b/internal/command/tokencommands.go
similarity index 96%
rename from internal/svg-templater/tokencommands.go
rename to internal/command/tokencommands.go
index 73b096d..44e0aaf 100644
--- a/internal/svg-templater/tokencommands.go
+++ b/internal/command/tokencommands.go
@@ -1,4 +1,4 @@
-package svgtemplater
+package command
 
 import (
 	"flag"
diff --git a/internal/database/database.go b/internal/database/database.go
index bb84d0b..64bb0a1 100644
--- a/internal/database/database.go
+++ b/internal/database/database.go
@@ -23,6 +23,7 @@ func OpenSQLite() error {
 
 func InitDB() {
 	_, err := database.Exec(TOKENTABLECREATE)
+	_, err = database.Exec(SVGTABLECREATE)
 	if err != nil {
 		log.Fatal("Failed to init database:\n", err)
 	}
diff --git a/internal/database/svgdb.go b/internal/database/svgdb.go
new file mode 100644
index 0000000..d91f2ee
--- /dev/null
+++ b/internal/database/svgdb.go
@@ -0,0 +1,28 @@
+package database
+
+import (
+	"encoding/json"
+
+	"tomatentum.net/svg-templater/pkg/svg"
+)
+
+const SVGTABLECREATE string = `
+	CREATE TABLE IF NOT EXISTS svg (
+		name varchar(16) PRIMARY KEY NOT NULL,
+		templatekeys longtext NOT NULL
+	);`
+
+const INSERTSVGSQL string = "INSERT INTO svg VALUES (?, ?);"
+
+func InsertSVG(data *svg.TemplateData) error {
+	json, err := json.Marshal(data.TemplateKeys)
+	if err != nil {
+		return err
+	}
+
+	if _, err := database.Exec(INSERTSVGSQL, data.Id, string(json)); err != nil {
+		return err
+	}
+
+	return nil
+}
diff --git a/internal/routes/upload.go b/internal/routes/upload.go
new file mode 100644
index 0000000..b3fbb92
--- /dev/null
+++ b/internal/routes/upload.go
@@ -0,0 +1,49 @@
+package routes
+
+import (
+	"bytes"
+	"encoding/json"
+	"io"
+	"log"
+	"net/http"
+
+	"tomatentum.net/svg-templater/pkg/svg/actions"
+)
+
+func CreateSVG(writer http.ResponseWriter, r http.Request) {
+
+	contentType := r.Header.Get("Content-Type")
+	if contentType != "image/svg+xml" {
+		http.Error(writer, "Incorrect Content-Type. Needs image/svg+xml.", http.StatusUnsupportedMediaType)
+		return
+	}
+
+	readsvg, err := io.ReadAll(r.Body)
+	if err != nil {
+		http.Error(writer, err.Error(), http.StatusInternalServerError)
+		log.Println("Error while reading Body\n", err)
+		return
+	}
+
+	if ok, err := validateSVG(readsvg); err != nil || !ok {
+		http.Error(writer, err.Error(), http.StatusUnsupportedMediaType)
+		log.Println("Wrong Media Type was uploaded\n", err)
+		return
+	}
+
+	data, err := actions.Create(readsvg)
+
+	if err != nil {
+		http.Error(writer, err.Error(), http.StatusInternalServerError)
+		log.Println("Failed creating SVG template\n", err)
+		return
+	}
+
+	writer.Header().Add("Content-Type", "application/json")
+	json.NewEncoder(writer).Encode(data)
+	log.Println("Created SVG Template " + data.Id)
+}
+
+func validateSVG(svgbuf []byte) (bool, error) {
+	return bytes.Contains(svgbuf[:512], []byte("<svg")), nil
+}
diff --git a/internal/server/http.go b/internal/server/http.go
new file mode 100644
index 0000000..ab2c96e
--- /dev/null
+++ b/internal/server/http.go
@@ -0,0 +1,35 @@
+package server
+
+import (
+	"fmt"
+	"log"
+	"net/http"
+
+	"tomatentum.net/svg-templater/internal/routes"
+	"tomatentum.net/svg-templater/pkg/auth"
+)
+
+func PrepareHTTP() {
+	registerAuthorized("/", func(w http.ResponseWriter, r *http.Request) {
+		fmt.Fprintln(w, "You are authorized!")
+	})
+	registerAuthorized("/svg/", func(w http.ResponseWriter, r *http.Request) {
+		if r.Method != "POST" {
+			http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)
+			return
+		}
+		routes.CreateSVG(w, *r)
+	})
+}
+
+func Start() {
+	log.Println("Starting http server on :3000")
+	if err := http.ListenAndServe(":3000", nil); err != nil {
+		panic(err)
+	}
+}
+
+func registerAuthorized(path string, f func(w http.ResponseWriter, r *http.Request)) {
+	http.HandleFunc(path, auth.AuthMiddleware(http.HandlerFunc(f)))
+	log.Println("Registered authorized handler for", path)
+}
diff --git a/pkg/svg/actions/upload.go b/pkg/svg/actions/upload.go
new file mode 100644
index 0000000..a6d26a4
--- /dev/null
+++ b/pkg/svg/actions/upload.go
@@ -0,0 +1,50 @@
+package actions
+
+import (
+	"bytes"
+	"crypto/rand"
+	"encoding/hex"
+	"log"
+	"regexp"
+
+	"tomatentum.net/svg-templater/internal/database"
+	"tomatentum.net/svg-templater/pkg/svg"
+)
+
+func Create(svgbuf []byte) (svg.TemplateData, error) {
+	data := svg.TemplateData{Id: generateId(), TemplateKeys: nil}
+	populateKeys(&data, svgbuf)
+
+	_, err := svg.Storage.Create(data.Id, bytes.NewReader(svgbuf))
+	if err != nil {
+		return svg.TemplateData{}, err
+	}
+
+	if err := database.InsertSVG(&data); err != nil {
+		return svg.TemplateData{}, err
+	}
+
+	return data, nil
+}
+
+func populateKeys(data *svg.TemplateData, svg []byte) {
+	regex := regexp.MustCompile(`\{\{\s*(.*?)\s*\}\}`)
+	result := regex.FindAllSubmatch(svg, -1)
+	templateKeys := make([]string, len(result))
+
+	for i, matches := range result {
+		varname := matches[1] // first capture group
+		templateKeys[i] = string(varname)
+	}
+	data.TemplateKeys = templateKeys
+	log.Println("Found keys:\n", templateKeys)
+}
+
+func generateId() string {
+	token := make([]byte, 16)
+	if _, err := rand.Read(token); err != nil {
+		log.Fatal("Failed to generate Token:\n", err)
+		return ""
+	}
+	return hex.EncodeToString(token)
+}
diff --git a/pkg/svg/storage.go b/pkg/svg/storage.go
new file mode 100644
index 0000000..0531469
--- /dev/null
+++ b/pkg/svg/storage.go
@@ -0,0 +1,51 @@
+package svg
+
+import (
+	"io"
+	"log"
+	"os"
+	"path/filepath"
+)
+
+type SvgStorage interface {
+	Create(id string, svg io.Reader) (string, error)
+	Get(id string) (io.Reader, error)
+}
+
+type FileSvgStorage struct {
+	basepath string
+}
+
+func NewFileStorage(path string) *FileSvgStorage {
+	err := os.MkdirAll(path, 0755)
+	if err != nil {
+		panic(err)
+	}
+	log.Println("Initialized file storage handler")
+	return &FileSvgStorage{path}
+}
+
+func (f FileSvgStorage) Create(id string, svg io.Reader) (string, error) {
+	file, err := os.Create(filepath.Join(f.basepath, id+".svg"))
+
+	if err != nil {
+		return "", err
+	}
+	defer file.Close()
+
+	_, err = io.Copy(file, svg)
+	if err != nil {
+		return "", err
+	}
+
+	log.Println("Created File: ", file.Name())
+	return file.Name(), nil
+}
+
+func (f FileSvgStorage) Get(id string) (io.Reader, error) {
+	file, err := os.Open(filepath.Join(f.basepath, "svg", id+".svg"))
+	if err != nil {
+		return nil, err
+	}
+	return file, nil
+}
diff --git a/pkg/svg/templates.go b/pkg/svg/templates.go
new file mode 100644
index 0000000..398396e
--- /dev/null
+++ b/pkg/svg/templates.go
@@ -0,0 +1,8 @@
+package svg
+
+type TemplateData struct {
+	Id           string
+	TemplateKeys []string
+}
+
+var Storage SvgStorage