11 files changed, 543 insertions, 554 deletions

diff --git a/conventions.md b/conventions.md
index 875292f..f5ac2dc 100644
--- a/conventions.md
+++ b/conventions.md
@@ -14,9 +14,8 @@ Sources are formatted as defined in the `EPFL-PPO.xml` Eclipse format file.
 Members ordering
 ----------------
 
-Class (static) members are placed before object members. In each group, attributes are placed before methods.
-Constructors are the first methods, and overridden parent methods the last ones.
-
+Class members are ordered using the default IntelliJ arrangement order. In addition, they are grouped by field,
+overriding and dependence.
 
 Object/Class reference
 ----------------------
diff --git a/src/ch/epfl/xblast/Cell.java b/src/ch/epfl/xblast/Cell.java
index ecad75b..16632cc 100644
--- a/src/ch/epfl/xblast/Cell.java
+++ b/src/ch/epfl/xblast/Cell.java
@@ -36,6 +36,32 @@ public final class Cell {
      * The list of the board's Cell-s, spiral-ordered.
      */
     public static final List<Cell> SPIRAL_ORDER = Collections.unmodifiableList(spiralOrder());
+    /**
+     * The coordinates of the Cell.
+     */
+    private final int x, y;
+
+    /**
+     * Instantiates a new Cell with the given coordinates.
+     *
+     * @param x the x-coordinate
+     * @param y the y-coordinate
+     */
+    public Cell(int x, int y) {
+        this.x = normalize(COLUMNS, x);
+        this.y = normalize(ROWS, y);
+    }
+
+    /**
+     * Normalizes the given number (using the integer floor modulus).
+     *
+     * @param max the maximum (the divisor)
+     * @param n   the number to normalize (the dividend)
+     * @return the normalized value
+     */
+    static int normalize(int max, int n) {
+        return Math.floorMod(n, max);
+    }
 
     /**
      * Builds a major-ordered list of Cell-s.
@@ -97,33 +123,6 @@ public final class Cell {
     }
 
     /**
-     * Normalizes the given number (using the integer floor modulus).
-     *
-     * @param max the maximum (the divisor)
-     * @param n   the number to normalize (the dividend)
-     * @return the normalized value
-     */
-    static int normalize(int max, int n) {
-        return Math.floorMod(n, max);
-    }
-
-    /**
-     * The coordinates of the Cell.
-     */
-    private final int x, y;
-
-    /**
-     * Instantiates a new Cell with the given coordinates.
-     *
-     * @param x the x-coordinate
-     * @param y the y-coordinate
-     */
-    public Cell(int x, int y) {
-        this.x = normalize(COLUMNS, x);
-        this.y = normalize(ROWS, y);
-    }
-
-    /**
      * Returns the normalized x-coordinate of the Cell.
      *
      * @return the x-coordinate
@@ -142,15 +141,6 @@ public final class Cell {
     }
 
     /**
-     * Returns the index of the Cell (major ordered).
-     *
-     * @return the index of the Cell
-     */
-    public int rowMajorIndex() {
-        return this.y * COLUMNS + this.x;
-    }
-
-    /**
      * Returns the neighboring Cell at the given Direction.
      *
      * @param dir the Direction
@@ -161,6 +151,16 @@ public final class Cell {
     }
 
     /**
+     * Returns the hash code for this Cell, given by its row-major index.
+     *
+     * @return the hash code
+     */
+    @Override
+    public int hashCode() {
+        return this.rowMajorIndex();
+    }
+
+    /**
      * Returns T(the given Object is equal to this Cell (have the same coordinates)).
      *
      * @param that the Object to compare against
@@ -175,13 +175,12 @@ public final class Cell {
     }
 
     /**
-     * Returns the hash code for this Cell, given by its row-major index.
+     * Returns the index of the Cell (major ordered).
      *
-     * @return the hash code
+     * @return the index of the Cell
      */
-    @Override
-    public int hashCode() {
-        return this.rowMajorIndex();
+    public int rowMajorIndex() {
+        return this.y * COLUMNS + this.x;
     }
 
     /**
diff --git a/src/ch/epfl/xblast/Direction.java b/src/ch/epfl/xblast/Direction.java
index e2df042..5f5df33 100644
--- a/src/ch/epfl/xblast/Direction.java
+++ b/src/ch/epfl/xblast/Direction.java
@@ -29,6 +29,25 @@ public enum Direction {
     W;
 
     /**
+     * T(the Direction is horizontal to the screen (East or West)).
+     *
+     * @return T(the Direction is horizontal to the screen)
+     */
+    public boolean isHorizontal() {
+        return this == E || this == W;
+    }
+
+    /**
+     * T(the current and given Directions are parallel (identical or opposite)).
+     *
+     * @param that a Direction to compare
+     * @return T(the current and given Directions are parallel)
+     */
+    public boolean isParallelTo(Direction that) {
+        return that == this || that == this.opposite();
+    }
+
+    /**
      * Returns the opposite Direction.
      *
      * @return the opposite Direction
@@ -49,25 +68,6 @@ public enum Direction {
     }
 
     /**
-     * T(the Direction is horizontal to the screen (East or West)).
-     *
-     * @return T(the Direction is horizontal to the screen)
-     */
-    public boolean isHorizontal() {
-        return this == E || this == W;
-    }
-
-    /**
-     * T(the current and given Directions are parallel (identical or opposite)).
-     *
-     * @param that a Direction to compare
-     * @return T(the current and given Directions are parallel)
-     */
-    public boolean isParallelTo(Direction that) {
-        return that == this || that == this.opposite();
-    }
-
-    /**
      * T(the current and given Directions are perpendicular).
      *
      * @param that a Direction to compare
diff --git a/src/ch/epfl/xblast/Lists.java b/src/ch/epfl/xblast/Lists.java
index 1f2e1c7..d599776 100644
--- a/src/ch/epfl/xblast/Lists.java
+++ b/src/ch/epfl/xblast/Lists.java
@@ -13,19 +13,6 @@ import java.util.stream.Stream;
 public final class Lists {
 
     /**
-     * Returns a reversed copy of the given list, leaving the original one unmodified.
-     *
-     * @param l   the list to reverse
-     * @param <T> the type of the list's elements
-     * @return a reversed copy of the list.
-     */
-    private static <T> List<T> reversed(List<T> l) {
-        List<T> r = new ArrayList<>(l);
-        Collections.reverse(r);
-        return r;
-    }
-
-    /**
      * Returns a symmetric version of the list, without repeating the last element of the input list.
      * For instance, mirrored([kay]) will return [kayak].
      *
@@ -43,17 +30,15 @@ public final class Lists {