diff --git a/lib/build.gradle b/lib/build.gradle
index 7b7e911..22d0832 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 version = "0.0.4"
-archivesBaseName = "tribufu"
+archivesBaseName = "Tribufu"
 
 repositories {
     mavenCentral()
diff --git a/lib/src/main/java/com/tribufu/sdk/TribufuClient.java b/lib/src/main/java/com/tribufu/TribufuClient.java
similarity index 97%
rename from lib/src/main/java/com/tribufu/sdk/TribufuClient.java
rename to lib/src/main/java/com/tribufu/TribufuClient.java
index 900f2fb..b79c004 100644
--- a/lib/src/main/java/com/tribufu/sdk/TribufuClient.java
+++ b/lib/src/main/java/com/tribufu/TribufuClient.java
@@ -1,6 +1,6 @@
 // Copyright (c) Tribufu. All Rights Reserved.
 
-package com.tribufu.sdk;
+package com.tribufu;
 
 import java.net.http.HttpClient;
 import java.util.HashMap;
diff --git a/lib/src/main/java/com/tribufu/oauth2/OAuth2AuthorizeRequest.java b/lib/src/main/java/com/tribufu/oauth2/OAuth2AuthorizeRequest.java
new file mode 100644
index 0000000..6b1efc4
--- /dev/null
+++ b/lib/src/main/java/com/tribufu/oauth2/OAuth2AuthorizeRequest.java
@@ -0,0 +1,20 @@
+// Copyright (c) Tribufu. All Rights Reserved.
+
+package com.tribufu.oauth2;
+
+public class OAuth2AuthorizeRequest {
+    private final OAuth2ResponseType responseType;
+    private final String clientId;
+    private final String scope;
+    private final String redirectUri;
+    private final String state;
+
+    public OAuth2AuthorizeRequest(OAuth2ResponseType responseType, String clientId, String scope, String redirectUri,
+            String state) {
+        this.responseType = responseType;
+        this.clientId = clientId;
+        this.scope = scope;
+        this.redirectUri = redirectUri;
+        this.state = state;
+    }
+}
diff --git a/lib/src/main/java/com/tribufu/oauth2/OAuth2CodeResponse.java b/lib/src/main/java/com/tribufu/oauth2/OAuth2CodeResponse.java
new file mode 100644
index 0000000..c7a0241
--- /dev/null
+++ b/lib/src/main/java/com/tribufu/oauth2/OAuth2CodeResponse.java
@@ -0,0 +1,13 @@
+// Copyright (c) Tribufu. All Rights Reserved.
+
+package com.tribufu.oauth2;
+
+public class OAuth2CodeResponse {
+    public final String code;
+    public final String state;
+
+    public OAuth2CodeResponse(String code, String state) {
+        this.code = code;
+        this.state = state;
+    }
+}
diff --git a/lib/src/main/java/com/tribufu/oauth2/OAuth2GrantType.java b/lib/src/main/java/com/tribufu/oauth2/OAuth2GrantType.java
new file mode 100644
index 0000000..eb1cb8c
--- /dev/null
+++ b/lib/src/main/java/com/tribufu/oauth2/OAuth2GrantType.java
@@ -0,0 +1,11 @@
+// Copyright (c) Tribufu. All Rights Reserved.
+
+package com.tribufu.oauth2;
+
+public enum OAuth2GrantType {
+    AuthorizationCode,
+    RefreshToken,
+    Password,
+    ClientCredentials,
+    DeviceCode,
+}
diff --git a/lib/src/main/java/com/tribufu/oauth2/OAuth2ResponseType.java b/lib/src/main/java/com/tribufu/oauth2/OAuth2ResponseType.java
new file mode 100644
index 0000000..6309cad
--- /dev/null
+++ b/lib/src/main/java/com/tribufu/oauth2/OAuth2ResponseType.java
@@ -0,0 +1,8 @@
+// Copyright (c) Tribufu. All Rights Reserved.
+
+package com.tribufu.oauth2;
+
+public enum OAuth2ResponseType {
+    Code,
+    Token,
+}
diff --git a/lib/src/main/java/com/tribufu/oauth2/OAuth2TokenRequest.java b/lib/src/main/java/com/tribufu/oauth2/OAuth2TokenRequest.java
new file mode 100644
index 0000000..dacf573
--- /dev/null
+++ b/lib/src/main/java/com/tribufu/oauth2/OAuth2TokenRequest.java
@@ -0,0 +1,26 @@
+// Copyright (c) Tribufu. All Rights Reserved.
+
+package com.tribufu.oauth2;
+
+public class OAuth2TokenRequest {
+    private final OAuth2GrantType grantType;
+    private final String code;
+    private final String refreshToken;
+    private final String username;
+    private final String password;
+    private final String clientId;
+    private final String clientSecret;
+    private final String redirectUri;
+
+    public OAuth2TokenRequest(OAuth2GrantType grantType, String code, String refreshToken, String username,
+            String password, String clientId, String clientSecret, String redirectUri) {
+        this.grantType = grantType;
+        this.code = code;
+        this.refreshToken = refreshToken;
+        this.username = username;
+        this.password = password;
+        this.clientId = clientId;
+        this.clientSecret = clientSecret;
+        this.redirectUri = redirectUri;
+    }
+}
diff --git a/lib/src/main/java/com/tribufu/oauth2/OAuth2TokenResponse.java b/lib/src/main/java/com/tribufu/oauth2/OAuth2TokenResponse.java
new file mode 100644
index 0000000..05e090e
--- /dev/null
+++ b/lib/src/main/java/com/tribufu/oauth2/OAuth2TokenResponse.java
@@ -0,0 +1,20 @@
+// Copyright (c) Tribufu. All Rights Reserved.
+
+package com.tribufu.oauth2;
+
+public class OAuth2TokenResponse {
+    private final OAuth2TokenType tokenType;
+    private final String accessToken;
+    private final String refreshToken;
+    private final String scope;
+    private final int expiresIn;
+
+    public OAuth2TokenResponse(OAuth2TokenType tokenType, String accessToken, String refreshToken, String scope,
+            int expiresIn) {
+        this.tokenType = tokenType;
+        this.accessToken = accessToken;
+        this.refreshToken = refreshToken;
+        this.scope = scope;
+        this.expiresIn = expiresIn;
+    }
+}
diff --git a/lib/src/main/java/com/tribufu/oauth2/OAuth2TokenType.java b/lib/src/main/java/com/tribufu/oauth2/OAuth2TokenType.java
new file mode 100644
index 0000000..4a7321c
--- /dev/null
+++ b/lib/src/main/java/com/tribufu/oauth2/OAuth2TokenType.java
@@ -0,0 +1,7 @@
+// Copyright (c) Tribufu. All Rights Reserved.
+
+package com.tribufu.oauth2;
+
+public enum OAuth2TokenType {
+    Bearer,
+}
diff --git a/lib/src/test/java/com/tribufu/sdk/TribufuClientTest.java b/lib/src/test/java/com/tribufu/TribufuClientTest.java
similarity index 79%
rename from lib/src/test/java/com/tribufu/sdk/TribufuClientTest.java
rename to lib/src/test/java/com/tribufu/TribufuClientTest.java
index 665ed36..52fd32d 100644
--- a/lib/src/test/java/com/tribufu/sdk/TribufuClientTest.java
+++ b/lib/src/test/java/com/tribufu/TribufuClientTest.java
@@ -1,6 +1,6 @@
-// Copyright (c) TribuFu. All Rights Reserved
+// Copyright (c) Tribufu. All Rights Reserved
 
-package com.tribufu.sdk;
+package com.tribufu;
 
 import org.junit.jupiter.api.Test;
 import static org.junit.jupiter.api.Assertions.*;