diff --git a/.github/workflows/actions.yaml b/.github/workflows/actions.yaml
index 11ce90f..982d84a 100644
--- a/.github/workflows/actions.yaml
+++ b/.github/workflows/actions.yaml
@@ -15,4 +15,4 @@ jobs:
           LANGUAGE: Java
           REV_BEFORE: ${{ github.event.pull_request.base.sha }}
           REV_AFTER: ${{ github.event.pull_request.head.sha }}
-        uses: rodrigo-brito/refactoring-aware-review@action
+        uses: rodrigo-brito/refactoring-aware-diff@action
diff --git a/src/p1/A.java b/src/p1/A.java
index 7754461..7cc6721 100644
--- a/src/p1/A.java
+++ b/src/p1/A.java
@@ -1,6 +1,6 @@
 package p1;
 
-public class A {
+public class A implements IA {
   public void m1() {
     System.out.println("m1");
   }
diff --git a/src/p1/IA.java b/src/p1/IA.java
new file mode 100644
index 0000000..3b06a95
--- /dev/null
+++ b/src/p1/IA.java
@@ -0,0 +1,7 @@
+package p1;
+
+public interface IA {
+	void m1();
+
+	void m2();
+}
\ No newline at end of file
diff --git a/src/p2/A.java b/src/p2/A.java
index e9682f9..32c506d 100644
--- a/src/p2/A.java
+++ b/src/p2/A.java
@@ -1,8 +1,12 @@
 package p2;
 
 public class A {
+  public boolean isEven(int v) {
+    return v % 2 == 0;
+  }
+
   public void m1(int v) {
-    if (v % 2 == 0) {
+    if (this.isEven(v)) {
       System.out.println("even");
     } else {
       System.out.println("odd");
diff --git a/src/p3/A.java b/src/p3/A.java
index 8d5f425..0f70ba8 100644
--- a/src/p3/A.java
+++ b/src/p3/A.java
@@ -1,10 +1,6 @@
 package p3;
 
-public class A {
-  public void m1() {
-    System.out.println("m1");
-  }
-
+public class A extends B {
   public void m2() {
     System.out.println("m2");
   }
diff --git a/src/p3/B.java b/src/p3/B.java
new file mode 100644
index 0000000..35812fc
--- /dev/null
+++ b/src/p3/B.java
@@ -0,0 +1,7 @@
+package p3;
+
+public class B {
+  public void m1() {
+    System.out.println("m1");
+  }
+}
diff --git a/src/p4/A.java b/src/p4/A.java
index ccf2169..22d21e4 100644
--- a/src/p4/A.java
+++ b/src/p4/A.java
@@ -1,11 +1,6 @@
 package p4;
 
 public class A {
-  public void m5() {
-    int number = 5;
-    System.out.println("m" + number);
-  }
-
   public void m2() {
     System.out.println("m2");
   }
diff --git a/src/p4/B.java b/src/p4/B.java
index 8a6ca45..5c4466a 100644
--- a/src/p4/B.java
+++ b/src/p4/B.java
@@ -1,6 +1,11 @@
 package p4;
 
 public class B {
+  public void m5() {
+    int number = 5;
+    System.out.println("m" + number);
+  }
+
   public void m3() {
     System.out.println("m3");
   }
diff --git a/src/p5/C.java b/src/p5/C.java
index b42a009..a778ddf 100644
--- a/src/p5/C.java
+++ b/src/p5/C.java
@@ -1,11 +1 @@
 package p5;
-
-public class C {
-  public void m3() {
-    System.out.println("m3");
-  }
-
-  public void m4() {
-    System.out.println("m4");
-  }
-}
diff --git a/src/p6/C.java b/src/p6/C.java
new file mode 100644
index 0000000..3c81d1d
--- /dev/null
+++ b/src/p6/C.java
@@ -0,0 +1,11 @@
+package p6;
+
+public class C {
+	public void m3() {
+		System.out.println("m3");
+	}
+
+	public void m4() {
+		System.out.println("m4");
+	}
+}
\ No newline at end of file
diff --git a/src/p7/A.java b/src/p7/A.java
index 6ed897a..30ff7cb 100644
--- a/src/p7/A.java
+++ b/src/p7/A.java
@@ -4,4 +4,8 @@ public class A {
   public void m1() {
     System.out.println("m1");
   }
+
+  public void m2() {
+    System.out.println("m2");
+  }
 }
diff --git a/src/p7/B.java b/src/p7/B.java
index 5165389..c04b51b 100644
--- a/src/p7/B.java
+++ b/src/p7/B.java
@@ -1,10 +1,6 @@
 package p7;
 
 public class B extends A {
-  public void m2() {
-    System.out.println("m2");
-  }
-
   public void m3() {
     System.out.println("m3");
   }
diff --git a/src/p8/A.java b/src/p8/A.java
index f9f8e3e..e96040c 100644
--- a/src/p8/A.java
+++ b/src/p8/A.java
@@ -4,8 +4,4 @@ public class A {
   public void m1() {
     System.out.println("m1");
   }
-
-  public void m2() {
-    System.out.println("m2");
-  }
 }
diff --git a/src/p8/B.java b/src/p8/B.java
index f206fe3..be81aec 100644
--- a/src/p8/B.java
+++ b/src/p8/B.java
@@ -1,6 +1,10 @@
 package p8;
 
 public class B extends A {
+  public void m2() {
+    System.out.println("m2");
+  }
+
   public void m3() {
     System.out.println("m3");
   }
diff --git a/src/p9/A.java b/src/p9/A.java
index 9462a7b..4e69037 100644
--- a/src/p9/A.java
+++ b/src/p9/A.java
@@ -1,7 +1,7 @@
 package p9;
 
 public class A {
-  public void m5() {
+  public void m6() {
     int value = 5;
     System.out.println("m" + value);
   }