@@ -195,13 +195,28 @@ Java implementation of algorithms from Russell and Norvig's "Artificial Intellig
        <td><a href="core/src/main/java/aima/core/search/basic/uninformed/IterativeDeepeningSearch.java">IterativeDeepeningSearch</a></td>
    </tr>
    <tr>
-       <td>3?</td>
-       <td>??</td>
-       <td>Bidirectional search</td>
+       <td rowspan="4">3?</td>
+       <td rowspan="4">??</td>
+       <td rowspan="4">Bidirectional search</td>
+       <td>
+           <!-- TODO -->
+       </td>
+   </tr>  
+   <tr>
        <td>
-           <a href="core/src/main/java/aima/core/search/basic/uninformed/BidirectionalSearch.java">BidirectionalSearch</a>
+       Alternative(s)
+       </td>
+   </tr>
+   <tr>
+       <td>
+       <!-- TODO BidirectionalSearchMRS -->
        </td>
    </tr>   
+   <tr>
+       <td>
+       <a href="extra/src/main/java/aima/extra/search/uninformed/BidirectionalSearchGW.java">BidirectionalSearchGW</a>
+       </td>
+   </tr>
    <tr>
        <td>3?</td>
        <td>??</td>
 
@@ -1,4 +1,4 @@
-package aima.core.search.basic.uninformed;
+package aima.extra.search.uninformed;
 
 import aima.core.search.api.BidirectionalSearchResult;
 import aima.core.search.api.NodeFactory;
@@ -25,9 +25,10 @@
  * The strategy of this search implementation is inspired by the description of
  * the bidirectional search algorithm i.e. Problem is reversed and search is performed from both
  * frontiers.
+ * 
  * @author wormi
  */
-public class BidirectionalSearch<A, S> implements SearchForActionsBidirectionallyFunction<A, S> {
+public class BidirectionalSearchGW<A, S> implements SearchForActionsBidirectionallyFunction<A, S> {
 
 
     @Override
 
@@ -5,8 +5,9 @@
 import aima.core.environment.support.ProblemFactory;
 import aima.core.search.api.BidirectionalSearchResult;
 import aima.core.search.api.Problem;
-import aima.core.search.basic.uninformed.BidirectionalSearch;
 import aima.core.util.datastructure.Pair;
+import aima.extra.search.uninformed.BidirectionalSearchGW;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -32,14 +33,21 @@
 public class BidirectionalSearchTest {
     @Parameterized.Parameters(name = "{index}: {0}")
     public static Collection<Object[]> implementations() {
-        return Arrays.asList(new Object[][]{{"BidirectionalSearch"}});
+        return Arrays.asList(new Object[][]{{"BidirectionalSearchGW"}});
     }
 
     @Parameterized.Parameter
     public String searchFunctionName;
 
     public <A, S> BidirectionalSearchResult<A> searchForActions(Pair<Problem<A, S>, Problem<A, S>> pair) {
-        BidirectionalSearch<A, S> search = new BidirectionalSearch<>();
+        BidirectionalSearchGW<A, S> search;
+        
+        if (searchFunctionName.equals("BidirectionalSearchGW")) {
+        	search = new BidirectionalSearchGW<>();
+        }
+        else {
+        	throw new UnsupportedOperationException("Unsupported searchFunctionName="+searchFunctionName);
+        }
         return search.apply(pair.getFirst(), pair.getSecond());
     }