diff --git a/sdk/java/src/main/java/com/gojek/feast/v1alpha1/FeastClient.java b/sdk/java/src/main/java/com/gojek/feast/FeastClient.java
similarity index 87%
rename from sdk/java/src/main/java/com/gojek/feast/v1alpha1/FeastClient.java
rename to sdk/java/src/main/java/com/gojek/feast/FeastClient.java
index 9f93f56c9c..541a9a54d0 100644
--- a/sdk/java/src/main/java/com/gojek/feast/v1alpha1/FeastClient.java
+++ b/sdk/java/src/main/java/com/gojek/feast/FeastClient.java
@@ -1,4 +1,20 @@
-package com.gojek.feast.v1alpha1;
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright 2018-2019 The Feast Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gojek.feast;
 
 import feast.serving.ServingAPIProto.GetFeastServingInfoRequest;
 import feast.serving.ServingAPIProto.GetFeastServingInfoResponse;
diff --git a/sdk/java/src/main/java/com/gojek/feast/v1alpha1/RequestUtil.java b/sdk/java/src/main/java/com/gojek/feast/RequestUtil.java
similarity index 76%
rename from sdk/java/src/main/java/com/gojek/feast/v1alpha1/RequestUtil.java
rename to sdk/java/src/main/java/com/gojek/feast/RequestUtil.java
index 082b1f3d2f..e80b40bad9 100644
--- a/sdk/java/src/main/java/com/gojek/feast/v1alpha1/RequestUtil.java
+++ b/sdk/java/src/main/java/com/gojek/feast/RequestUtil.java
@@ -1,4 +1,20 @@
-package com.gojek.feast.v1alpha1;
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright 2018-2019 The Feast Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gojek.feast;
 
 import feast.serving.ServingAPIProto.FeatureSetRequest;
 import java.util.ArrayList;
diff --git a/sdk/java/src/main/java/com/gojek/feast/v1alpha1/Row.java b/sdk/java/src/main/java/com/gojek/feast/Row.java
similarity index 85%
rename from sdk/java/src/main/java/com/gojek/feast/v1alpha1/Row.java
rename to sdk/java/src/main/java/com/gojek/feast/Row.java
index 78ea419f7c..9366fe1bb0 100644
--- a/sdk/java/src/main/java/com/gojek/feast/v1alpha1/Row.java
+++ b/sdk/java/src/main/java/com/gojek/feast/Row.java
@@ -1,4 +1,20 @@
-package com.gojek.feast.v1alpha1;
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright 2018-2019 The Feast Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gojek.feast;
 
 import com.google.protobuf.ByteString;
 import com.google.protobuf.Timestamp;
diff --git a/sdk/java/src/test/java/com/gojek/feast/v1alpha1/RequestUtilTest.java b/sdk/java/src/test/java/com/gojek/feast/RequestUtilTest.java
similarity index 84%
rename from sdk/java/src/test/java/com/gojek/feast/v1alpha1/RequestUtilTest.java
rename to sdk/java/src/test/java/com/gojek/feast/RequestUtilTest.java
index 76503bd308..21c8bde15e 100644
--- a/sdk/java/src/test/java/com/gojek/feast/v1alpha1/RequestUtilTest.java
+++ b/sdk/java/src/test/java/com/gojek/feast/RequestUtilTest.java
@@ -1,4 +1,20 @@
-package com.gojek.feast.v1alpha1;
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright 2018-2019 The Feast Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gojek.feast;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;