diff --git a/src/main/java/com/thealgorithms/Calculator.java b/src/main/java/com/thealgorithms/Calculator.java
new file mode 100644
index 000000000000..95d84f087d85
--- /dev/null
+++ b/src/main/java/com/thealgorithms/Calculator.java
@@ -0,0 +1,15 @@
+package com.thealgorithms.misc;
+
+public class Calculator {
+    public int add(int a, int b) { return a + b; }
+    public int subtract(int a, int b) { return a - b; }
+    public int multiply(int a, int b) { return a * b; }
+<<<<<<< HEAD
+    public double divide(int a, int b) {
+    if (b == 0) throw new ArithmeticException("Divide by zero!"); 
+    return (double) a / b;
+}
+=======
+    public double divide(int a, int b) { return (b != 0) ? (double)a / b : 0; }
+>>>>>>> feature/calculator
+}
diff --git a/src/main/java/com/thealgorithms/Grade.java b/src/main/java/com/thealgorithms/Grade.java
new file mode 100644
index 000000000000..c88dd2feff69
--- /dev/null
+++ b/src/main/java/com/thealgorithms/Grade.java
@@ -0,0 +1,11 @@
+package com.thealgorithms.misc;
+
+public class Grade {
+    public String getGrade(int score) {
+        if (score >= 90) return "A";
+        if (score >= 80) return "B";
+        if (score >= 70) return "C";
+        if (score >= 60) return "D";
+        return "F";
+    }
+}
diff --git a/src/main/java/com/thealgorithms/Student.java b/src/main/java/com/thealgorithms/Student.java
new file mode 100644
index 000000000000..40b14b6d4d15
--- /dev/null
+++ b/src/main/java/com/thealgorithms/Student.java
@@ -0,0 +1,19 @@
+package com.thealgorithms.misc;
+
+public class Student {
+    private String name;
+    private int id;
+
+    public Student() {}
+
+    public Student(String name, int id) {
+        this.name = name;
+        this.id = id;
+    }
+
+    public String getName() { return name; }
+    public void setName(String name) { this.name = name; }
+
+    public int getId() { return id; }
+    public void setId(int id) { this.id = id; }
+}