diff --git a/.goreleaser.yaml b/.goreleaser.yaml
index c7259a1..e866b1a 100644
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -11,7 +11,7 @@ builds:
       - CGO_ENABLED=0
     id: "openid-client"
     dir: .
-    main: ./cmd/openid-client.go
+    main: ./openid-client/openid-client.go
     ldflags:
       - '-s -w -X main.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.Date}}'
     goos:
diff --git a/Makefile b/Makefile
index 112ab3b..0394901 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,3 @@
 all:
-	go build cmd/openid-client.go
+	go build -o ~/openid-client openid-client/openid-client.go
 
diff --git a/README.md b/README.md
index 52a6a3d..00d8513 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,5 @@
- # SAP Cloud Identity Services - openid-commandline-client
+ # SAP Cloud Identity Services - openid-client
+ 
 This project provides a command line interface (CLI) to generate OpenID (OIDC) Tokens from an OIDC complaint serverr, mainly created to test new features like PKCE and Public Client support or Private Key JWT. Mainly for IAS compliance tests. However, any other OIDC provider can be used to get tokens.
 The API documentation is available here: https://help.sap.com/docs/cloud-identity-services/cloud-identity-services/openid-connect  
 
diff --git a/cmd/openid-client.go b/openid-client/openid-client.go
similarity index 100%
rename from cmd/openid-client.go
rename to openid-client/openid-client.go
diff --git a/cmd/openid-client_test.go b/openid-client/openid-client_test.go
similarity index 100%
rename from cmd/openid-client_test.go
rename to openid-client/openid-client_test.go