diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0812c8b..2f725e5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,14 +4,9 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [0.1.1] - 2019-07-05
+- Move to 'go mod'
 
-## [1.0.0] - 2017-06-20
+## [0.1.0] - 2019-07-05
 ### Added
-
-
-
-
-
-[Unreleased]: https://github.com/olivierlacan/keep-a-changelog/compare/v1.0.0...HEAD
-[1.0.0]: https://github.com/olivierlacan/keep-a-changelog/compare/v0.3.0...v1.0.0
\ No newline at end of file
+- Inital release
diff --git a/bin/gaspass_linux-amd64.bin b/bin/gaspass_linux-amd64.bin
deleted file mode 100755
index 05ee3c8..0000000
Binary files a/bin/gaspass_linux-amd64.bin and /dev/null differ
diff --git a/src/gaspass/gaspass_test.go b/gaspass-core/gaspass_test.go
similarity index 100%
rename from src/gaspass/gaspass_test.go
rename to gaspass-core/gaspass_test.go
diff --git a/src/gaspass/main.go b/gaspass-core/main.go
similarity index 100%
rename from src/gaspass/main.go
rename to gaspass-core/main.go
diff --git a/go.mod b/go.mod
new file mode 100644
index 0000000..9ca962c
--- /dev/null
+++ b/go.mod
@@ -0,0 +1,9 @@
+module github.com/KawaiDesu/gaspass
+
+go 1.12
+
+require (
+	github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e
+	github.com/jessevdk/go-flags v1.4.1-0.20181221193153-c0795c8afcf4
+	golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4
+)
diff --git a/go.sum b/go.sum
new file mode 100644
index 0000000..85368d9
--- /dev/null
+++ b/go.sum
@@ -0,0 +1,14 @@
+github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e h1:fY5BOSpyZCqRo5OhCuC+XN+r/bBCmeuuJtjz+bCNIf8=
+github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
+github.com/jessevdk/go-flags v1.4.0 h1:4IU2WS7AumrZ/40jfhf4QVDMsQwqA7VEHozFRrGARJA=
+github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
+github.com/jessevdk/go-flags v1.4.1-0.20181221193153-c0795c8afcf4 h1:xKkUL6QBojwguhKKetf1SocCAKqc6W7S/mGm9xEGllo=
+github.com/jessevdk/go-flags v1.4.1-0.20181221193153-c0795c8afcf4/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4 h1:HuIa8hRrWRSrqYzx1qI49NNxhdi2PrY7gxVSq1JjLDc=
+golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d h1:+R4KGOnez64A81RvjARKc4UT5/tI9ujCIVX+P5KiHuI=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
diff --git a/src/main.go b/main.go
similarity index 96%
rename from src/main.go
rename to main.go
index 2d9a40a..377b200 100644
--- a/src/main.go
+++ b/main.go
@@ -2,9 +2,9 @@ package main
 
 import (
 	"fmt"
-	"github.com/KawaiDesu/gaspass/src/gaspass"
+	"github.com/KawaiDesu/gaspass/gaspass-core"
 	"github.com/chzyer/readline"
-	flags "github.com/jessevdk/go-flags"
+	"github.com/jessevdk/go-flags"
 	"os"
 )