diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..19ace02
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+.env
+.swp
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..b82b4be
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,27 @@
+FROM golang:1.8
+
+#RUN apt-get update && apt-get install -y git sudo wget golang-go
+#ENV GOROOT=
+#ENV GOPATH=$HOME/work
+#ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin
+
+RUN go get github.com/rcrowley/go-tigertonic
+RUN go get github.com/alexedwards/scs
+RUN go get github.com/Jeffail/gabs
+RUN go get github.com/stretchr/testify/assert
+RUN go get github.com/go-sql-driver/mysql
+#RUN go get github.com/mr-ma/paper-review-go
+
+
+# clone paper review
+#WORKDIR /go/src/app
+WORKDIR /go/src/github
+RUN mkdir -p mr-ma/paper-review-go/
+WORKDIR /go/src/github/mr-ma/paper-review-go
+COPY . .
+#WORKDIR /$HOME/work/src/mr-ma
+#RUN git clone https://github.com/mr-ma/paper-review-go.git
+#WORKDIR /$HOME/work/src/mr-ma/paper-review-go
+RUN go build taxonomyserver.go
+#EXPOSE 8080
+#CMD "./taxonomyserver -mysqluser root -mysqlpass kB*6jd<KPa<M2x -listen 0.0.0.0:8080"
diff --git a/data/classification-driver.go b/data/classification-driver.go
index b06e7ef..02d4feb 100644
--- a/data/classification-driver.go
+++ b/data/classification-driver.go
@@ -8,8 +8,8 @@ import (
 	"strings"
 	//overriding MySqlDriver
 	//"github.com/go-sql-driver/mysql"
+	"../model"
 	"github.com/Jeffail/gabs"
-	"github.com/mr-ma/paper-review-go/model"
 )
 
 type ClassificationDriver interface {
@@ -104,8 +104,8 @@ type ClassificationDriver interface {
 }
 
 //InitMySQLDriver initialize a new my sql driver instance
-func InitClassificationDriver(user string, password string) ClassificationDriver {
-	return MySQLDriver{username: user, pass: password, database: "classification"}
+func InitClassificationDriver(user string, password string, server string) ClassificationDriver {
+	return MySQLDriver{username: user, pass: password, database: "classification", server: server}
 }
 
 func (d MySQLDriver) Login(email string, password string) (result model.LoginResult, err error) {
diff --git a/data/driver-core.go b/data/driver-core.go
index e79084f..d35162e 100644
--- a/data/driver-core.go
+++ b/data/driver-core.go
@@ -19,14 +19,16 @@ type MySQLDriver struct {
 	username string
 	pass     string
 	database string
+	server   string
 }
 
-
 //OpenDB opens a db connection
 func (d MySQLDriver) OpenDB() (*sql.DB, error) {
-	db, err := sql.Open("mysql", d.username+":"+d.pass+"@/"+d.database)
+	a := d.username + ":" + d.pass + "@" + d.server + "/" + d.database
+	fmt.Println(a)
+	db, err := sql.Open("mysql", d.username+":"+d.pass+"@("+d.server+")/"+d.database)
 	if err != nil {
-		checkErr(err)// Just for example purpose. You should use proper error handling instead of panic
+		checkErr(err) // Just for example purpose. You should use proper error handling instead of panic
 	}
 	return db, err
 }
@@ -44,7 +46,6 @@ func (d MySQLDriver) Query(query string) (*sql.DB, *sql.Stmt, error) {
 	return db, stmtOut, err
 }
 
-
 //Insert general insert function
 func (d MySQLDriver) Insert(tableName string, columns string, values ...interface{}) (affected int64, id int64, err error) {
 	db, err := d.OpenDB()
diff --git a/data/driver_test.go b/data/driver_test.go
index 4388935..f27113d 100644
--- a/data/driver_test.go
+++ b/data/driver_test.go
@@ -3,11 +3,12 @@ package data
 import (
 	"testing"
 
-	"github.com/mr-ma/paper-review-go/model"
+	"../model"
 	"github.com/stretchr/testify/assert"
 )
 
-var db = InitMySQLDriver("root","P$m7d2")
+var db = InitMySQLDriver("root", "P$m7d2")
+
 func TestInitMySQLDriver(t *testing.T) {
 	assert.NotNil(t, db)
 }
diff --git a/data/paper-review-driver.go b/data/paper-review-driver.go
index a35d7c5..50453d6 100644
--- a/data/paper-review-driver.go
+++ b/data/paper-review-driver.go
@@ -1,15 +1,16 @@
 package data
+
 import (
 	"errors"
 	"fmt"
 	"strconv"
 	//overriding MySqlDriver
+	"../model"
 	_ "github.com/go-sql-driver/mysql"
-	"github.com/mr-ma/paper-review-go/model"
 )
 
 type PaperReviewDriver interface {
-  DriverCore
+	DriverCore
 	InsertArticle(article model.Article, researchID int64) (int64, error)
 	InsertResearch(research model.Research) (int64, int64, error)
 	InsertTag(tag model.Tag) (affected int64, id int64, err error)
@@ -34,14 +35,11 @@ type PaperReviewDriver interface {
 	DeleteArticleVotes([]model.Article) (model.Result, error)
 }
 
-
 //InitMySQLDriver initialize a new my sql driver instance
 func InitPaperReviewDriver(user string, password string) PaperReviewDriver {
 	return MySQLDriver{username: user, pass: password, database: "classification"}
 }
 
-
-
 //SelectResearchWithArticles a research with it's associated articles
 func (d MySQLDriver) SelectResearchWithArticles(id int64) (r model.Research, err error) {
 	db, err := d.OpenDB()
@@ -365,7 +363,6 @@ func (d MySQLDriver) ReviewNumPapers(researchID int64, mitarbeiterID int64, limi
 	return articleArray, r, err
 }
 
-
 //InsertArticle insert publication
 func (d MySQLDriver) InsertArticle(article model.Article, researchID int64) (int64, error) {
 	affect, _, err := d.Insert("Articles", "Title=?,Authors=?,year=?,Cited_by=?,Keywords=?,Abstract=?,Journal=?,File=?,Source=?,ResearchId=?",
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..0e7b8a0
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,46 @@
+version: '3'
+volumes:
+  data-volume: {}
+services:
+  nginx:
+   container_name: some-nginx
+   image: nginx:alpine
+   restart: always
+   ports:
+   - 80:80
+   - 443:443
+   volumes:
+   - ./nginx/conf.d/nginx.conf:/etc/nginx/nginx.conf:ro
+   command: [nginx-debug, '-g', 'daemon off;']
+   depends_on:
+     - app
+
+  mysql:
+   container_name: some-mysql
+   image: mysql/mysql-server:5.7
+   hostname: mysql
+   ports:
+   - "3306:3306"
+   volumes:
+      - data-volume:/var/lib/mysql3
+      - ./SQLSchema/dumps/26_03_dump.sql:/docker-entrypoint-initdb.d/26_03_dump.sql
+   environment:
+     MYSQL_DATABASE: classification
+     MYSQL_ROOT_PASSWORD: ${ENV_MYSQL_ROOT_PASS}
+     MYSQL_ROOT_HOST: '%'
+   restart: always
+  app:
+    restart: always
+    hostname: taxonomy-tool
+    build: .
+    ports:
+      - "8081:8081"
+    expose:
+      - "8081"
+    env_file:
+      - .env
+    command: /go/src/github/mr-ma/paper-review-go/taxonomyserver -mysqluser root -mysqlpass ${ENV_MYSQL_ROOT_PASS} -mysqlserver mysql:3306 -listen 0.0.0.0:8081
+    depends_on:
+      - mysql
+    links:
+      - mysql
diff --git a/docker/Dockerfile b/docker/Dockerfile
deleted file mode 100644
index da6a7ab..0000000
--- a/docker/Dockerfile
+++ /dev/null
@@ -1,26 +0,0 @@
-FROM ubuntu:16.04
-
-RUN apt-get update && apt-get install -y git sudo wget golang-go
-
-ENV GOROOT=
-ENV GOPATH=$HOME/work
-ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin
-
-RUN go get github.com/rcrowley/go-tigertonic
-RUN go get github.com/alexedwards/scs
-RUN go get github.com/Jeffail/gabs
-RUN go get github.com/stretchr/testify/assert
-RUN go get github.com/go-sql-driver/mysql
-RUN go get github.com/mr-ma/paper-review-go
-
-
-# clone paper review
-WORKDIR /$HOME/work/src/github
-RUN mkdir mr-ma
-WORKDIR /$HOME/work/src/mr-ma
-RUN git clone https://github.com/mr-ma/paper-review-go.git -b felix
-WORKDIR /$HOME/work/src/mr-ma/paper-review-go
-
-RUN go build
-EXPOSE 8001
-CMD "./paper-review-go"
diff --git a/docker/READ.ME b/docker/READ.ME
deleted file mode 100644
index 5148f92..0000000
--- a/docker/READ.ME
+++ /dev/null
@@ -1,8 +0,0 @@
-#Build an image from the docker file
-docker build -t image-name .
-
-#Export port to the host (credits to https://github.com/wsargent/docker-cheat-sheet#exposing-ports)
-docker run -p 127.0.0.1:8001:8001 --name CONTAINER -t image-name
-
-#To expose the container's port on your localhost's port:
-iptables -t nat -A DOCKER -p tcp --dport <LOCALHOSTPORT> -j DNAT --to-destination <CONTAINERIP>:<PORT>
diff --git a/model/classification.go b/model/classification.go
index 6398425..90a594c 100644
--- a/model/classification.go
+++ b/model/classification.go
@@ -1,370 +1,370 @@
 package model
 
 type Taxonomy struct {
-	ID int `json:"id"`
-	Text string    `json:"text"`
-  Dimensions []Dimension `json:"dimensions"`
-}
-
-type Dimension struct{
-  ID int `json:"id"`
-  Text string  `json:"text"`
-  X string `json:"x"`
-  Y string `json:"y"`
-  XMajor string `json:"xMajor"`
-  YMajor string `json:"yMajor"`
-  Attributes []Attribute `json:"attributes"`
-}
-
-type Attribute struct{
-  ID int `json:"id"`
-  Text string  `json:"text"`
-  ParentID int `json:"parentID"`
-  ParentText string `json:"parentText"`
-  X string `json:"x"`
-  Y string `json:"y"`
-  XMajor string `json:"xMajor"`
-  YMajor string `json:"xMajor"`
-  X3D string `json:"x3D"`
-  Y3D string `json:"y3D"`
-  Z3D string `json:"z3D"`
-  XMajor3D string `json:"xMajor3D"`
-  YMajor3D string `json:"yMajor3D"`
-  ZMajor3D string `json:"zMajor3D"`
-  Major int8 `json:"major"`
-  Dimension string `json:"dimension"`
-  MappedPapers []Paper `json:"papers"`
-  Relations []Relation `json:"relations"`
-  Synonyms string `json:"synonyms"`
-  PaperIDs []int `json:"paperIDs"`
+	ID         int         `json:"id"`
+	Text       string      `json:"text"`
+	Dimensions []Dimension `json:"dimensions"`
+}
+
+type Dimension struct {
+	ID         int         `json:"id"`
+	Text       string      `json:"text"`
+	X          string      `json:"x"`
+	Y          string      `json:"y"`
+	XMajor     string      `json:"xMajor"`
+	YMajor     string      `json:"yMajor"`
+	Attributes []Attribute `json:"attributes"`
+}
+
+type Attribute struct {
+	ID           int        `json:"id"`
+	Text         string     `json:"text"`
+	ParentID     int        `json:"parentID"`
+	ParentText   string     `json:"parentText"`
+	X            string     `json:"x"`
+	Y            string     `json:"y"`
+	XMajor       string     `json:"xMajor"`
+	YMajor       string     `json:"xMajor"`
+	X3D          string     `json:"x3D"`
+	Y3D          string     `json:"y3D"`
+	Z3D          string     `json:"z3D"`
+	XMajor3D     string     `json:"xMajor3D"`
+	YMajor3D     string     `json:"yMajor3D"`
+	ZMajor3D     string     `json:"zMajor3D"`
+	Major        int8       `json:"major"`
+	Dimension    string     `json:"dimension"`
+	MappedPapers []Paper    `json:"papers"`
+	Relations    []Relation `json:"relations"`
+	Synonyms     string     `json:"synonyms"`
+	PaperIDs     []int      `json:"paperIDs"`
 }
 type Paper struct {
-  ID int `json:"id"`
-  Citation string `json:"citation"`
-  Text string `json:"text"`
-  Attributes []Attribute `json:"attributes"`
-	StrAttributes string `json:"str_attributes"`
-	Bib string `json:"bib"`
-  ReferenceCount int64 `json:"referenceCount"`
-  OccurrenceCount int64 `json:"occurrenceCount"`
+	ID              int         `json:"id"`
+	Citation        string      `json:"citation"`
+	Text            string      `json:"text"`
+	Attributes      []Attribute `json:"attributes"`
+	StrAttributes   string      `json:"str_attributes"`
+	Bib             string      `json:"bib"`
+	ReferenceCount  int64       `json:"referenceCount"`
+	OccurrenceCount int64       `json:"occurrenceCount"`
 }
 
 type Position struct {
-  ID string `json:"id"`
-  Text string `json:"text"`
-  Table string `json:"table"`
-  X string `json:"x"`
-  Y string `json:"y"`
-  Z string `json:"z"`
-  XMajor string `json:"xMajor"`
-  YMajor string `json:"yMajor"`
-  ZMajor string `json:"zMajor"`
+	ID     string `json:"id"`
+	Text   string `json:"text"`
+	Table  string `json:"table"`
+	X      string `json:"x"`
+	Y      string `json:"y"`
+	Z      string `json:"z"`
+	XMajor string `json:"xMajor"`
+	YMajor string `json:"yMajor"`
+	ZMajor string `json:"zMajor"`
 }
 
 type CitationMapping struct {
-  Citation string `json:"citation"`
-  Attribute string `json:"attribute"`
-  PaperID int `json:"paper_id"`
-  Bib string `json:"bib"`
-  OccurrenceCount int `json:"occurrenceCount"`
-  ReferenceCount int `json:"referenceCount"`
-  Author string `json:"author"`
-  Keywords string `json:"keywords"`
+	Citation        string `json:"citation"`
+	Attribute       string `json:"attribute"`
+	PaperID         int    `json:"paper_id"`
+	Bib             string `json:"bib"`
+	OccurrenceCount int    `json:"occurrenceCount"`
+	ReferenceCount  int    `json:"referenceCount"`
+	Author          string `json:"author"`
+	Keywords        string `json:"keywords"`
 }
 
 type FileRequest struct {
-  Path string `json:"path"`
+	Path string `json:"path"`
 }
 
 type CitationRequest struct {
-  TaxonomyID int64 `json:"taxonomy_id"`
-  Citation string `json:"citation"`
+	TaxonomyID int64  `json:"taxonomy_id"`
+	Citation   string `json:"citation"`
 }
 
 type AttributeRequest struct {
-  TaxonomyID int64 `json:"taxonomy_id"`
-  Text string `json:"text"`
-  X string `json:"x"`
-  Y string `json:"y"`
-  XMajor string `json:"xMajor"`
-  YMajor string `json:"xMajor"`
-  Major int8 `json:"major"`
-  Dimension string `json:"dimension"`
+	TaxonomyID int64  `json:"taxonomy_id"`
+	Text       string `json:"text"`
+	X          string `json:"x"`
+	Y          string `json:"y"`
+	XMajor     string `json:"xMajor"`
+	YMajor     string `json:"xMajor"`
+	Major      int8   `json:"major"`
+	Dimension  string `json:"dimension"`
 }
 
 type DimensionRequest struct {
-  TaxonomyID int64 `json:"taxonomy_id"`
-  Text string `json:"text"`
+	TaxonomyID int64  `json:"taxonomy_id"`
+	Text       string `json:"text"`
 }
 
 type ChangeDimensionRequest struct {
-  TaxonomyID int64 `json:"taxonomy_id"`
-  Attribute string `json:"attribute"`
-  Dimension string `json:"dimension"`
-  Position Position `json:"position"`
+	TaxonomyID int64    `json:"taxonomy_id"`
+	Attribute  string   `json:"attribute"`
+	Dimension  string   `json:"dimension"`
+	Position   Position `json:"position"`
 }
 
 type CorrelationRequest struct {
-	TaxonomyID int64 `json:"taxonomy_id"`
+	TaxonomyID int64       `json:"taxonomy_id"`
 	Attributes []Attribute `json:"attributes"`
 }
 
 type RenameAttributeRequest struct {
-  TaxonomyID int64 `json:"taxonomy_id"`
-  PreviousName string `json:"previousName"`
-  NewName string `json:"newName"`
+	TaxonomyID   int64  `json:"taxonomy_id"`
+	PreviousName string `json:"previousName"`
+	NewName      string `json:"newName"`
 }
 
 type UpdateSynonymsRequest struct {
-  TaxonomyID int64 `json:"taxonomy_id"`
-  Attribute string `json:"attribute"`
-  Synonyms string `json:"synonyms"`
+	TaxonomyID int64  `json:"taxonomy_id"`
+	Attribute  string `json:"attribute"`
+	Synonyms   string `json:"synonyms"`
 }
 
 type AttributeRelationsRequest struct {
-  TaxonomyID int64 `json:"taxonomy_id"`
-  AttributeSrc string `json:"attributeSrc"`
-  AttributeDest string `json:"attributeDest"`
-  Text string `json:"text"`
-  Dimension string `json:"dimension"`
-  MinValue int64 `json:"minValue"`
-  MaxValue int64 `json:"maxValue"`
+	TaxonomyID    int64  `json:"taxonomy_id"`
+	AttributeSrc  string `json:"attributeSrc"`
+	AttributeDest string `json:"attributeDest"`
+	Text          string `json:"text"`
+	Dimension     string `json:"dimension"`
+	MinValue      int64  `json:"minValue"`
+	MaxValue      int64  `json:"maxValue"`
 }
 
 type ReviewMapping struct {
-  Attribute string `json:"attribute"`
-  ArticleID int `json:"articleID"`
+	Attribute string `json:"attribute"`
+	ArticleID int    `json:"articleID"`
 }
 
 type SaveReviewMappingsRequest struct {
-  TaxonomyID int64 `json:"taxonomy_id"`
-  Attributes []Attribute `json:"attributes"`
-  Mappings []ReviewMapping `json:"mappings"`
+	TaxonomyID int64           `json:"taxonomy_id"`
+	Attributes []Attribute     `json:"attributes"`
+	Mappings   []ReviewMapping `json:"mappings"`
 }
 
 type TaxonomyRequest struct {
-  TaxonomyID int64 `json:"taxonomy_id"`
+	TaxonomyID int64 `json:"taxonomy_id"`
 }
 
 type TaxonomyPermissionsRequest struct {
-  Email string `json:"email"`
-  Permissions string `json:"permissions"`
+	Email       string `json:"email"`
+	Permissions string `json:"permissions"`
 }
 
 type TaxonomyIDRequest struct {
-  Text string `json:"text"`
+	Text string `json:"text"`
 }
 
 type AddTaxonomyRequest struct {
-  Taxonomy string `json:"taxonomy"`
-  Dimension string `json:"dimension"`
+	Taxonomy  string `json:"taxonomy"`
+	Dimension string `json:"dimension"`
 }
 
 type AllChildrenAttributesRequest struct {
-  TaxonomyID int64 `json:"taxonomy_id"`
-  Parent string `json:"parent"`
+	TaxonomyID int64  `json:"taxonomy_id"`
+	Parent     string `json:"parent"`
 }
 
 type SavePositionsRequest struct {
-  TaxonomyID int64 `json:"taxonomy_id"`
-  Positions []Position `json:"positions"`
+	TaxonomyID int64      `json:"taxonomy_id"`
+	Positions  []Position `json:"positions"`
 }
 
 type SaveEdgeBendPointsRequest struct {
-  TaxonomyID int64 `json:"taxonomy_id"`
-  AttributeSrc string `json:"attributeSrc"`
-  AttributeDest string `json:"attributeDest"`
-  EdgeBendPoints string `json:"edgeBendPoints"`
-  Dimension string `json:"dimension"`
+	TaxonomyID     int64  `json:"taxonomy_id"`
+	AttributeSrc   string `json:"attributeSrc"`
+	AttributeDest  string `json:"attributeDest"`
+	EdgeBendPoints string `json:"edgeBendPoints"`
+	Dimension      string `json:"dimension"`
 }
 
 type CitationsPerAttributeRequest struct {
-  TaxonomyID int64 `json:"taxonomy_id"`
-  Attribute string `json:"attribute"`
+	TaxonomyID int64  `json:"taxonomy_id"`
+	Attribute  string `json:"attribute"`
 }
 
 type UpdateCitationMappingRequest struct {
-  TaxonomyID int64 `json:"taxonomy_id"`
-  Attribute string `json:"attribute"`
-  Citations []Paper `json:"citations"`
+	TaxonomyID int64   `json:"taxonomy_id"`
+	Attribute  string  `json:"attribute"`
+	Citations  []Paper `json:"citations"`
 }
 
 type UpdateCitationMappingsRequest struct {
-  TaxonomyID int64 `json:"taxonomy_id"`
-  Mappings []CitationMapping `json:"mappings"`
+	TaxonomyID int64             `json:"taxonomy_id"`
+	Mappings   []CitationMapping `json:"mappings"`
 }
 
 type SharedPapersRequest struct {
-  TaxonomyID int64 `json:"taxonomy_id"`
-  Text1 string `json:"text1"`
-  Text2 string `json:"text2"`
-  Text3 string `json:"text3"`
+	TaxonomyID int64  `json:"taxonomy_id"`
+	Text1      string `json:"text1"`
+	Text2      string `json:"text2"`
+	Text3      string `json:"text3"`
 }
 
 type AttributesByNameRequest struct {
-  TaxonomyID int64 `json:"taxonomy_id"`
-  Texts []string `json:"texts"`
+	TaxonomyID int64    `json:"taxonomy_id"`
+	Texts      []string `json:"texts"`
 }
 
 type AttributeDetailsRequest struct {
-  TaxonomyID int64 `json:"taxonomy_id"`
-  Text string `json:"text"`
+	TaxonomyID int64  `json:"taxonomy_id"`
+	Text       string `json:"text"`
 }
 
 type MergeAttributesRequest struct {
-  TaxonomyID int64 `json:"taxonomy_id"`
-  Text1 string  `json:"text1"`
-  Text2 string  `json:"text2"`
-  Dimension1 string `json:"dimension1"`
-  Dimension2 string `json:"dimension2"`
+	TaxonomyID int64  `json:"taxonomy_id"`
+	Text1      string `json:"text1"`
+	Text2      string `json:"text2"`
+	Dimension1 string `json:"dimension1"`
+	Dimension2 string `json:"dimension2"`
 }
 
 type ForkAttributeRequest struct {
-  TaxonomyID int64 `json:"taxonomy_id"`
-  Text string `json:"text"`
-  Dimension string `json:"dimension"`
-  Parents1 []AttributeRelation `json:"parents1"`
-  Parents2 []AttributeRelation `json:"parents2"`
-  Children1 []AttributeRelation `json:"children1"`
-  Children2 []AttributeRelation `json:"children2"`
-  Citations1 []Paper `json:"citations1"`
-  Citations2 []Paper `json:"citations2"`
+	TaxonomyID int64               `json:"taxonomy_id"`
+	Text       string              `json:"text"`
+	Dimension  string              `json:"dimension"`
+	Parents1   []AttributeRelation `json:"parents1"`
+	Parents2   []AttributeRelation `json:"parents2"`
+	Children1  []AttributeRelation `json:"children1"`
+	Children2  []AttributeRelation `json:"children2"`
+	Citations1 []Paper             `json:"citations1"`
+	Citations2 []Paper             `json:"citations2"`
 }
 
 type ReferenceCount struct {
-  Citation string `json:"citation"`
-  ReferenceCount int `json:"referenceCount"`
+	Citation       string `json:"citation"`
+	ReferenceCount int    `json:"referenceCount"`
 }
 
 type UpdateReferenceCountsRequest struct {
-  TaxonomyID int64 `json:"taxonomy_id"`
-  ReferenceCounts []ReferenceCount `json:"referenceCounts"`
+	TaxonomyID      int64            `json:"taxonomy_id"`
+	ReferenceCounts []ReferenceCount `json:"referenceCounts"`
 }
 
 type UpdateMajorRequest struct {
-  TaxonomyID int64 `json:"taxonomy_id"`
-  Text string `json:"text"`
-  Major int `json:"major"`
+	TaxonomyID int64  `json:"taxonomy_id"`
+	Text       string `json:"text"`
+	Major      int    `json:"major"`
 }
 
-type Relation struct{
-  ID int `json:"id"`
-  Text string  `json:"text"`
-  Comment string  `json:"comment"`
-  SourceAttribute Attribute `json:"src_attribute"`
-  DestinationAttribute Attribute `json:"dest_attribute"`
+type Relation struct {
+	ID                   int       `json:"id"`
+	Text                 string    `json:"text"`
+	Comment              string    `json:"comment"`
+	SourceAttribute      Attribute `json:"src_attribute"`
+	DestinationAttribute Attribute `json:"dest_attribute"`
 }
 
-type RelationType struct{
-  ID int `json:"id"`
-  Text string  `json:"text"`
-  Comment string `json:"comment"`
+type RelationType struct {
+	ID      int    `json:"id"`
+	Text    string `json:"text"`
+	Comment string `json:"comment"`
 }
 
 type ConceptCorrelation struct {
-  Attribute1 string `json:"attribute1"`
-  Attribute2 string `json:"attribute2"`
-  Attribute3 string `json:"attribute3"`
-  Text1 string `json:"text1"`
-  Text2 string `json:"text2"`
-  Text3 string `json:"text3"`
-  ID1 int `json:"id1"`
-  ID2 int `json:"id2"`
-  ID3 int `json:"id3"`
-  Value int `json:"value"`
+	Attribute1 string `json:"attribute1"`
+	Attribute2 string `json:"attribute2"`
+	Attribute3 string `json:"attribute3"`
+	Text1      string `json:"text1"`
+	Text2      string `json:"text2"`
+	Text3      string `json:"text3"`
+	ID1        int    `json:"id1"`
+	ID2        int    `json:"id2"`
+	ID3        int    `json:"id3"`
+	Value      int    `json:"value"`
 }
 
 type AttributeCluster struct {
-  ID int `json:"id"`
-  Text string `json:"text"`
-  Children string `json:"children"`
+	ID       int    `json:"id"`
+	Text     string `json:"text"`
+	Children string `json:"children"`
 }
 
 type AttributeCoverage struct {
-  AttributeName string `json:"attributeName"`
-  PaperName string `json:"paperName"`
-  Text1 string `json:"text1"`
-  Text2 string `json:"text2"`
-  AttributeID int `json:"attributeID"`
-  PaperID int `json:"paperID"`
-  Value int `json:"value"`
+	AttributeName string `json:"attributeName"`
+	PaperName     string `json:"paperName"`
+	Text1         string `json:"text1"`
+	Text2         string `json:"text2"`
+	AttributeID   int    `json:"attributeID"`
+	PaperID       int    `json:"paperID"`
+	Value         int    `json:"value"`
 }
 
 type AttributeRelation struct {
-  TaxonomyID int64 `json:"taxonomy_id"`
-  AttributeSrc string `json:"attributeSrc"`
-  AttributeDest string `json:"attributeDest"`
-  Text string `json:"text"`
-  DimensionSrc string `json:"dimensionSrc"`
-  DimensionDest string `json:"dimensionDest"`
-  Dimension string `json:"dimension"`
-  Relation string `json:"relation"`
-  EdgeBendPoints string `json:"edgeBendPoints"`
-  Annotation string `json:"annotation"`
+	TaxonomyID     int64  `json:"taxonomy_id"`
+	AttributeSrc   string `json:"attributeSrc"`
+	AttributeDest  string `json:"attributeDest"`
+	Text           string `json:"text"`
+	DimensionSrc   string `json:"dimensionSrc"`
+	DimensionDest  string `json:"dimensionDest"`
+	Dimension      string `json:"dimension"`
+	Relation       string `json:"relation"`
+	EdgeBendPoints string `json:"edgeBendPoints"`
+	Annotation     string `json:"annotation"`
 }
 
 type CitationCount struct {
-  Attribute string `json:"attribute"`
-  CitationCount int64 `json:"citationCount"`
-  MaxReferenceCount int64 `json:"maxReferenceCount"`
-  ReferenceCountSum int64 `json:"referenceCountSum"`
+	Attribute         string `json:"attribute"`
+	CitationCount     int64  `json:"citationCount"`
+	MaxReferenceCount int64  `json:"maxReferenceCount"`
+	ReferenceCountSum int64  `json:"referenceCountSum"`
 }
 
 type Result struct {
-  Success bool `json:"success"`
+	Success bool `json:"success"`
 }
 
 type User struct {
-  ID int `json:"id"`
-  Email string `json:"email"`
-  Name string `json:"name"`
-  Taxonomies string `json:"taxonomies"`
-  Admin int `json:"admin"`
+	ID         int    `json:"id"`
+	Email      string `json:"email"`
+	Name       string `json:"name"`
+	Taxonomies string `json:"taxonomies"`
+	Admin      int    `json:"admin"`
 }
 
 type LoginRequest struct {
-  Email string `json:"email"`
-  Password string `json:"password"`
+	Email    string `json:"email"`
+	Password string `json:"password"`
 }
 
 type CreateUserRequest struct {
-  Email string `json:"email"`
-  Password string `json:"password"`
-  Admin int `json:"admin"`
+	Email    string `json:"email"`
+	Password string `json:"password"`
+	Admin    int    `json:"admin"`
 }
 
 type UpdateUserRequest struct {
-  Email string `json:"email"`
-  Admin int `json:"admin"`
+	Email string `json:"email"`
+	Admin int    `json:"admin"`
 }
 
 type UserRequest struct {
-  Email string `json:"email"`
+	Email string `json:"email"`
 }
 
 type LoginResult struct {
-  Success bool `json:"success"`
-  User User `json:"user"`
+	Success bool `json:"success"`
+	User    User `json:"user"`
 }
 
 type UserResult struct {
-  Success bool `json:"success"`
-  Users []User `json:"users"`
+	Success bool   `json:"success"`
+	Users   []User `json:"users"`
 }
 
 type QueryRequest struct {
-  Query string `json:"query"`
+	Query string `json:"query"`
 }
 
-type Cluster struct  {
-  ID int `json:"id"`
-  Papers []int `json:"papers"`
-  Attributes []string `json:"attributes"`
+type Cluster struct {
+	ID         int      `json:"id"`
+	Papers     []int    `json:"papers"`
+	Attributes []string `json:"attributes"`
 }
 
 type KMeansRequest struct {
-  TaxonomyID int64 `json:"taxonomy_id"`
-  N int `json:"n"`
+	TaxonomyID int64 `json:"taxonomy_id"`
+	N          int   `json:"n"`
 }
 
 //
diff --git a/model/paper-review.go b/model/paper-review.go
index a8ea6eb..8ec26de 100644
--- a/model/paper-review.go
+++ b/model/paper-review.go
@@ -43,10 +43,10 @@ type ArticleMapping struct {
 	File                 string `json:"file"`
 	Source               string `json:"source"`
 	AssociatedResearchId int64  `json:"associated_research_id"`
-	TagIds string `json:"tagIDs"`
-	Tags string `json:"tags"`
-	ApprovedCount int `json:"approvedCount"`
-	RejectedCount int `json:"rejectedCount"`
+	TagIds               string `json:"tagIDs"`
+	Tags                 string `json:"tags"`
+	ApprovedCount        int    `json:"approvedCount"`
+	RejectedCount        int    `json:"rejectedCount"`
 }
 type Mitarbeiter struct {
 	ID       int    `json:"id"`
@@ -59,12 +59,12 @@ type Tag struct {
 	ResearchID int    `json:"research_id"`
 }
 type Vote struct {
-	ID                  int         `json:"id"`
-	State               VoteStatus  `json:"state"`
-	Voter               User `json:"voter"`
-	Tags                []Tag       `json:"tags"`
-	AssociatedArticleID int         `json:"associated_article_id"`
-	Review              string      `json:"review"`
+	ID                  int        `json:"id"`
+	State               VoteStatus `json:"state"`
+	Voter               User       `json:"voter"`
+	Tags                []Tag      `json:"tags"`
+	AssociatedArticleID int        `json:"associated_article_id"`
+	Review              string     `json:"review"`
 }
 
 //Stats enholds statistic info about reviews
@@ -76,9 +76,9 @@ type Stats struct {
 
 type ReviewListRequest struct {
 	ResearchID int64 `json:"research_id"`
-	Threshold int `json:"threshold"`
+	Threshold  int   `json:"threshold"`
 }
 
 type DeleteArticleVotesRequest struct {
 	Articles []Article `json:"articles"`
-}
\ No newline at end of file
+}
diff --git a/nginx/conf.d/nginx.conf b/nginx/conf.d/nginx.conf
new file mode 100644
index 0000000..ffb7b79
--- /dev/null
+++ b/nginx/conf.d/nginx.conf
@@ -0,0 +1,22 @@
+worker_processes 1;
+
+
+events { worker_connections 1024; }
+
+http {
+    upstream taxonomy {
+        server app;
+    }
+
+    server {
+        listen 80;
+        location / {
+            proxy_pass         http://app:8081;
+            proxy_redirect     off;
+            proxy_set_header   Host $host;
+            proxy_set_header   X-Real-IP $remote_addr;
+            proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header   X-Forwarded-Host $server_name;
+        }
+    }
+}
diff --git a/taxonomyserver.go b/taxonomyserver.go
index a84e5c2..e4997b2 100644
--- a/taxonomyserver.go
+++ b/taxonomyserver.go
@@ -2,25 +2,25 @@ package main
 
 import (
 	"bytes"
+	"encoding/json"
 	"flag"
 	"fmt"
 	"io/ioutil"
-    "mime/multipart"
+	"mime/multipart"
 	"net/http"
 	"net/url"
 	"os"
 	"os/signal"
 	"path/filepath"
+	"strconv"
 	"strings"
 	"syscall"
-	"encoding/json"
-	"strconv"
 	"time"
 
-	"github.com/mr-ma/paper-review-go/data"
-	"github.com/mr-ma/paper-review-go/model"
-	"github.com/rcrowley/go-tigertonic"
+	"./data"
+	"./model"
 	"github.com/alexedwards/scs"
+	"github.com/rcrowley/go-tigertonic"
 )
 
 //MyRequest standard request
@@ -45,6 +45,7 @@ type fn func(http.ResponseWriter, *http.Request)
 var (
 	mysqlUser     = flag.String("mysqluser", "foo", "a mysql user")
 	mysqlPassword = flag.String("mysqlpass", "bar", "the mysql password")
+	mysqlServer   = flag.String("mysqlserver", "", "Mysql server address")
 	cert          = flag.String("cert", "", "certificate pathname")
 	key           = flag.String("key", "", "private key pathname")
 	config        = flag.String("config", "", "pathname of JSON configuration file")
@@ -52,13 +53,16 @@ var (
 )
 
 var sessionManager = scs.NewCookieManager("u46IpCV9y5Vlur8YvODJEhgOY8m9JVE4")
+var driver data.ClassificationDriver
 
 func main() {
-	sessionManager.Lifetime(time.Hour*24) // session data expires after 24 hours
-	sessionManager.Persist(true) // session data persists after the browser has been closed by the user
+	sessionManager.Lifetime(time.Hour * 24) // session data expires after 24 hours
+	sessionManager.Persist(true)            // session data persists after the browser has been closed by the user
 	//sessionManager.Secure(true)
 	flag.Parse()
 
+	driver = data.InitClassificationDriver(*mysqlUser, *mysqlPassword, *mysqlServer)
+
 	cors := tigertonic.NewCORSBuilder().AddAllowedOrigins(*listen)
 
 	mux := tigertonic.NewTrieServeMux()
@@ -139,39 +143,39 @@ func main() {
 	// user and access management:
 
 	mux.HandleFunc("POST", "/login", func(w http.ResponseWriter, r *http.Request) {
-        var loginRequest model.LoginRequest
-        if r.Body == nil {
-            http.Error(w, "Please send a request body", 400)
-            return
-        }
-        err := json.NewDecoder(r.Body).Decode(&loginRequest)
-        if err != nil {
-            http.Error(w, err.Error(), 400)
-            return
-        }
-        if loginRequest.Password == "" {
-		    session := sessionManager.Load(r)
-		    var email string
-		    email, err := session.GetString("email")
-		    if err != nil {
-		        email = ""
-		    }
-		    var adminInt int
-		    admin, err := session.GetString("admin")
-		    if err != nil {
-		        adminInt = 0
-		    }
-		    adminInt, err = strconv.Atoi(admin)
-		    if err != nil {
-		        adminInt = 0
-		    }
-		    var taxonomies string
-		    taxonomies, err = session.GetString("taxonomies")
-		    if err != nil {
-		        taxonomies = ""
-		    }
-		    userResult := model.LoginResult{Success: true}
-		    userResult.User = model.User{Email: email, Admin: adminInt, Taxonomies: taxonomies}
+		var loginRequest model.LoginRequest
+		if r.Body == nil {
+			http.Error(w, "Please send a request body", 400)
+			return
+		}
+		err := json.NewDecoder(r.Body).Decode(&loginRequest)
+		if err != nil {
+			http.Error(w, err.Error(), 400)
+			return
+		}
+		if loginRequest.Password == "" {
+			session := sessionManager.Load(r)
+			var email string
+			email, err := session.GetString("email")
+			if err != nil {
+				email = ""
+			}
+			var adminInt int
+			admin, err := session.GetString("admin")
+			if err != nil {
+				adminInt = 0
+			}
+			adminInt, err = strconv.Atoi(admin)
+			if err != nil {
+				adminInt = 0
+			}
+			var taxonomies string
+			taxonomies, err = session.GetString("taxonomies")
+			if err != nil {
+				taxonomies = ""
+			}
+			userResult := model.LoginResult{Success: true}
+			userResult.User = model.User{Email: email, Admin: adminInt, Taxonomies: taxonomies}
 			output, err := json.Marshal(userResult)
 			if err != nil {
 				http.Error(w, err.Error(), 500)
@@ -180,24 +184,24 @@ func main() {
 			w.Header().Set("content-type", "application/json")
 			w.Write(output)
 			return
-        }
-		driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+		}
+		// //driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 		loginResult, err := driver.Login(loginRequest.Email, loginRequest.Password)
 		checkErr(err)
 		if loginResult.Success {
-		    session := sessionManager.Load(r)
-		    err := session.PutString(w, "email", loginResult.User.Email)
-		    if err != nil {
-		        http.Error(w, err.Error(), 500)
-		    }
-		    err = session.PutString(w, "admin", strconv.Itoa(loginResult.User.Admin))
-		    if err != nil {
-		        http.Error(w, err.Error(), 500)
-		    }
-		    err = session.PutString(w, "taxonomies", loginResult.User.Taxonomies)
-		    if err != nil {
-		        http.Error(w, err.Error(), 500)
-		    }
+			session := sessionManager.Load(r)
+			err := session.PutString(w, "email", loginResult.User.Email)
+			if err != nil {
+				http.Error(w, err.Error(), 500)
+			}
+			err = session.PutString(w, "admin", strconv.Itoa(loginResult.User.Admin))
+			if err != nil {
+				http.Error(w, err.Error(), 500)
+			}
+			err = session.PutString(w, "taxonomies", loginResult.User.Taxonomies)
+			if err != nil {
+				http.Error(w, err.Error(), 500)
+			}
 		}
 		output, err := json.Marshal(loginResult)
 		if err != nil {
@@ -225,34 +229,34 @@ func main() {
 		w.Write(output)
 	})
 	mux.HandleFunc("POST", "/saveUser", func(w http.ResponseWriter, r *http.Request) {
-        var loginRequest model.LoginRequest
-        if r.Body == nil {
-            http.Error(w, "Please send a request body", 400)
-            return
-        }
-        err := json.NewDecoder(r.Body).Decode(&loginRequest)
-        if err != nil {
-            http.Error(w, err.Error(), 400)
-            return
-        }
-		driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+		var loginRequest model.LoginRequest
+		if r.Body == nil {
+			http.Error(w, "Please send a request body", 400)
+			return
+		}
+		err := json.NewDecoder(r.Body).Decode(&loginRequest)
+		if err != nil {
+			http.Error(w, err.Error(), 400)
+			return
+		}
+		//driver = data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 		result, err := driver.SaveUser(loginRequest.Email, loginRequest.Password)
 		checkErr(err)
 		userResult := model.LoginResult{}
 		if result.Success {
 			userResult.Success = true
 			userResult.User = model.User{Email: loginRequest.Email, Admin: 0}
-		    session := sessionManager.Load(r)
-		    session.Clear(w)
-		    session.RenewToken(w)
-		    err := session.PutString(w, "email", loginRequest.Email)
-		    if err != nil {
-		        http.Error(w, err.Error(), 500)
-		    }
-		    err = session.PutString(w, "admin", "0")
-		    if err != nil {
-		        http.Error(w, err.Error(), 500)
-		    }
+			session := sessionManager.Load(r)
+			session.Clear(w)
+			session.RenewToken(w)
+			err := session.PutString(w, "email", loginRequest.Email)
+			if err != nil {
+				http.Error(w, err.Error(), 500)
+			}
+			err = session.PutString(w, "admin", "0")
+			if err != nil {
+				http.Error(w, err.Error(), 500)
+			}
 		} else {
 			userResult.Success = false
 		}
@@ -699,7 +703,8 @@ func main() {
 	})
 
 	mux.HandleFunc("GET", "/", func(w http.ResponseWriter, r *http.Request) {
-		p := loadPage("frontend/taxonomy/index.html")
+		// p := loadPage("frontend/taxonomy/index.html")
+		p := loadPage("frontend/taxonomy/correlationMap/interactive/conceptCorrelations_two_dimensional.html")
 		fmt.Fprintf(w, "%s", p)
 	})
 	mux.HandleFunc("GET", "/users", func(w http.ResponseWriter, r *http.Request) {
@@ -810,28 +815,28 @@ func checkErr(err error) {
 }
 
 func saveFile(w http.ResponseWriter, file multipart.File, handle *multipart.FileHeader) {
-    data, err := ioutil.ReadAll(file)
-    if err != nil {
-        fmt.Fprintf(w, "%v", err)
-        return
-    }
+	data, err := ioutil.ReadAll(file)
+	if err != nil {
+		fmt.Fprintf(w, "%v", err)
+		return
+	}
 
-    err = ioutil.WriteFile("./files/"+handle.Filename, data, 0666)
-    if err != nil {
-        fmt.Fprintf(w, "%v", err)
-        return
-    }
-    jsonResponse(w, http.StatusCreated, "File uploaded successfully!.")
+	err = ioutil.WriteFile("./files/"+handle.Filename, data, 0666)
+	if err != nil {
+		fmt.Fprintf(w, "%v", err)
+		return
+	}
+	jsonResponse(w, http.StatusCreated, "File uploaded successfully!.")
 }
 
 func jsonResponse(w http.ResponseWriter, code int, message string) {
-    w.Header().Set("Content-Type", "application/json")
-    w.WriteHeader(code)
-    fmt.Fprint(w, message)
+	w.Header().Set("Content-Type", "application/json")
+	w.WriteHeader(code)
+	fmt.Fprint(w, message)
 }
 
 // check if user is admin
-func checkAdmin (w http.ResponseWriter, r *http.Request, callback fn) {
+func checkAdmin(w http.ResponseWriter, r *http.Request, callback fn) {
 	session := sessionManager.Load(r)
 	var admin int
 	adminStr, err := session.GetString("admin")
@@ -858,12 +863,12 @@ func checkAdmin (w http.ResponseWriter, r *http.Request, callback fn) {
 }
 
 func contains(s []int, e int) bool {
-    for _, a := range s {
-        if a == e {
-            return true
-        }
-    }
-    return false
+	for _, a := range s {
+		if a == e {
+			return true
+		}
+	}
+	return false
 }
 
 // check if user has edit permissions on a taxonomy with a specific ID
@@ -884,21 +889,21 @@ func checkTaxonomyPermissions(w http.ResponseWriter, r *http.Request, callback f
 		callback(w, r)
 		return
 	}
-    if r.Body == nil {
-        http.Error(w, "Please send a request body", 400)
-        return
-    }
-    body, err := ioutil.ReadAll(r.Body)
-    if err != nil {
-        http.Error(w, err.Error(), 400)
-        return
-    }
+	if r.Body == nil {
+		http.Error(w, "Please send a request body", 400)
+		return
+	}
+	body, err := ioutil.ReadAll(r.Body)
+	if err != nil {
+		http.Error(w, err.Error(), 400)
+		return
+	}
 	var objmap map[string]*json.RawMessage
 	err = json.Unmarshal(body, &objmap)
-    if err != nil {
-        http.Error(w, err.Error(), 400)
-        return
-    }
+	if err != nil {
+		http.Error(w, err.Error(), 400)
+		return
+	}
 	var taxonomyId64 int64
 	err = json.Unmarshal(*objmap["taxonomy_id"], &taxonomyId64)
 	if err == nil {
@@ -936,7 +941,7 @@ func getUserHandler(w http.ResponseWriter, r *http.Request) {
 	email, err := session.GetString("email")
 	user := model.User{}
 	if err == nil {
-		driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+		// driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 		user, err = driver.GetUser(email)
 		checkErr(err)
 	}
@@ -951,17 +956,17 @@ func getUserHandler(w http.ResponseWriter, r *http.Request) {
 
 // sends a SQL query to the database
 func queryHandler(w http.ResponseWriter, r *http.Request) {
-    var queryRequest model.QueryRequest
-    if r.Body == nil {
-        http.Error(w, "Please send a request body", 400)
-        return
-    }
-    err := json.NewDecoder(r.Body).Decode(&queryRequest)
-    if err != nil {
-        http.Error(w, err.Error(), 400)
-        return
-    }
-	driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+	var queryRequest model.QueryRequest
+	if r.Body == nil {
+		http.Error(w, "Please send a request body", 400)
+		return
+	}
+	err := json.NewDecoder(r.Body).Decode(&queryRequest)
+	if err != nil {
+		http.Error(w, err.Error(), 400)
+		return
+	}
+	// driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 	result, err := driver.QueryDB(queryRequest.Query)
 	checkErr(err)
 	output, err := json.Marshal(result)
@@ -975,7 +980,7 @@ func queryHandler(w http.ResponseWriter, r *http.Request) {
 
 // get list of users and their permissions
 func getUsersHandler(w http.ResponseWriter, r *http.Request) {
-	driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+	// driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 	users, err := driver.GetUsers()
 	checkErr(err)
 	userResult := []model.User{}
@@ -993,17 +998,17 @@ func getUsersHandler(w http.ResponseWriter, r *http.Request) {
 
 // add user
 func createUserHandler(w http.ResponseWriter, r *http.Request) {
-    var userRequest model.CreateUserRequest
-    if r.Body == nil {
-        http.Error(w, "Please send a request body", 400)
-        return
-    }
-    err := json.NewDecoder(r.Body).Decode(&userRequest)
-    if err != nil {
-        http.Error(w, err.Error(), 400)
-        return
-    }
-	driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+	var userRequest model.CreateUserRequest
+	if r.Body == nil {
+		http.Error(w, "Please send a request body", 400)
+		return
+	}
+	err := json.NewDecoder(r.Body).Decode(&userRequest)
+	if err != nil {
+		http.Error(w, err.Error(), 400)
+		return
+	}
+	//driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 	result, err := driver.CreateUser(userRequest.Email, userRequest.Password, userRequest.Admin)
 	checkErr(err)
 	output, err := json.Marshal(result)
@@ -1017,17 +1022,17 @@ func createUserHandler(w http.ResponseWriter, r *http.Request) {
 
 // update user permissions
 func updateUserHandler(w http.ResponseWriter, r *http.Request) {
-    var userRequest model.UpdateUserRequest
-    if r.Body == nil {
-        http.Error(w, "Please send a request body", 400)
-        return
-    }
-    err := json.NewDecoder(r.Body).Decode(&userRequest)
-    if err != nil {
-        http.Error(w, err.Error(), 400)
-        return
-    }
-	driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+	var userRequest model.UpdateUserRequest
+	if r.Body == nil {
+		http.Error(w, "Please send a request body", 400)
+		return
+	}
+	err := json.NewDecoder(r.Body).Decode(&userRequest)
+	if err != nil {
+		http.Error(w, err.Error(), 400)
+		return
+	}
+	//driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 	result, err := driver.UpdateUser(userRequest.Email, userRequest.Admin)
 	checkErr(err)
 	output, err := json.Marshal(result)
@@ -1041,17 +1046,17 @@ func updateUserHandler(w http.ResponseWriter, r *http.Request) {
 
 // delete user
 func deleteUserHandler(w http.ResponseWriter, r *http.Request) {
-    var userRequest model.UserRequest
-    if r.Body == nil {
-        http.Error(w, "Please send a request body", 400)
-        return
-    }
-    err := json.NewDecoder(r.Body).Decode(&userRequest)
-    if err != nil {
-        http.Error(w, err.Error(), 400)
-        return
-    }
-	driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+	var userRequest model.UserRequest
+	if r.Body == nil {
+		http.Error(w, "Please send a request body", 400)
+		return
+	}
+	err := json.NewDecoder(r.Body).Decode(&userRequest)
+	if err != nil {
+		http.Error(w, err.Error(), 400)
+		return
+	}
+	//driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 	result, err := driver.DeleteUser(userRequest.Email)
 	checkErr(err)
 	output, err := json.Marshal(result)
@@ -1064,14 +1069,14 @@ func deleteUserHandler(w http.ResponseWriter, r *http.Request) {
 }
 
 func getTaxonomyHandler(u *url.URL, h http.Header, r *MyRequest) (int, http.Header, *MyResponse, error) {
-	driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+	//driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 	taxonomies, err := driver.GetAllTaxonomies()
 	checkErr(err)
 	return http.StatusOK, nil, &MyResponse{"0", len(taxonomies), taxonomies}, nil
 }
 
 func getTaxonomyIDHandler(u *url.URL, h http.Header, taxonomyIDRequest *model.TaxonomyIDRequest) (int, http.Header, *MyResponse, error) {
-	driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+	//driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 	taxonomyID, err := driver.GetTaxonomyID(taxonomyIDRequest.Text)
 	checkErr(err)
 	return http.StatusOK, nil,
@@ -1080,17 +1085,17 @@ func getTaxonomyIDHandler(u *url.URL, h http.Header, taxonomyIDRequest *model.Ta
 
 // get taxonomy permissions
 func getTaxonomyPermissionsHandler(w http.ResponseWriter, r *http.Request) {
-    var userRequest model.UserRequest
-    if r.Body == nil {
-        http.Error(w, "Please send a request body", 400)
-        return
-    }
-    err := json.NewDecoder(r.Body).Decode(&userRequest)
-    if err != nil {
-        http.Error(w, err.Error(), 400)
-        return
-    }
-	driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+	var userRequest model.UserRequest
+	if r.Body == nil {
+		http.Error(w, "Please send a request body", 400)
+		return
+	}
+	err := json.NewDecoder(r.Body).Decode(&userRequest)
+	if err != nil {
+		http.Error(w, err.Error(), 400)
+		return
+	}
+	//driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 	result, err := driver.GetTaxonomyPermissions(userRequest.Email)
 	checkErr(err)
 	output, err := json.Marshal(result)
@@ -1104,17 +1109,17 @@ func getTaxonomyPermissionsHandler(w http.ResponseWriter, r *http.Request) {
 
 // update taxonomy permissions
 func getUpdateTaxonomyPermissionsHandler(w http.ResponseWriter, r *http.Request) {
-    var taxonomyPermissionsRequest model.TaxonomyPermissionsRequest
-    if r.Body == nil {
-        http.Error(w, "Please send a request body", 400)
-        return
-    }
-    err := json.NewDecoder(r.Body).Decode(&taxonomyPermissionsRequest)
-    if err != nil {
-        http.Error(w, err.Error(), 400)
-        return
-    }
-	driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+	var taxonomyPermissionsRequest model.TaxonomyPermissionsRequest
+	if r.Body == nil {
+		http.Error(w, "Please send a request body", 400)
+		return
+	}
+	err := json.NewDecoder(r.Body).Decode(&taxonomyPermissionsRequest)
+	if err != nil {
+		http.Error(w, err.Error(), 400)
+		return
+	}
+	//driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 	result, err := driver.UpdateTaxonomyPermissions(taxonomyPermissionsRequest.Email, taxonomyPermissionsRequest.Permissions)
 	checkErr(err)
 	output, err := json.Marshal(result)
@@ -1127,17 +1132,17 @@ func getUpdateTaxonomyPermissionsHandler(w http.ResponseWriter, r *http.Request)
 }
 
 func getAddTaxonomyHandler(w http.ResponseWriter, r *http.Request) {
-    var addTaxonomyRequest model.AddTaxonomyRequest
-    if r.Body == nil {
-        http.Error(w, "Please send a request body", 400)
-        return
-    }
-    err := json.NewDecoder(r.Body).Decode(&addTaxonomyRequest)
-    if err != nil {
-        http.Error(w, err.Error(), 400)
-        return
-    }
-	driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+	var addTaxonomyRequest model.AddTaxonomyRequest
+	if r.Body == nil {
+		http.Error(w, "Please send a request body", 400)
+		return
+	}
+	err := json.NewDecoder(r.Body).Decode(&addTaxonomyRequest)
+	if err != nil {
+		http.Error(w, err.Error(), 400)
+		return
+	}
+	//driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 	result, err := driver.AddTaxonomy(addTaxonomyRequest.Taxonomy, addTaxonomyRequest.Dimension)
 	checkErr(err)
 	output, err := json.Marshal(result)
@@ -1150,17 +1155,17 @@ func getAddTaxonomyHandler(w http.ResponseWriter, r *http.Request) {
 }
 
 func getRemoveTaxonomyHandler(w http.ResponseWriter, r *http.Request) {
-    var taxonomyRequest model.TaxonomyRequest
-    if r.Body == nil {
-        http.Error(w, "Please send a request body", 400)
-        return
-    }
-    err := json.NewDecoder(r.Body).Decode(&taxonomyRequest)
-    if err != nil {
-        http.Error(w, err.Error(), 400)
-        return
-    }
-	driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+	var taxonomyRequest model.TaxonomyRequest
+	if r.Body == nil {
+		http.Error(w, "Please send a request body", 400)
+		return
+	}
+	err := json.NewDecoder(r.Body).Decode(&taxonomyRequest)
+	if err != nil {
+		http.Error(w, err.Error(), 400)
+		return
+	}
+	//driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 	result, err := driver.RemoveTaxonomy(taxonomyRequest.TaxonomyID)
 	checkErr(err)
 	output, err := json.Marshal(result)
@@ -1177,7 +1182,7 @@ func getCorrelationHandler(u *url.URL, h http.Header, correlationRequest *model.
 		return http.StatusNotAcceptable, nil,
 			&MyResponse{"0", 0, "I need some attributes to produce correlations"}, nil
 	}
-	driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+	//driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 	papers, err := driver.ExportCorrelations(
 		correlationRequest.Attributes, correlationRequest.TaxonomyID)
 	checkErr(err)
@@ -1185,7 +1190,7 @@ func getCorrelationHandler(u *url.URL, h http.Header, correlationRequest *model.
 		&MyResponse{"0", len(papers), papers}, nil
 }
 func getAttributesPerDimensionHandler(u *url.URL, h http.Header, attributesPerDimensionRequest *model.AttributeRelationsRequest) (int, http.Header, *MyResponse, error) {
-	driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+	//driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 	attributes, err := driver.GetAttributesPerDimension(
 		attributesPerDimensionRequest.TaxonomyID, attributesPerDimensionRequest.Dimension)
 	checkErr(err)
@@ -1193,7 +1198,7 @@ func getAttributesPerDimensionHandler(u *url.URL, h http.Header, attributesPerDi
 		&MyResponse{"0", len(attributes), attributes}, nil
 }
 func getLeafAttributesPerDimensionHandler(u *url.URL, h http.Header, attributesPerDimensionRequest *model.AttributeRelationsRequest) (int, http.Header, *MyResponse, error) {
-	driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+	//driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 	attributes, err := driver.GetLeafAttributesPerDimension(
 		attributesPerDimensionRequest.TaxonomyID, attributesPerDimensionRequest.Dimension)
 	checkErr(err)
@@ -1201,7 +1206,7 @@ func getLeafAttributesPerDimensionHandler(u *url.URL, h http.Header, attributesP
 		&MyResponse{"0", len(attributes), attributes}, nil
 }
 func getAttributeClusterPerDimensionHandler(u *url.URL, h http.Header, attributeClusterPerDimensionRequest *model.AttributeRelationsRequest) (int, http.Header, *MyResponse, error) {
-	driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+	//driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 	clusters, err := driver.GetAttributeClusterPerDimension(
 		attributeClusterPerDimensionRequest.TaxonomyID, attributeClusterPerDimensionRequest.Dimension)
 	checkErr(err)
@@ -1209,7 +1214,7 @@ func getAttributeClusterPerDimensionHandler(u *url.URL, h http.Header, attribute
 		&MyResponse{"0", len(clusters), clusters}, nil
 }
 func getAllChildrenAttributesHandler(u *url.URL, h http.Header, allChildrenAttributesRequest *model.AllChildrenAttributesRequest) (int, http.Header, *MyResponse, error) {
-	driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+	//driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 	attributes, err := driver.GetAllChildrenAttributes(
 		allChildrenAttributesRequest.TaxonomyID, allChildrenAttributesRequest.Parent)
 	checkErr(err)
@@ -1217,7 +1222,7 @@ func getAllChildrenAttributesHandler(u *url.URL, h http.Header, allChildrenAttri
 		&MyResponse{"0", len(attributes), attributes}, nil
 }
 func getAllChildrenLeafAttributesHandler(u *url.URL, h http.Header, allChildrenAttributesRequest *model.AllChildrenAttributesRequest) (int, http.Header, *MyResponse, error) {
-	driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+	//driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 	attributes, err := driver.GetAllChildrenLeafAttributes(
 		allChildrenAttributesRequest.TaxonomyID, allChildrenAttributesRequest.Parent)
 	checkErr(err)
@@ -1225,7 +1230,7 @@ func getAllChildrenLeafAttributesHandler(u *url.URL, h http.Header, allChildrenA
 		&MyResponse{"0", len(attributes), attributes}, nil
 }
 func getIntermediateAttributesHandler(u *url.URL, h http.Header, intermediateAttributesRequest *model.AttributeRelationsRequest) (int, http.Header, *MyResponse, error) {
-	driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+	//driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 	intermediateAttributes, err := driver.GetIntermediateAttributes(
 		intermediateAttributesRequest.TaxonomyID, intermediateAttributesRequest.MinValue, intermediateAttributesRequest.MaxValue)
 	checkErr(err)
@@ -1233,7 +1238,7 @@ func getIntermediateAttributesHandler(u *url.URL, h http.Header, intermediateAtt
 		&MyResponse{"0", len(intermediateAttributes), intermediateAttributes}, nil
 }
 func getMajorAttributesHandler(u *url.URL, h http.Header, majorAttributesRequest *model.TaxonomyRequest) (int, http.Header, *MyResponse, error) {
-	driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+	//driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 	majorAttributes, err := driver.GetMajorAttributes(
 		majorAttributesRequest.TaxonomyID)
 	checkErr(err)
@@ -1241,7 +1246,7 @@ func getMajorAttributesHandler(u *url.URL, h http.Header, majorAttributesRequest
 		&MyResponse{"0", len(majorAttributes), majorAttributes}, nil
 }
 func getAttributeRelationsHandler(u *url.URL, h http.Header, attributeRelationsRequest *model.AttributeRelationsRequest) (int, http.Header, *MyResponse, error) {
-	driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+	//driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 	attributeRelations, err := driver.GetAttributeRelationsPerDimension(
 		attributeRelationsRequest.TaxonomyID, attributeRelationsRequest.Dimension)
 	checkErr(err)
@@ -1249,7 +1254,7 @@ func getAttributeRelationsHandler(u *url.URL, h http.Header, attributeRelationsR
 		&MyResponse{"0", len(attributeRelations), attributeRelations}, nil
 }
 func getInterdimensionalRelationsHandler(u *url.URL, h http.Header, interdimensionalRelationsRequest *model.AttributeRelationsRequest) (int, http.Header, *MyResponse, error) {
-	driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+	//driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 	attributeRelations, err := driver.GetInterdimensionalRelations(
 		interdimensionalRelationsRequest.TaxonomyID)
 	checkErr(err)
@@ -1257,17 +1262,17 @@ func getInterdimensionalRelationsHandler(u *url.URL, h http.Header, interdimensi
 		&MyResponse{"0", len(attributeRelations), attributeRelations}, nil
 }
 func savePositionsHandler(w http.ResponseWriter, r *http.Request) {
-    var savePositionsRequest model.SavePositionsRequest
-    if r.Body == nil {
-        http.Error(w, "Please send a request body", 400)
-        return
-    }
-    err := json.NewDecoder(r.Body).Decode(&savePositionsRequest)
-    if err != nil {
-        http.Error(w, err.Error(), 400)
-        return
-    }
-	driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+	var savePositionsRequest model.SavePositionsRequest
+	if r.Body == nil {
+		http.Error(w, "Please send a request body", 400)
+		return
+	}
+	err := json.NewDecoder(r.Body).Decode(&savePositionsRequest)
+	if err != nil {
+		http.Error(w, err.Error(), 400)
+		return
+	}
+	//driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 	result, err := driver.SavePositions(
 		savePositionsRequest.TaxonomyID, savePositionsRequest.Positions)
 	checkErr(err)
@@ -1280,17 +1285,17 @@ func savePositionsHandler(w http.ResponseWriter, r *http.Request) {
 	w.Write(output)
 }
 func saveMajorPositionsHandler(w http.ResponseWriter, r *http.Request) {
-    var savePositionsRequest model.SavePositionsRequest
-    if r.Body == nil {
-        http.Error(w, "Please send a request body", 400)
-        return
-    }
-    err := json.NewDecoder(r.Body).Decode(&savePositionsRequest)
-    if err != nil {
-        http.Error(w, err.Error(), 400)
-        return
-    }
-	driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+	var savePositionsRequest model.SavePositionsRequest
+	if r.Body == nil {
+		http.Error(w, "Please send a request body", 400)
+		return
+	}
+	err := json.NewDecoder(r.Body).Decode(&savePositionsRequest)
+	if err != nil {
+		http.Error(w, err.Error(), 400)
+		return
+	}
+	//driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 	result, err := driver.SaveMajorPositions(
 		savePositionsRequest.TaxonomyID, savePositionsRequest.Positions)
 	checkErr(err)
@@ -1303,17 +1308,17 @@ func saveMajorPositionsHandler(w http.ResponseWriter, r *http.Request) {
 	w.Write(output)
 }
 func save3DPositionsHandler(w http.ResponseWriter, r *http.Request) {
-    var savePositionsRequest model.SavePositionsRequest
-    if r.Body == nil {
-        http.Error(w, "Please send a request body", 400)
-        return
-    }
-    err := json.NewDecoder(r.Body).Decode(&savePositionsRequest)
-    if err != nil {
-        http.Error(w, err.Error(), 400)
-        return
-    }
-	driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+	var savePositionsRequest model.SavePositionsRequest
+	if r.Body == nil {
+		http.Error(w, "Please send a request body", 400)
+		return
+	}
+	err := json.NewDecoder(r.Body).Decode(&savePositionsRequest)
+	if err != nil {
+		http.Error(w, err.Error(), 400)
+		return
+	}
+	//driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 	result, err := driver.Save3DPositions(
 		savePositionsRequest.TaxonomyID, savePositionsRequest.Positions)
 	checkErr(err)
@@ -1326,17 +1331,17 @@ func save3DPositionsHandler(w http.ResponseWriter, r *http.Request) {
 	w.Write(output)
 }
 func saveMajor3DPositionsHandler(w http.ResponseWriter, r *http.Request) {
-    var savePositionsRequest model.SavePositionsRequest
-    if r.Body == nil {
-        http.Error(w, "Please send a request body", 400)
-        return
-    }
-    err := json.NewDecoder(r.Body).Decode(&savePositionsRequest)
-    if err != nil {
-        http.Error(w, err.Error(), 400)
-        return
-    }
-	driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+	var savePositionsRequest model.SavePositionsRequest
+	if r.Body == nil {
+		http.Error(w, "Please send a request body", 400)
+		return
+	}
+	err := json.NewDecoder(r.Body).Decode(&savePositionsRequest)
+	if err != nil {
+		http.Error(w, err.Error(), 400)
+		return
+	}
+	//driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 	result, err := driver.SaveMajor3DPositions(
 		savePositionsRequest.TaxonomyID, savePositionsRequest.Positions)
 	checkErr(err)
@@ -1349,17 +1354,17 @@ func saveMajor3DPositionsHandler(w http.ResponseWriter, r *http.Request) {
 	w.Write(output)
 }
 func saveEdgeBendPointsHandler(w http.ResponseWriter, r *http.Request) {
-    var saveEdgeBendPointsRequest model.SaveEdgeBendPointsRequest
-    if r.Body == nil {
-        http.Error(w, "Please send a request body", 400)
-        return
-    }
-    err := json.NewDecoder(r.Body).Decode(&saveEdgeBendPointsRequest)
-    if err != nil {
-        http.Error(w, err.Error(), 400)
-        return
-    }
-	driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+	var saveEdgeBendPointsRequest model.SaveEdgeBendPointsRequest
+	if r.Body == nil {
+		http.Error(w, "Please send a request body", 400)
+		return
+	}
+	err := json.NewDecoder(r.Body).Decode(&saveEdgeBendPointsRequest)
+	if err != nil {
+		http.Error(w, err.Error(), 400)
+		return
+	}
+	//driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 	result, err := driver.SaveEdgeBendPoints(
 		saveEdgeBendPointsRequest.TaxonomyID, saveEdgeBendPointsRequest.AttributeSrc, saveEdgeBendPointsRequest.AttributeDest, saveEdgeBendPointsRequest.EdgeBendPoints, saveEdgeBendPointsRequest.Dimension)
 	checkErr(err)
@@ -1372,29 +1377,29 @@ func saveEdgeBendPointsHandler(w http.ResponseWriter, r *http.Request) {
 	w.Write(output)
 }
 func getCitationsPerAttributeHandler(u *url.URL, h http.Header, citationsPerAttributeRequest *model.CitationsPerAttributeRequest) (int, http.Header, *MyResponse, error) {
-	driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+	//driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 	citations, err := driver.GetCitationsPerAttribute(citationsPerAttributeRequest.TaxonomyID, citationsPerAttributeRequest.Attribute)
 	checkErr(err)
 	return http.StatusOK, nil, &MyResponse{"0", len(citations), citations}, nil
 }
 func getCitationsPerAttributeIncludingChildrenHandler(u *url.URL, h http.Header, citationsPerAttributeRequest *model.CitationsPerAttributeRequest) (int, http.Header, *MyResponse, error) {
-	driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+	//driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 	citations, err := driver.GetCitationsPerAttributeIncludingChildren(citationsPerAttributeRequest.TaxonomyID, citationsPerAttributeRequest.Attribute)
 	checkErr(err)
 	return http.StatusOK, nil, &MyResponse{"0", len(citations), citations}, nil
 }
 func addAttributeHandler(w http.ResponseWriter, r *http.Request) {
-    var attributeRequest model.AttributeRequest
-    if r.Body == nil {
-        http.Error(w, "Please send a request body", 400)
-        return
-    }
-    err := json.NewDecoder(r.Body).Decode(&attributeRequest)
-    if err != nil {
-        http.Error(w, err.Error(), 400)
-        return
-    }
-	driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+	var attributeRequest model.AttributeRequest
+	if r.Body == nil {
+		http.Error(w, "Please send a request body", 400)
+		return
+	}
+	err := json.NewDecoder(r.Body).Decode(&attributeRequest)
+	if err != nil {
+		http.Error(w, err.Error(), 400)
+		return
+	}
+	//driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 	attribute := model.Attribute{Text: attributeRequest.Text, X: attributeRequest.X, Y: attributeRequest.Y, XMajor: attributeRequest.XMajor, YMajor: attributeRequest.YMajor, Major: attributeRequest.Major, Dimension: attributeRequest.Dimension}
 	result, err := driver.AddAttribute(attributeRequest.TaxonomyID, attribute)
 	checkErr(err)
@@ -1407,17 +1412,17 @@ func addAttributeHandler(w http.ResponseWriter, r *http.Request) {
 	w.Write(output)
 }
 func addDimensionHandler(w http.ResponseWriter, r *http.Request) {
-    var dimensionRequest model.DimensionRequest
-    if r.Body == nil {
-        http.Error(w, "Please send a request body", 400)
-        return
-    }
-    err := json.NewDecoder(r.Body).Decode(&dimensionRequest)
-    if err != nil {
-        http.Error(w, err.Error(), 400)
-        return
-    }
-	driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+	var dimensionRequest model.DimensionRequest
+	if r.Body == nil {
+		http.Error(w, "Please send a request body", 400)
+		return
+	}
+	err := json.NewDecoder(r.Body).Decode(&dimensionRequest)
+	if err != nil {
+		http.Error(w, err.Error(), 400)
+		return
+	}
+	//driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 	result, err := driver.AddDimension(dimensionRequest.TaxonomyID, dimensionRequest.Text)
 	checkErr(err)
 	output, err := json.Marshal(result)
@@ -1429,17 +1434,17 @@ func addDimensionHandler(w http.ResponseWriter, r *http.Request) {
 	w.Write(output)
 }
 func changeDimensionHandler(w http.ResponseWriter, r *http.Request) {
-    var changeDimensionRequest model.ChangeDimensionRequest
-    if r.Body == nil {
-        http.Error(w, "Please send a request body", 400)
-        return
-    }
-    err := json.NewDecoder(r.Body).Decode(&changeDimensionRequest)
-    if err != nil {
-        http.Error(w, err.Error(), 400)
-        return
-    }
-	driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+	var changeDimensionRequest model.ChangeDimensionRequest
+	if r.Body == nil {
+		http.Error(w, "Please send a request body", 400)
+		return
+	}
+	err := json.NewDecoder(r.Body).Decode(&changeDimensionRequest)
+	if err != nil {
+		http.Error(w, err.Error(), 400)
+		return
+	}
+	//driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 	result, err := driver.ChangeDimension(changeDimensionRequest.TaxonomyID, changeDimensionRequest.Attribute, changeDimensionRequest.Dimension)
 	checkErr(err)
 	output, err := json.Marshal(result)
@@ -1451,17 +1456,17 @@ func changeDimensionHandler(w http.ResponseWriter, r *http.Request) {
 	w.Write(output)
 }
 func deleteCitationHandler(w http.ResponseWriter, r *http.Request) {
-    var citationRequest model.CitationRequest
-    if r.Body == nil {
-        http.Error(w, "Please send a request body", 400)
-        return
-    }
-    err := json.NewDecoder(r.Body).Decode(&citationRequest)
-    if err != nil {
-        http.Error(w, err.Error(), 400)
-        return
-    }
-	driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+	var citationRequest model.CitationRequest
+	if r.Body == nil {
+		http.Error(w, "Please send a request body", 400)
+		return
+	}
+	err := json.NewDecoder(r.Body).Decode(&citationRequest)
+	if err != nil {
+		http.Error(w, err.Error(), 400)
+		return
+	}
+	//driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 	citation := model.Paper{Citation: citationRequest.Citation}
 	result, err := driver.DeleteCitation(citationRequest.TaxonomyID, citation)
 	checkErr(err)
@@ -1474,17 +1479,17 @@ func deleteCitationHandler(w http.ResponseWriter, r *http.Request) {
 	w.Write(output)
 }
 func removeAttributeHandler(w http.ResponseWriter, r *http.Request) {
-    var attributeRequest model.AttributeRequest
-    if r.Body == nil {
-        http.Error(w, "Please send a request body", 400)
-        return
-    }
-    err := json.NewDecoder(r.Body).Decode(&attributeRequest)
-    if err != nil {
-        http.Error(w, err.Error(), 400)
-        return
-    }
-	driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+	var attributeRequest model.AttributeRequest
+	if r.Body == nil {
+		http.Error(w, "Please send a request body", 400)
+		return
+	}
+	err := json.NewDecoder(r.Body).Decode(&attributeRequest)
+	if err != nil {
+		http.Error(w, err.Error(), 400)
+		return
+	}
+	//driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 	attribute := model.Attribute{Text: attributeRequest.Text}
 	result, err := driver.RemoveAttribute(attributeRequest.TaxonomyID, attribute)
 	checkErr(err)
@@ -1497,17 +1502,17 @@ func removeAttributeHandler(w http.ResponseWriter, r *http.Request) {
 	w.Write(output)
 }
 func removeDimensionHandler(w http.ResponseWriter, r *http.Request) {
-    var dimensionRequest model.AttributeRequest
-    if r.Body == nil {
-        http.Error(w, "Please send a request body", 400)
-        return
-    }
-    err := json.NewDecoder(r.Body).Decode(&dimensionRequest)
-    if err != nil {
-        http.Error(w, err.Error(), 400)
-        return
-    }
-	driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+	var dimensionRequest model.AttributeRequest
+	if r.Body == nil {
+		http.Error(w, "Please send a request body", 400)
+		return
+	}
+	err := json.NewDecoder(r.Body).Decode(&dimensionRequest)
+	if err != nil {
+		http.Error(w, err.Error(), 400)
+		return
+	}
+	//driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 	dimension := model.Dimension{Text: dimensionRequest.Text}
 	result, err := driver.RemoveDimension(dimensionRequest.TaxonomyID, dimension)
 	checkErr(err)
@@ -1520,17 +1525,17 @@ func removeDimensionHandler(w http.ResponseWriter, r *http.Request) {
 	w.Write(output)
 }
 func renameAttributeHandler(w http.ResponseWriter, r *http.Request) {
-    var renameAttributeRequest model.RenameAttributeRequest
-    if r.Body == nil {
-        http.Error(w, "Please send a request body", 400)
-        return
-    }
-    err := json.NewDecoder(r.Body).Decode(&renameAttributeRequest)
-    if err != nil {
-        http.Error(w, err.Error(), 400)
-        return
-    }
-	driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+	var renameAttributeRequest model.RenameAttributeRequest
+	if r.Body == nil {
+		http.Error(w, "Please send a request body", 400)
+		return
+	}
+	err := json.NewDecoder(r.Body).Decode(&renameAttributeRequest)
+	if err != nil {
+		http.Error(w, err.Error(), 400)
+		return
+	}
+	//driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 	result, err := driver.RenameAttribute(renameAttributeRequest.TaxonomyID, renameAttributeRequest.PreviousName, renameAttributeRequest.NewName)
 	checkErr(err)
 	output, err := json.Marshal(result)
@@ -1542,17 +1547,17 @@ func renameAttributeHandler(w http.ResponseWriter, r *http.Request) {
 	w.Write(output)
 }
 func updateSynonymsHandler(w http.ResponseWriter, r *http.Request) {
-    var updateSynonymsRequest model.UpdateSynonymsRequest
-    if r.Body == nil {
-        http.Error(w, "Please send a request body", 400)
-        return
-    }
-    err := json.NewDecoder(r.Body).Decode(&updateSynonymsRequest)
-    if err != nil {
-        http.Error(w, err.Error(), 400)
-        return
-    }
-	driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+	var updateSynonymsRequest model.UpdateSynonymsRequest
+	if r.Body == nil {
+		http.Error(w, "Please send a request body", 400)
+		return
+	}
+	err := json.NewDecoder(r.Body).Decode(&updateSynonymsRequest)
+	if err != nil {
+		http.Error(w, err.Error(), 400)
+		return
+	}
+	//driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 	result, err := driver.UpdateSynonyms(updateSynonymsRequest.TaxonomyID, updateSynonymsRequest.Attribute, updateSynonymsRequest.Synonyms)
 	checkErr(err)
 	output, err := json.Marshal(result)
@@ -1564,17 +1569,17 @@ func updateSynonymsHandler(w http.ResponseWriter, r *http.Request) {
 	w.Write(output)
 }
 func renameDimensionHandler(w http.ResponseWriter, r *http.Request) {
-    var renameDimensionRequest model.RenameAttributeRequest
-    if r.Body == nil {
-        http.Error(w, "Please send a request body", 400)
-        return
-    }
-    err := json.NewDecoder(r.Body).Decode(&renameDimensionRequest)
-    if err != nil {
-        http.Error(w, err.Error(), 400)
-        return
-    }
-	driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+	var renameDimensionRequest model.RenameAttributeRequest
+	if r.Body == nil {
+		http.Error(w, "Please send a request body", 400)
+		return
+	}
+	err := json.NewDecoder(r.Body).Decode(&renameDimensionRequest)
+	if err != nil {
+		http.Error(w, err.Error(), 400)
+		return
+	}
+	//driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 	result, err := driver.RenameDimension(renameDimensionRequest.TaxonomyID, renameDimensionRequest.PreviousName, renameDimensionRequest.NewName)
 	checkErr(err)
 	output, err := json.Marshal(result)
@@ -1586,17 +1591,17 @@ func renameDimensionHandler(w http.ResponseWriter, r *http.Request) {
 	w.Write(output)
 }
 func addTaxonomyRelationHandler(w http.ResponseWriter, r *http.Request) {
-    var taxonomyRelationRequest model.AttributeRelationsRequest
-    if r.Body == nil {
-        http.Error(w, "Please send a request body", 400)
-        return
-    }
-    err := json.NewDecoder(r.Body).Decode(&taxonomyRelationRequest)
-    if err != nil {
-        http.Error(w, err.Error(), 400)
-        return
-    }
-	driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+	var taxonomyRelationRequest model.AttributeRelationsRequest
+	if r.Body == nil {
+		http.Error(w, "Please send a request body", 400)
+		return
+	}
+	err := json.NewDecoder(r.Body).Decode(&taxonomyRelationRequest)
+	if err != nil {
+		http.Error(w, err.Error(), 400)
+		return
+	}
+	//driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 	relation := model.AttributeRelation{TaxonomyID: taxonomyRelationRequest.TaxonomyID, AttributeSrc: taxonomyRelationRequest.AttributeSrc, AttributeDest: taxonomyRelationRequest.AttributeDest, Dimension: taxonomyRelationRequest.Dimension, Relation: taxonomyRelationRequest.Text}
 	result, err := driver.AddTaxonomyRelation(relation)
 	checkErr(err)
@@ -1609,17 +1614,17 @@ func addTaxonomyRelationHandler(w http.ResponseWriter, r *http.Request) {
 	w.Write(output)
 }
 func removeTaxonomyRelationHandler(w http.ResponseWriter, r *http.Request) {
-    var taxonomyRelationRequest model.AttributeRelationsRequest
-    if r.Body == nil {
-        http.Error(w, "Please send a request body", 400)
-        return
-    }
-    err := json.NewDecoder(r.Body).Decode(&taxonomyRelationRequest)
-    if err != nil {
-        http.Error(w, err.Error(), 400)
-        return
-    }
-	driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+	var taxonomyRelationRequest model.AttributeRelationsRequest
+	if r.Body == nil {
+		http.Error(w, "Please send a request body", 400)
+		return
+	}
+	err := json.NewDecoder(r.Body).Decode(&taxonomyRelationRequest)
+	if err != nil {
+		http.Error(w, err.Error(), 400)
+		return
+	}
+	//driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 	relation := model.AttributeRelation{TaxonomyID: taxonomyRelationRequest.TaxonomyID, AttributeSrc: taxonomyRelationRequest.AttributeSrc, AttributeDest: taxonomyRelationRequest.AttributeDest, Dimension: taxonomyRelationRequest.Dimension, Relation: taxonomyRelationRequest.Text}
 	result, err := driver.RemoveTaxonomyRelation(relation)
 	checkErr(err)
@@ -1632,17 +1637,17 @@ func removeTaxonomyRelationHandler(w http.ResponseWriter, r *http.Request) {
 	w.Write(output)
 }
 func updateTaxonomyRelationTypeHandler(w http.ResponseWriter, r *http.Request) {
-    var taxonomyRelationRequest model.AttributeRelationsRequest
-    if r.Body == nil {
-        http.Error(w, "Please send a request body", 400)
-        return
-    }
-    err := json.NewDecoder(r.Body).Decode(&taxonomyRelationRequest)
-    if err != nil {
-        http.Error(w, err.Error(), 400)
-        return
-    }
-	driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+	var taxonomyRelationRequest model.AttributeRelationsRequest
+	if r.Body == nil {
+		http.Error(w, "Please send a request body", 400)
+		return
+	}
+	err := json.NewDecoder(r.Body).Decode(&taxonomyRelationRequest)
+	if err != nil {
+		http.Error(w, err.Error(), 400)
+		return
+	}
+	//driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 	relation := model.AttributeRelation{TaxonomyID: taxonomyRelationRequest.TaxonomyID, AttributeSrc: taxonomyRelationRequest.AttributeSrc, AttributeDest: taxonomyRelationRequest.AttributeDest, Dimension: taxonomyRelationRequest.Dimension, Relation: taxonomyRelationRequest.Text}
 	result, err := driver.UpdateTaxonomyRelationType(relation)
 	checkErr(err)
@@ -1655,17 +1660,17 @@ func updateTaxonomyRelationTypeHandler(w http.ResponseWriter, r *http.Request) {
 	w.Write(output)
 }
 func updateTaxonomyRelationAnnotationHandler(w http.ResponseWriter, r *http.Request) {
-    var taxonomyRelationRequest model.AttributeRelationsRequest
-    if r.Body == nil {
-        http.Error(w, "Please send a request body", 400)
-        return
-    }
-    err := json.NewDecoder(r.Body).Decode(&taxonomyRelationRequest)
-    if err != nil {
-        http.Error(w, err.Error(), 400)
-        return
-    }
-	driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+	var taxonomyRelationRequest model.AttributeRelationsRequest
+	if r.Body == nil {
+		http.Error(w, "Please send a request body", 400)
+		return
+	}
+	err := json.NewDecoder(r.Body).Decode(&taxonomyRelationRequest)
+	if err != nil {
+		http.Error(w, err.Error(), 400)
+		return
+	}
+	//driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 	relation := model.AttributeRelation{TaxonomyID: taxonomyRelationRequest.TaxonomyID, AttributeSrc: taxonomyRelationRequest.AttributeSrc, AttributeDest: taxonomyRelationRequest.AttributeDest, Dimension: taxonomyRelationRequest.Dimension, Annotation: taxonomyRelationRequest.Text}
 	result, err := driver.UpdateTaxonomyRelationAnnotation(relation)
 	checkErr(err)
@@ -1678,7 +1683,7 @@ func updateTaxonomyRelationAnnotationHandler(w http.ResponseWriter, r *http.Requ
 	w.Write(output)
 }
 func getAttributesHandler(u *url.URL, h http.Header, attributesRequest *model.TaxonomyRequest) (int, http.Header, *MyResponse, error) {
-	driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+	//driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 	attributes, err := driver.GetAllAttributes(
 		attributesRequest.TaxonomyID)
 	checkErr(err)
@@ -1686,7 +1691,7 @@ func getAttributesHandler(u *url.URL, h http.Header, attributesRequest *model.Ta
 		&MyResponse{"0", len(attributes), attributes}, nil
 }
 func getLeafAttributesHandler(u *url.URL, h http.Header, attributesRequest *model.TaxonomyRequest) (int, http.Header, *MyResponse, error) {
-	driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+	//driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 	attributes, err := driver.GetLeafAttributes(
 		attributesRequest.TaxonomyID)
 	checkErr(err)
@@ -1694,7 +1699,7 @@ func getLeafAttributesHandler(u *url.URL, h http.Header, attributesRequest *mode
 		&MyResponse{"0", len(attributes), attributes}, nil
 }
 func getDimensionsHandler(u *url.URL, h http.Header, dimensionRequest *model.TaxonomyRequest) (int, http.Header, *MyResponse, error) {
-	driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+	//driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 	dimensions, err := driver.GetAllDimensions(
 		dimensionRequest.TaxonomyID)
 	checkErr(err)
@@ -1702,20 +1707,20 @@ func getDimensionsHandler(u *url.URL, h http.Header, dimensionRequest *model.Tax
 		&MyResponse{"0", len(dimensions), dimensions}, nil
 }
 func getCitationsHandler(u *url.URL, h http.Header, taxonomyRequest *model.TaxonomyRequest) (int, http.Header, *MyResponse, error) {
-	driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+	//driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 	citations, err := driver.GetAllCitations(taxonomyRequest.TaxonomyID)
 	checkErr(err)
 	return http.StatusOK, nil, &MyResponse{"0", len(citations), citations}, nil
 }
 func getCitationCountHandler(u *url.URL, h http.Header, taxonomyRequest *model.TaxonomyRequest) (int, http.Header, *MyResponse, error) {
-	driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+	//driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 	citationCount, err := driver.GetCitationCount(taxonomyRequest.TaxonomyID)
 	checkErr(err)
 	return http.StatusOK, nil,
 		&MyResponse{"0", len(citationCount), citationCount}, nil
 }
 func getCitationCountsHandler(u *url.URL, h http.Header, taxonomyRequest *model.TaxonomyRequest) (int, http.Header, *MyResponse, error) {
-	driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+	//driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 	citationCounts, err := driver.GetCitationCounts(
 		taxonomyRequest.TaxonomyID)
 	checkErr(err)
@@ -1723,17 +1728,17 @@ func getCitationCountsHandler(u *url.URL, h http.Header, taxonomyRequest *model.
 		&MyResponse{"0", len(citationCounts), citationCounts}, nil
 }
 func getUpdateCitationReferenceCountsHandler(w http.ResponseWriter, r *http.Request) {
-    var updateReferenceCountsRequest model.UpdateReferenceCountsRequest
-    if r.Body == nil {
-        http.Error(w, "Please send a request body", 400)
-        return
-    }
-    err := json.NewDecoder(r.Body).Decode(&updateReferenceCountsRequest)
-    if err != nil {
-        http.Error(w, err.Error(), 400)
-        return
-    }
-	driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+	var updateReferenceCountsRequest model.UpdateReferenceCountsRequest
+	if r.Body == nil {
+		http.Error(w, "Please send a request body", 400)
+		return
+	}
+	err := json.NewDecoder(r.Body).Decode(&updateReferenceCountsRequest)
+	if err != nil {
+		http.Error(w, err.Error(), 400)
+		return
+	}
+	//driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 	result, err := driver.UpdateCitationReferenceCounts(updateReferenceCountsRequest.TaxonomyID, updateReferenceCountsRequest.ReferenceCounts)
 	checkErr(err)
 	output, err := json.Marshal(result)
@@ -1745,7 +1750,7 @@ func getUpdateCitationReferenceCountsHandler(w http.ResponseWriter, r *http.Requ
 	w.Write(output)
 }
 func getCitationCountsIncludingChildrenHandler(u *url.URL, h http.Header, taxonomyRequest *model.TaxonomyRequest) (int, http.Header, *MyResponse, error) {
-	driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+	//driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 	citationCounts, err := driver.GetCitationCountsIncludingChildren(
 		taxonomyRequest.TaxonomyID)
 	checkErr(err)
@@ -1753,17 +1758,17 @@ func getCitationCountsIncludingChildrenHandler(u *url.URL, h http.Header, taxono
 		&MyResponse{"0", len(citationCounts), citationCounts}, nil
 }
 func getUpdateMajorHandler(w http.ResponseWriter, r *http.Request) {
-    var updateMajorRequest model.UpdateMajorRequest
-    if r.Body == nil {
-        http.Error(w, "Please send a request body", 400)
-        return
-    }
-    err := json.NewDecoder(r.Body).Decode(&updateMajorRequest)
-    if err != nil {
-        http.Error(w, err.Error(), 400)
-        return
-    }
-	driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+	var updateMajorRequest model.UpdateMajorRequest
+	if r.Body == nil {
+		http.Error(w, "Please send a request body", 400)
+		return
+	}
+	err := json.NewDecoder(r.Body).Decode(&updateMajorRequest)
+	if err != nil {
+		http.Error(w, err.Error(), 400)
+		return
+	}
+	//driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 	result, err := driver.UpdateMajor(updateMajorRequest.TaxonomyID, updateMajorRequest.Text, updateMajorRequest.Major)
 	checkErr(err)
 	output, err := json.Marshal(result)
@@ -1775,17 +1780,17 @@ func getUpdateMajorHandler(w http.ResponseWriter, r *http.Request) {
 	w.Write(output)
 }
 func getUpdateCitationMappingHandler(w http.ResponseWriter, r *http.Request) {
-    var updateCitationMappingRequest model.UpdateCitationMappingRequest
-    if r.Body == nil {
-        http.Error(w, "Please send a request body", 400)
-        return
-    }
-    err := json.NewDecoder(r.Body).Decode(&updateCitationMappingRequest)
-    if err != nil {
-        http.Error(w, err.Error(), 400)
-        return
-    }
-	driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+	var updateCitationMappingRequest model.UpdateCitationMappingRequest
+	if r.Body == nil {
+		http.Error(w, "Please send a request body", 400)
+		return
+	}
+	err := json.NewDecoder(r.Body).Decode(&updateCitationMappingRequest)
+	if err != nil {
+		http.Error(w, err.Error(), 400)
+		return
+	}
+	//driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 	result, err := driver.UpdateCitationMapping(updateCitationMappingRequest.TaxonomyID, updateCitationMappingRequest.Attribute, updateCitationMappingRequest.Citations)
 	checkErr(err)
 	output, err := json.Marshal(result)
@@ -1797,17 +1802,17 @@ func getUpdateCitationMappingHandler(w http.ResponseWriter, r *http.Request) {
 	w.Write(output)
 }
 func getUpdateCitationMappingsHandler(w http.ResponseWriter, r *http.Request) {
-    var updateCitationMappingsRequest model.UpdateCitationMappingsRequest
-    if r.Body == nil {
-        http.Error(w, "Please send a request body", 400)
-        return
-    }
-    err := json.NewDecoder(r.Body).Decode(&updateCitationMappingsRequest)
-    if err != nil {
-        http.Error(w, err.Error(), 400)
-        return
-    }
-	driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+	var updateCitationMappingsRequest model.UpdateCitationMappingsRequest
+	if r.Body == nil {
+		http.Error(w, "Please send a request body", 400)
+		return
+	}
+	err := json.NewDecoder(r.Body).Decode(&updateCitationMappingsRequest)
+	if err != nil {
+		http.Error(w, err.Error(), 400)
+		return
+	}
+	//driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 	result, err := driver.UpdateCitationMappings(updateCitationMappingsRequest.TaxonomyID, updateCitationMappingsRequest.Mappings)
 	checkErr(err)
 	output, err := json.Marshal(result)
@@ -1819,13 +1824,13 @@ func getUpdateCitationMappingsHandler(w http.ResponseWriter, r *http.Request) {
 	w.Write(output)
 }
 func getRelationTypesHandler(u *url.URL, h http.Header, r *MyRequest) (int, http.Header, *MyResponse, error) {
-	driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+	//driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 	relationTypes, err := driver.GetRelationTypes()
 	checkErr(err)
 	return http.StatusOK, nil, &MyResponse{"0", len(relationTypes), relationTypes}, nil
 }
 func getConceptCorrelationsHandler(u *url.URL, h http.Header, taxonomyRequest *model.TaxonomyRequest) (int, http.Header, *MyResponse, error) {
-	driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+	//driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 	conceptRelations, err := driver.GetConceptRelations(
 		taxonomyRequest.TaxonomyID)
 	checkErr(err)
@@ -1833,7 +1838,7 @@ func getConceptCorrelationsHandler(u *url.URL, h http.Header, taxonomyRequest *m
 		&MyResponse{"0", len(conceptRelations), conceptRelations}, nil
 }
 func getConceptCorrelations3DHandler(u *url.URL, h http.Header, taxonomyRequest *model.TaxonomyRequest) (int, http.Header, *MyResponse, error) {
-	driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+	//driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 	conceptRelations, err := driver.GetConceptRelations3D(
 		taxonomyRequest.TaxonomyID)
 	checkErr(err)
@@ -1841,7 +1846,7 @@ func getConceptCorrelations3DHandler(u *url.URL, h http.Header, taxonomyRequest
 		&MyResponse{"0", len(conceptRelations), conceptRelations}, nil
 }
 func getConceptCorrelationsWithReferenceCountsHandler(u *url.URL, h http.Header, taxonomyRequest *model.TaxonomyRequest) (int, http.Header, *MyResponse, error) {
-	driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+	//driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 	conceptRelations, err := driver.GetConceptRelationsWithReferenceCounts(
 		taxonomyRequest.TaxonomyID)
 	checkErr(err)
@@ -1849,7 +1854,7 @@ func getConceptCorrelationsWithReferenceCountsHandler(u *url.URL, h http.Header,
 		&MyResponse{"0", len(conceptRelations), conceptRelations}, nil
 }
 func getConceptCorrelationsWithReferenceCounts3DHandler(u *url.URL, h http.Header, taxonomyRequest *model.TaxonomyRequest) (int, http.Header, *MyResponse, error) {
-	driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+	//driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 	conceptRelations, err := driver.GetConceptRelationsWithReferenceCounts3D(
 		taxonomyRequest.TaxonomyID)
 	checkErr(err)
@@ -1857,7 +1862,7 @@ func getConceptCorrelationsWithReferenceCounts3DHandler(u *url.URL, h http.Heade
 		&MyResponse{"0", len(conceptRelations), conceptRelations}, nil
 }
 func getAllConceptCorrelationsHandler(u *url.URL, h http.Header, taxonomyRequest *model.TaxonomyRequest) (int, http.Header, *MyResponse, error) {
-	driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+	//driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 	conceptRelations, err := driver.GetAllConceptRelations(
 		taxonomyRequest.TaxonomyID)
 	checkErr(err)
@@ -1865,7 +1870,7 @@ func getAllConceptCorrelationsHandler(u *url.URL, h http.Header, taxonomyRequest
 		&MyResponse{"0", len(conceptRelations), conceptRelations}, nil
 }
 func getAllConceptCorrelations3DHandler(u *url.URL, h http.Header, taxonomyRequest *model.TaxonomyRequest) (int, http.Header, *MyResponse, error) {
-	driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+	//driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 	conceptRelations, err := driver.GetAllConceptRelations3D(
 		taxonomyRequest.TaxonomyID)
 	checkErr(err)
@@ -1873,7 +1878,7 @@ func getAllConceptCorrelations3DHandler(u *url.URL, h http.Header, taxonomyReque
 		&MyResponse{"0", len(conceptRelations), conceptRelations}, nil
 }
 func getAllConceptCorrelationsWithReferenceCountsHandler(u *url.URL, h http.Header, taxonomyRequest *model.TaxonomyRequest) (int, http.Header, *MyResponse, error) {
-	driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+	//driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 	conceptRelations, err := driver.GetAllConceptRelationsWithReferenceCounts(
 		taxonomyRequest.TaxonomyID)
 	checkErr(err)
@@ -1881,7 +1886,7 @@ func getAllConceptCorrelationsWithReferenceCountsHandler(u *url.URL, h http.Head
 		&MyResponse{"0", len(conceptRelations), conceptRelations}, nil
 }
 func getAllConceptCorrelationsWithReferenceCounts3DHandler(u *url.URL, h http.Header, taxonomyRequest *model.TaxonomyRequest) (int, http.Header, *MyResponse, error) {
-	driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+	//driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 	conceptRelations, err := driver.GetAllConceptRelationsWithReferenceCounts3D(
 		taxonomyRequest.TaxonomyID)
 	checkErr(err)
@@ -1889,65 +1894,65 @@ func getAllConceptCorrelationsWithReferenceCounts3DHandler(u *url.URL, h http.He
 		&MyResponse{"0", len(conceptRelations), conceptRelations}, nil
 }
 func GetParentRelationsPerAttributeHandler(u *url.URL, h http.Header, attributeRelationsRequest *model.AttributeRelationsRequest) (int, http.Header, *MyResponse, error) {
-	driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+	//driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 	relations, err := driver.GetParentRelationsPerAttribute(attributeRelationsRequest.TaxonomyID, attributeRelationsRequest.Text, attributeRelationsRequest.Dimension)
 	checkErr(err)
 	return http.StatusOK, nil, &MyResponse{"0", len(relations), relations}, nil
 }
 func GetChildRelationsPerAttributeHandler(u *url.URL, h http.Header, attributeRelationsRequest *model.AttributeRelationsRequest) (int, http.Header, *MyResponse, error) {
-	driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+	//driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 	relations, err := driver.GetChildRelationsPerAttribute(attributeRelationsRequest.TaxonomyID, attributeRelationsRequest.Text, attributeRelationsRequest.Dimension)
 	checkErr(err)
 	return http.StatusOK, nil, &MyResponse{"0", len(relations), relations}, nil
 }
 func getSharedPapersHandler(u *url.URL, h http.Header, sharedPapersRequest *model.SharedPapersRequest) (int, http.Header, *MyResponse, error) {
-	driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+	//driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 	papers, err := driver.GetSharedPapers(sharedPapersRequest.TaxonomyID, sharedPapersRequest.Text1, sharedPapersRequest.Text2)
 	checkErr(err)
 	return http.StatusOK, nil, &MyResponse{"0", len(papers), papers}, nil
 }
 func getSharedPapers3DHandler(u *url.URL, h http.Header, sharedPapersRequest *model.SharedPapersRequest) (int, http.Header, *MyResponse, error) {
-	driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+	//driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 	papers, err := driver.GetSharedPapers3D(sharedPapersRequest.TaxonomyID, sharedPapersRequest.Text1, sharedPapersRequest.Text2, sharedPapersRequest.Text3)
 	checkErr(err)
 	return http.StatusOK, nil, &MyResponse{"0", len(papers), papers}, nil
 }
 func getSharedPapersIncludingChildrenHandler(u *url.URL, h http.Header, sharedPapersRequest *model.SharedPapersRequest) (int, http.Header, *MyResponse, error) {
-	driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+	//driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 	papers, err := driver.GetSharedPapersIncludingChildren(sharedPapersRequest.TaxonomyID, sharedPapersRequest.Text1, sharedPapersRequest.Text2)
 	checkErr(err)
 	return http.StatusOK, nil, &MyResponse{"0", len(papers), papers}, nil
 }
 func getSharedPapersIncludingChildren3DHandler(u *url.URL, h http.Header, sharedPapersRequest *model.SharedPapersRequest) (int, http.Header, *MyResponse, error) {
-	driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+	//driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 	papers, err := driver.GetSharedPapersIncludingChildren3D(sharedPapersRequest.TaxonomyID, sharedPapersRequest.Text1, sharedPapersRequest.Text2, sharedPapersRequest.Text3)
 	checkErr(err)
 	return http.StatusOK, nil, &MyResponse{"0", len(papers), papers}, nil
 }
 func getAttributeDetailsHandler(u *url.URL, h http.Header, attributeDetailsRequest *model.AttributeDetailsRequest) (int, http.Header, *MyResponse, error) {
-	driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+	//driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 	attributeDetails, err := driver.GetAttributeDetails(attributeDetailsRequest.TaxonomyID, attributeDetailsRequest.Text)
 	checkErr(err)
 	return http.StatusOK, nil, &MyResponse{"0", len(attributeDetails), attributeDetails}, nil
 }
 func getCitationDetailsHandler(u *url.URL, h http.Header, citationDetailsRequest *model.SharedPapersRequest) (int, http.Header, *MyResponse, error) {
-	driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+	//driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 	citationDetails, err := driver.GetCitationDetails(citationDetailsRequest.TaxonomyID, citationDetailsRequest.Text1, citationDetailsRequest.Text2)
 	checkErr(err)
 	return http.StatusOK, nil, &MyResponse{"0", len(citationDetails), citationDetails}, nil
 }
 func getMergeAttributesHandler(w http.ResponseWriter, r *http.Request) {
-    var mergeAttributesRequest model.MergeAttributesRequest
-    if r.Body == nil {
-        http.Error(w, "Please send a request body", 400)
-        return
-    }
-    err := json.NewDecoder(r.Body).Decode(&mergeAttributesRequest)
-    if err != nil {
-        http.Error(w, err.Error(), 400)
-        return
-    }
-	driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+	var mergeAttributesRequest model.MergeAttributesRequest
+	if r.Body == nil {
+		http.Error(w, "Please send a request body", 400)
+		return
+	}
+	err := json.NewDecoder(r.Body).Decode(&mergeAttributesRequest)
+	if err != nil {
+		http.Error(w, err.Error(), 400)
+		return
+	}
+	//driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 	attribute1 := model.Attribute{Text: mergeAttributesRequest.Text1, Dimension: mergeAttributesRequest.Dimension1}
 	attribute2 := model.Attribute{Text: mergeAttributesRequest.Text2, Dimension: mergeAttributesRequest.Dimension2}
 	result, err := driver.MergeAttributes(mergeAttributesRequest.TaxonomyID, attribute1, attribute2)
@@ -1961,17 +1966,17 @@ func getMergeAttributesHandler(w http.ResponseWriter, r *http.Request) {
 	w.Write(output)
 }
 func getForkAttributeHandler(w http.ResponseWriter, r *http.Request) {
-    var forkAttributeRequest model.ForkAttributeRequest
-    if r.Body == nil {
-        http.Error(w, "Please send a request body", 400)
-        return
-    }
-    err := json.NewDecoder(r.Body).Decode(&forkAttributeRequest)
-    if err != nil {
-        http.Error(w, err.Error(), 400)
-        return
-    }
-	driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+	var forkAttributeRequest model.ForkAttributeRequest
+	if r.Body == nil {
+		http.Error(w, "Please send a request body", 400)
+		return
+	}
+	err := json.NewDecoder(r.Body).Decode(&forkAttributeRequest)
+	if err != nil {
+		http.Error(w, err.Error(), 400)
+		return
+	}
+	//driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 	result, err := driver.ForkAttribute(forkAttributeRequest.TaxonomyID, forkAttributeRequest.Text, forkAttributeRequest.Dimension, forkAttributeRequest.Parents1, forkAttributeRequest.Parents2, forkAttributeRequest.Children1, forkAttributeRequest.Children2, forkAttributeRequest.Citations1, forkAttributeRequest.Citations2)
 	checkErr(err)
 	output, err := json.Marshal(result)
@@ -1983,7 +1988,7 @@ func getForkAttributeHandler(w http.ResponseWriter, r *http.Request) {
 	w.Write(output)
 }
 func getAttributesByNameHandler(u *url.URL, h http.Header, attributesByNameRequest *model.AttributesByNameRequest) (int, http.Header, *MyResponse, error) {
-	driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+	//driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 	attributes, err := driver.GetAttributesByName(
 		attributesByNameRequest.TaxonomyID, attributesByNameRequest.Texts)
 	checkErr(err)
@@ -1991,7 +1996,7 @@ func getAttributesByNameHandler(u *url.URL, h http.Header, attributesByNameReque
 		&MyResponse{"0", len(attributes), attributes}, nil
 }
 func getAttributeCoverageHandler(u *url.URL, h http.Header, taxonomyRequest *model.TaxonomyRequest) (int, http.Header, *MyResponse, error) {
-	driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+	//driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 	attributeCoverage, err := driver.GetAttributeCoverage(
 		taxonomyRequest.TaxonomyID)
 	checkErr(err)
@@ -1999,7 +2004,7 @@ func getAttributeCoverageHandler(u *url.URL, h http.Header, taxonomyRequest *mod
 		&MyResponse{"0", len(attributeCoverage), attributeCoverage}, nil
 }
 func getAttributeCoverageWithOccurrenceCountsHandler(u *url.URL, h http.Header, taxonomyRequest *model.TaxonomyRequest) (int, http.Header, *MyResponse, error) {
-	driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+	//driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 	attributeCoverage, err := driver.GetAttributeCoverageWithOcurrenceCounts(
 		taxonomyRequest.TaxonomyID)
 	checkErr(err)
@@ -2007,7 +2012,7 @@ func getAttributeCoverageWithOccurrenceCountsHandler(u *url.URL, h http.Header,
 		&MyResponse{"0", len(attributeCoverage), attributeCoverage}, nil
 }
 func getAttributeCoverageWithReferenceCountsHandler(u *url.URL, h http.Header, taxonomyRequest *model.TaxonomyRequest) (int, http.Header, *MyResponse, error) {
-	driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+	//driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 	attributeCoverage, err := driver.GetAttributeCoverageWithReferenceCounts(
 		taxonomyRequest.TaxonomyID)
 	checkErr(err)
@@ -2015,7 +2020,7 @@ func getAttributeCoverageWithReferenceCountsHandler(u *url.URL, h http.Header, t
 		&MyResponse{"0", len(attributeCoverage), attributeCoverage}, nil
 }
 func getKMeansHandler(u *url.URL, h http.Header, kMeansRequest *model.KMeansRequest) (int, http.Header, *MyResponse, error) {
-	driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+	//driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 	clusters, err := driver.KMeans(
 		kMeansRequest.TaxonomyID, kMeansRequest.N)
 	checkErr(err)
@@ -2209,16 +2214,16 @@ func getReviewStatsHandler(u *url.URL, h http.Header, r *MyRequest) (int, http.H
 }
 
 func getReviewListHandler(w http.ResponseWriter, r *http.Request) {
-    var reviewListRequest model.ReviewListRequest
-    if r.Body == nil {
-        http.Error(w, "Please send a request body", 400)
-        return
-    }
-    err := json.NewDecoder(r.Body).Decode(&reviewListRequest)
-    if err != nil {
-        http.Error(w, err.Error(), 400)
-        return
-    }
+	var reviewListRequest model.ReviewListRequest
+	if r.Body == nil {
+		http.Error(w, "Please send a request body", 400)
+		return
+	}
+	err := json.NewDecoder(r.Body).Decode(&reviewListRequest)
+	if err != nil {
+		http.Error(w, err.Error(), 400)
+		return
+	}
 	driver := data.InitPaperReviewDriver(*mysqlUser, *mysqlPassword)
 	result, err := driver.GetApprovedPapersWithDetails(reviewListRequest.ResearchID, reviewListRequest.Threshold)
 	checkErr(err)
@@ -2232,17 +2237,17 @@ func getReviewListHandler(w http.ResponseWriter, r *http.Request) {
 }
 
 func saveReviewMappingsHandler(w http.ResponseWriter, r *http.Request) {
-    var saveReviewMappingsRequest model.SaveReviewMappingsRequest
-    if r.Body == nil {
-        http.Error(w, "Please send a request body", 400)
-        return
-    }
-    err := json.NewDecoder(r.Body).Decode(&saveReviewMappingsRequest)
-    if err != nil {
-        http.Error(w, err.Error(), 400)
-        return
-    }
-	driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
+	var saveReviewMappingsRequest model.SaveReviewMappingsRequest
+	if r.Body == nil {
+		http.Error(w, "Please send a request body", 400)
+		return
+	}
+	err := json.NewDecoder(r.Body).Decode(&saveReviewMappingsRequest)
+	if err != nil {
+		http.Error(w, err.Error(), 400)
+		return
+	}
+	//driver := data.InitClassificationDriver(*mysqlUser, *mysqlPassword)
 	result, err := driver.SaveReviewMappings(saveReviewMappingsRequest.TaxonomyID, saveReviewMappingsRequest.Attributes, saveReviewMappingsRequest.Mappings)
 	checkErr(err)
 	output, err := json.Marshal(result)
@@ -2255,16 +2260,16 @@ func saveReviewMappingsHandler(w http.ResponseWriter, r *http.Request) {
 }
 
 func deleteArticleVotesHandler(w http.ResponseWriter, r *http.Request) {
-    var deleteArticleVotesRequest model.DeleteArticleVotesRequest
-    if r.Body == nil {
-        http.Error(w, "Please send a request body", 400)
-        return
-    }
-    err := json.NewDecoder(r.Body).Decode(&deleteArticleVotesRequest)
-    if err != nil {
-        http.Error(w, err.Error(), 400)
-        return
-    }
+	var deleteArticleVotesRequest model.DeleteArticleVotesRequest
+	if r.Body == nil {
+		http.Error(w, "Please send a request body", 400)
+		return
+	}
+	err := json.NewDecoder(r.Body).Decode(&deleteArticleVotesRequest)
+	if err != nil {
+		http.Error(w, err.Error(), 400)
+		return
+	}
 	driver := data.InitPaperReviewDriver(*mysqlUser, *mysqlPassword)
 	result, err := driver.DeleteArticleVotes(deleteArticleVotesRequest.Articles)
 	checkErr(err)