diff --git a/NucuHub.Android/app/src/main/java/dev/nuculabs/grpc/EnvironmentSensorData.java b/NucuHub.Android/app/src/main/java/dev/nuculabs/nucuhub/domain/EnvironmentSensorData.java
similarity index 98%
rename from NucuHub.Android/app/src/main/java/dev/nuculabs/grpc/EnvironmentSensorData.java
rename to NucuHub.Android/app/src/main/java/dev/nuculabs/nucuhub/domain/EnvironmentSensorData.java
index eff71bc..3122ae8 100644
--- a/NucuHub.Android/app/src/main/java/dev/nuculabs/grpc/EnvironmentSensorData.java
+++ b/NucuHub.Android/app/src/main/java/dev/nuculabs/nucuhub/domain/EnvironmentSensorData.java
@@ -1,4 +1,4 @@
-package dev.nuculabs.grpc;
+package dev.nuculabs.nucuhub.domain;
 
 import NucuCarSensorsProto.NucuCarSensors;
 import android.util.Log;
diff --git a/NucuHub.Android/app/src/main/java/dev/nuculabs/grpc/EnvironmentSensorService.java b/NucuHub.Android/app/src/main/java/dev/nuculabs/nucuhub/grpc/EnvironmentSensorService.java
similarity index 97%
rename from NucuHub.Android/app/src/main/java/dev/nuculabs/grpc/EnvironmentSensorService.java
rename to NucuHub.Android/app/src/main/java/dev/nuculabs/nucuhub/grpc/EnvironmentSensorService.java
index 00b63d1..d253733 100644
--- a/NucuHub.Android/app/src/main/java/dev/nuculabs/grpc/EnvironmentSensorService.java
+++ b/NucuHub.Android/app/src/main/java/dev/nuculabs/nucuhub/grpc/EnvironmentSensorService.java
@@ -1,10 +1,11 @@
-package dev.nuculabs.grpc;
+package dev.nuculabs.nucuhub.grpc;
 
 import NucuCarSensorsProto.EnvironmentSensorGrpcServiceGrpc;
 import NucuCarSensorsProto.NucuCarSensors;
 import android.util.Log;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
+import dev.nuculabs.nucuhub.domain.EnvironmentSensorData;
 import io.grpc.ManagedChannel;
 import io.grpc.ManagedChannelBuilder;
 import io.grpc.StatusRuntimeException;
diff --git a/NucuHub.Android/app/src/main/java/dev/nuculabs/nucuhub/ui/sensors/EnvironmentSensorViewModel.java b/NucuHub.Android/app/src/main/java/dev/nuculabs/nucuhub/ui/sensors/EnvironmentSensorViewModel.java
index 29c9386..4082441 100644
--- a/NucuHub.Android/app/src/main/java/dev/nuculabs/nucuhub/ui/sensors/EnvironmentSensorViewModel.java
+++ b/NucuHub.Android/app/src/main/java/dev/nuculabs/nucuhub/ui/sensors/EnvironmentSensorViewModel.java
@@ -3,7 +3,7 @@ package dev.nuculabs.nucuhub.ui.sensors;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.ViewModel;
-import dev.nuculabs.grpc.EnvironmentSensorData;
+import dev.nuculabs.nucuhub.domain.EnvironmentSensorData;
 import dev.nuculabs.nucuhub.R;
 
 public class EnvironmentSensorViewModel extends ViewModel {
diff --git a/NucuHub.Android/app/src/main/java/dev/nuculabs/nucuhub/ui/sensors/SensorsFragment.java b/NucuHub.Android/app/src/main/java/dev/nuculabs/nucuhub/ui/sensors/SensorsFragment.java
index 84a2251..aa6593a 100644
--- a/NucuHub.Android/app/src/main/java/dev/nuculabs/nucuhub/ui/sensors/SensorsFragment.java
+++ b/NucuHub.Android/app/src/main/java/dev/nuculabs/nucuhub/ui/sensors/SensorsFragment.java
@@ -11,8 +11,8 @@ import androidx.fragment.app.Fragment;
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProviders;
 import com.google.android.material.chip.Chip;
-import dev.nuculabs.grpc.EnvironmentSensorData;
-import dev.nuculabs.grpc.EnvironmentSensorService;
+import dev.nuculabs.nucuhub.domain.EnvironmentSensorData;
+import dev.nuculabs.nucuhub.grpc.EnvironmentSensorService;
 import dev.nuculabs.nucuhub.R;
 
 public class SensorsFragment extends Fragment {