Change baseDir and envFile

README.md

@@ -91,6 +91,12 @@ CREATE DATABASE fin4 default charset utf8;
 ```
 Assign a user full access right to the fin4 database (or leave it with root).
 
+```SQL
+CREATE USER 'newuser'@'localhost' IDENTIFIED BY 'password1';
+GRANT ALL PRIVILEGES ON * . * TO 'newuser'@'localhost';
+FLUSH PRIVILEGES;
+```
+
 ## Env variables
  Copy .env_sample file to .env.
  Then, modify the following entries:

main.go

@@ -20,7 +20,7 @@ func main() {
 	environment := strings.ToLower(env.MustGetenv("ENVIRONMENT"))
 
 	//TODO this should be changed ASAP
-	baseDir := "$GOPATH/src/github.com/FuturICT2/fin4-core"
+	baseDir := "$GOPATH/fin4-core"
 	env.Load(baseDir, false)
 
 	cfg := datatype.Config{

server/env/env.go

@@ -18,7 +18,7 @@ func Load(baseDir string, isTesting bool) {
 	if isTesting {
 		envFile = "env-test"
 	} else {
-		envFile = "env-default"
+		envFile = ".env" //"env-default"
 	}
 
 	err := godotenv.Load(os.ExpandEnv(