diff --git a/makefiles/Makefile.cpp.mk b/makefiles/Makefile.cpp.mk
index b9304c2a48..19faa954c6 100644
--- a/makefiles/Makefile.cpp.mk
+++ b/makefiles/Makefile.cpp.mk
@@ -113,12 +113,12 @@ clean_cc:
 	-$(DEL) $(LIBPREFIX)algorithms.$(LIBSUFFIX)
 	-$(DEL) $(LIBPREFIX)dimacs.$(LIBSUFFIX)
 	-$(DEL) $(LIBPREFIX)shortestpaths.$(LIBSUFFIX)
-	-$(DEL) objs$S*.$O
+	-$(DEL) $(TOP)$Sobjs$S*.$O
 	-$(DEL) $(CPBINARIES)
 	-$(DEL) $(LPBINARIES)
-	-$(DEL) gen$Sconstraint_solver$S*.pb.*
-	-$(DEL) gen$Slinear_solver$S*.pb.*
-	-$(DEL) *.exp
+	-$(DEL) $(TOP)$Sgen$Sconstraint_solver$S*.pb.*
+	-$(DEL) $(TOP)$Sgen$Slinear_solver$S*.pb.*
+	-$(DEL) $(TOP)$S*.exp
 
 # Individual targets.
 algorithmslibs: $(ALGORITHMS_DEPS)
diff --git a/makefiles/Makefile.csharp.mk b/makefiles/Makefile.csharp.mk
index 35d323860c..074e9f9cec 100644
--- a/makefiles/Makefile.csharp.mk
+++ b/makefiles/Makefile.csharp.mk
@@ -17,22 +17,22 @@ csharp: csharpcp csharplp csharpalgorithms csharpgraph csharpexe
 # Clean target.
 clean_csharp:
 	-$(DEL) $(LIBPREFIX)Google.OrTools.*.$(SHAREDLIBEXT)
-	-$(DEL) bin$SGoogle.OrTools.*.dll
-	-$(DEL) bin$SGoogle.OrTools.*.mdb
+	-$(DEL) $(BINPREFIX)$SGoogle.OrTools.*.dll
+	-$(DEL) $(BINPREFIX)$SGoogle.OrTools.*.mdb
 	-$(DEL) $(LIBPREFIX)Google.OrTools.*.lib
 	-$(DEL) $(LIBPREFIX)Google.OrTools.*.pdb
 	-$(DEL) $(LIBPREFIX)Google.OrTools.*.exp
 	-$(DEL) $(LIBPREFIX)Google.OrTools.*.netmodule
-	-$(DEL) gen$Slinear_solver$S*csharp_wrap*
-	-$(DEL) gen$Sconstraint_solver$S*csharp_wrap*
-	-$(DEL) gen$Salgorithms$S*csharp_wrap*
-	-$(DEL) gen$Sgraph$S*csharp_wrap*
-	-$(DEL) gen$Scom$Sgoogle$Sortools$Slinearsolver$S*.cs
-	-$(DEL) gen$Scom$Sgoogle$Sortools$Sconstraintsolver$S*.cs
-	-$(DEL) gen$Scom$Sgoogle$Sortools$Sknapsacksolver$S*.cs
-	-$(DEL) gen$Scom$Sgoogle$Sortools$Sgraph$S*.cs
-	-$(DEL) objs$S*csharp_wrap.$O
-	-$(DEL) bin$S*.exe
+	-$(DEL) $(TOP)$Sgen$Slinear_solver$S*csharp_wrap*
+	-$(DEL) $(TOP)$Sgen$Sconstraint_solver$S*csharp_wrap*
+	-$(DEL) $(TOP)$Sgen$Salgorithms$S*csharp_wrap*
+	-$(DEL) $(TOP)$Sgen$Sgraph$S*csharp_wrap*
+	-$(DEL) $(TOP)$Sgen$Scom$Sgoogle$Sortools$Slinearsolver$S*.cs
+	-$(DEL) $(TOP)$Sgen$Scom$Sgoogle$Sortools$Sconstraintsolver$S*.cs
+	-$(DEL) $(TOP)$Sgen$Scom$Sgoogle$Sortools$Sknapsacksolver$S*.cs
+	-$(DEL) $(TOP)$Sgen$Scom$Sgoogle$Sortools$Sgraph$S*.cs
+	-$(DEL) $(TOP)$Sobjs$S*csharp_wrap.$O
+	-$(DEL) $(BINPREFIX)$S*.exe
 
 # csharplp
 
diff --git a/makefiles/Makefile.java.mk b/makefiles/Makefile.java.mk
index b424e988d4..f4cee8e537 100644
--- a/makefiles/Makefile.java.mk
+++ b/makefiles/Makefile.java.mk
@@ -4,24 +4,24 @@ java: javacp javaalgorithms javagraph javalp
 # Clean target
 clean_java:
 	-$(DEL) $(LIBPREFIX)jni*.$(JNILIBEXT)
-	-$(DEL) lib$S*.jar
-	-$(DEL) gen$Salgorithms$S*java_wrap*
-	-$(DEL) gen$Scom$Sgoogle$Sortools$Sconstraintsolver$S*.java
-	-$(DEL) gen$Scom$Sgoogle$Sortools$Sgraph$S*.java
-	-$(DEL) gen$Scom$Sgoogle$Sortools$Sknapsacksolver$S*.java
-	-$(DEL) gen$Scom$Sgoogle$Sortools$Slinearsolver$S*.java
-	-$(DEL) gen$Sconstraint_solver$S*java_wrap*
-	-$(DEL) gen$Sgraph$S*java_wrap*
-	-$(DEL) gen$Slinear_solver$S*java_wrap*
-	-$(DEL) objs$Scom$Sgoogle$Sortools$Sconstraintsolver$S*.class
-	-$(DEL) objs$Scom$Sgoogle$Sortools$Sgraph$S*.class
-	-$(DEL) objs$Scom$Sgoogle$Sortools$Sknapsacksolver$S*.class
-	-$(DEL) objs$Scom$Sgoogle$Sortools$Slinearsolver$S*.class
-	-$(DEL) objs$Scom$Sgoogle$Sortools$Sconstraintsolver$Ssamples$S*.class
-	-$(DEL) objs$Scom$Sgoogle$Sortools$Sgraph$Ssamples$S*.class
-	-$(DEL) objs$Scom$Sgoogle$Sortools$Sknapsacksolver$Ssamples$S*.class
-	-$(DEL) objs$Scom$Sgoogle$Sortools$Slinearsolver$Ssamples$S*.class
-	-$(DEL) objs$S*java_wrap.$O
+	-$(DEL) $(TOP)$Slib$S*.jar
+	-$(DEL) $(TOP)$Sgen$Salgorithms$S*java_wrap*
+	-$(DEL) $(TOP)$Sgen$Scom$Sgoogle$Sortools$Sconstraintsolver$S*.java
+	-$(DEL) $(TOP)$Sgen$Scom$Sgoogle$Sortools$Sgraph$S*.java
+	-$(DEL) $(TOP)$Sgen$Scom$Sgoogle$Sortools$Sknapsacksolver$S*.java
+	-$(DEL) $(TOP)$Sgen$Scom$Sgoogle$Sortools$Slinearsolver$S*.java
+	-$(DEL) $(TOP)$Sgen$Sconstraint_solver$S*java_wrap*
+	-$(DEL) $(TOP)$Sgen$Sgraph$S*java_wrap*
+	-$(DEL) $(TOP)$Sgen$Slinear_solver$S*java_wrap*
+	-$(DEL) $(TOP)$Sobjs$Scom$Sgoogle$Sortools$Sconstraintsolver$S*.class
+	-$(DEL) $(TOP)$Sobjs$Scom$Sgoogle$Sortools$Sgraph$S*.class
+	-$(DEL) $(TOP)$Sobjs$Scom$Sgoogle$Sortools$Sknapsacksolver$S*.class
+	-$(DEL) $(TOP)$Sobjs$Scom$Sgoogle$Sortools$Slinearsolver$S*.class
+	-$(DEL) $(TOP)$Sobjs$Scom$Sgoogle$Sortools$Sconstraintsolver$Ssamples$S*.class
+	-$(DEL) $(TOP)$Sobjs$Scom$Sgoogle$Sortools$Sgraph$Ssamples$S*.class
+	-$(DEL) $(TOP)$Sobjs$Scom$Sgoogle$Sortools$Sknapsacksolver$Ssamples$S*.class
+	-$(DEL) $(TOP)$Sobjs$Scom$Sgoogle$Sortools$Slinearsolver$Ssamples$S*.class
+	-$(DEL) $(TOP)$Sobjs$S*java_wrap.$O
 
 # ---------- Java support using SWIG ----------
 
@@ -32,7 +32,7 @@ $(TOP)/gen/constraint_solver/constraint_solver_java_wrap.cc: $(TOP)/constraint_s
 	$(SWIG_BINARY) -I$(TOP) -c++ -java -o $(TOP)$Sgen$Sconstraint_solver$Sconstraint_solver_java_wrap.cc -package com.google.ortools.constraintsolver -outdir $(TOP)$Sgen$Scom$Sgoogle$Sortools$Sconstraintsolver $(TOP)$Sconstraint_solver$Sconstraint_solver.swig
 
 $(TOP)/objs/constraint_solver_java_wrap.$O: $(TOP)/gen/constraint_solver/constraint_solver_java_wrap.cc
-	$(CCC) $(JNIFLAGS) $(JAVA_INC) -c $(TOP)/gen/constraint_solver/constraint_solver_java_wrap.cc $(OBJOUT)objs/constraint_solver_java_wrap.$O
+	$(CCC) $(JNIFLAGS) $(JAVA_INC) -c $(TOP)$Sgen$Sconstraint_solver$Sconstraint_solver_java_wrap.cc $(OBJOUT)objs/constraint_solver_java_wrap.$O
 
 $(TOP)/lib/com.google.ortools.constraintsolver.jar: $(TOP)/gen/constraint_solver/constraint_solver_java_wrap.cc
 	$(JAVAC_BIN) -d $(TOP)$Sobjs $(TOP)$Scom$Sgoogle$Sortools$Sconstraintsolver$S*.java $(TOP)$Sgen$Scom$Sgoogle$Sortools$Sconstraintsolver$S*.java
@@ -54,7 +54,7 @@ run_RabbitsPheasants: compile_RabbitsPheasants
 compile_GolombRuler: $(TOP)/objs/com/google/ortools/constraintsolver/samples/GolombRuler.class
 
 $(TOP)/objs/com/google/ortools/constraintsolver/samples/GolombRuler.class: javacp $(TOP)/com/google/ortools/constraintsolver/samples/GolombRuler.java
-	$(JAVAC_BIN) -d $(TOP)$Sobjs -cp $(TOP)$Slib$Scom.google.ortools.constraintsolver.jar $(TOP)$Scom$Sgoogle/ortools/constraintsolver/samples/GolombRuler.java
+	$(JAVAC_BIN) -d $(TOP)$Sobjs -cp $(TOP)$Slib$Scom.google.ortools.constraintsolver.jar $(TOP)$Scom$Sgoogle$Sortools$Sconstraintsolver$Ssamples$SGolombRuler.java
 
 run_GolombRuler: compile_GolombRuler
 	$(JAVA_BIN) -Djava.library.path=$(TOP)$Slib -cp $(TOP)$Sobjs$(CPSEP)$(TOP)$Slib$Scom.google.ortools.constraintsolver.jar com.google.ortools.constraintsolver.samples.GolombRuler
@@ -62,7 +62,7 @@ run_GolombRuler: compile_GolombRuler
 compile_Partition: $(TOP)/objs/com/google/ortools/constraintsolver/samples/Partition.class
 
 $(TOP)/objs/com/google/ortools/constraintsolver/samples/Partition.class: javacp $(TOP)/com/google/ortools/constraintsolver/samples/Partition.java
-	$(JAVAC_BIN) -d $(TOP)$Sobjs -cp $(TOP)$Slib$Scom.google.ortools.constraintsolver.jar $(TOP)$S/com/google/ortools/constraintsolver/samples/Partition.java
+	$(JAVAC_BIN) -d $(TOP)$Sobjs -cp $(TOP)$Slib$Scom.google.ortools.constraintsolver.jar $(TOP)$S$Scom$Sgoogle$Sortools$Sconstraintsolver$Ssamples$SPartition.java
 
 run_Partition: compile_Partition
 	$(JAVA_BIN) -Djava.library.path=$(TOP)$Slib -cp $(TOP)$Sobjs$(CPSEP)$(TOP)$Slib$Scom.google.ortools.constraintsolver.jar com.google.ortools.constraintsolver.samples.Partition
@@ -70,7 +70,7 @@ run_Partition: compile_Partition
 compile_SendMoreMoney: $(TOP)/objs/com/google/ortools/constraintsolver/samples/SendMoreMoney.class
 
 $(TOP)/objs/com/google/ortools/constraintsolver/samples/SendMoreMoney.class: javacp $(TOP)/com/google/ortools/constraintsolver/samples/SendMoreMoney.java
-	$(JAVAC_BIN) -d $(TOP)$Sobjs -cp $(TOP)$Slib$Scom.google.ortools.constraintsolver.jar $(TOP)$Scom$Sgoogle/ortools/constraintsolver/samples/SendMoreMoney.java
+	$(JAVAC_BIN) -d $(TOP)$Sobjs -cp $(TOP)$Slib$Scom.google.ortools.constraintsolver.jar $(TOP)$Scom$Sgoogle$Sortools$Sconstraintsolver$Ssamples$SSendMoreMoney.java
 
 run_SendMoreMoney: compile_SendMoreMoney
 	$(JAVA_BIN) -Djava.library.path=$(TOP)$Slib -cp $(TOP)$Sobjs$(CPSEP)$(TOP)$Slib$Scom.google.ortools.constraintsolver.jar com.google.ortools.constraintsolver.samples.SendMoreMoney
@@ -78,7 +78,7 @@ run_SendMoreMoney: compile_SendMoreMoney
 compile_SendMoreMoney2: $(TOP)/objs/com/google/ortools/constraintsolver/samples/SendMoreMoney2.class
 
 $(TOP)/objs/com/google/ortools/constraintsolver/samples/SendMoreMoney2.class: javacp $(TOP)/com/google/ortools/constraintsolver/samples/SendMoreMoney2.java
-	$(JAVAC_BIN) -d $(TOP)$Sobjs -cp $(TOP)$Slib$Scom.google.ortools.constraintsolver.jar $(TOP)$Scom$Sgoogle/ortools/constraintsolver/samples/SendMoreMoney2.java
+	$(JAVAC_BIN) -d $(TOP)$Sobjs -cp $(TOP)$Slib$Scom.google.ortools.constraintsolver.jar $(TOP)$Scom$Sgoogle$Sortools$Sconstraintsolver$Ssamples$SSendMoreMoney2.java
 
 run_SendMoreMoney2: compile_SendMoreMoney2
 	$(JAVA_BIN) -Djava.library.path=$(TOP)$Slib -cp $(TOP)$Sobjs$(CPSEP)$(TOP)$Slib$Scom.google.ortools.constraintsolver.jar com.google.ortools.constraintsolver.samples.SendMoreMoney2
@@ -86,7 +86,7 @@ run_SendMoreMoney2: compile_SendMoreMoney2
 compile_LeastDiff: $(TOP)/objs/com/google/ortools/constraintsolver/samples/LeastDiff.class
 
 $(TOP)/objs/com/google/ortools/constraintsolver/samples/LeastDiff.class: javacp $(TOP)/com/google/ortools/constraintsolver/samples/LeastDiff.java
-	$(JAVAC_BIN) -d $(TOP)$Sobjs -cp $(TOP)$Slib$Scom.google.ortools.constraintsolver.jar $(TOP)$Scom$Sgoogle/ortools/constraintsolver/samples/LeastDiff.java
+	$(JAVAC_BIN) -d $(TOP)$Sobjs -cp $(TOP)$Slib$Scom.google.ortools.constraintsolver.jar $(TOP)$Scom$Sgoogle$Sortools$Sconstraintsolver$Ssamples$SLeastDiff.java
 
 run_LeastDiff: compile_LeastDiff
 	$(JAVA_BIN) -Djava.library.path=$(TOP)$Slib -cp $(TOP)$Sobjs$(CPSEP)$(TOP)$Slib$Scom.google.ortools.constraintsolver.jar com.google.ortools.constraintsolver.samples.LeastDiff
@@ -94,7 +94,7 @@ run_LeastDiff: compile_LeastDiff
 compile_MagicSquare: $(TOP)/objs/com/google/ortools/constraintsolver/samples/MagicSquare.class
 
 $(TOP)/objs/com/google/ortools/constraintsolver/samples/MagicSquare.class: javacp $(TOP)/com/google/ortools/constraintsolver/samples/MagicSquare.java
-	$(JAVAC_BIN) -d $(TOP)$Sobjs -cp $(TOP)$Slib$Scom.google.ortools.constraintsolver.jar $(TOP)$Scom$Sgoogle/ortools/constraintsolver/samples/MagicSquare.java
+	$(JAVAC_BIN) -d $(TOP)$Sobjs -cp $(TOP)$Slib$Scom.google.ortools.constraintsolver.jar $(TOP)$Scom$Sgoogle$Sortools$Sconstraintsolver$Ssamples$SMagicSquare.java
 
 run_MagicSquare: compile_MagicSquare
 	$(JAVA_BIN) -Djava.library.path=$(TOP)$Slib -cp $(TOP)$Sobjs$(CPSEP)$(TOP)$Slib$Scom.google.ortools.constraintsolver.jar com.google.ortools.constraintsolver.samples.MagicSquare
@@ -102,7 +102,7 @@ run_MagicSquare: compile_MagicSquare
 compile_NQueens: $(TOP)/objs/com/google/ortools/constraintsolver/samples/NQueens.class
 
 $(TOP)/objs/com/google/ortools/constraintsolver/samples/NQueens.class: javacp $(TOP)/com/google/ortools/constraintsolver/samples/NQueens.java
-	$(JAVAC_BIN) -d $(TOP)$Sobjs -cp $(TOP)$Slib$Scom.google.ortools.constraintsolver.jar $(TOP)$Scom$Sgoogle/ortools/constraintsolver/samples/NQueens.java
+	$(JAVAC_BIN) -d $(TOP)$Sobjs -cp $(TOP)$Slib$Scom.google.ortools.constraintsolver.jar $(TOP)$Scom$Sgoogle$Sortools$Sconstraintsolver$Ssamples$SNQueens.java
 
 run_NQueens: compile_NQueens
 	$(JAVA_BIN) -Djava.library.path=$(TOP)$Slib -cp $(TOP)$Sobjs$(CPSEP)$(TOP)$Slib$Scom.google.ortools.constraintsolver.jar com.google.ortools.constraintsolver.samples.NQueens
@@ -110,7 +110,7 @@ run_NQueens: compile_NQueens
 compile_NQueens2: $(TOP)/objs/com/google/ortools/constraintsolver/samples/NQueens2.class
 
 $(TOP)/objs/com/google/ortools/constraintsolver/samples/NQueens2.class: javacp $(TOP)/com/google/ortools/constraintsolver/samples/NQueens2.java
-	$(JAVAC_BIN) -d $(TOP)$Sobjs -cp $(TOP)$Slib$Scom.google.ortools.constraintsolver.jar $(TOP)$Scom$Sgoogle/ortools/constraintsolver/samples/NQueens2.java
+	$(JAVAC_BIN) -d $(TOP)$Sobjs -cp $(TOP)$Slib$Scom.google.ortools.constraintsolver.jar $(TOP)$Scom$Sgoogle$Sortools$Sconstraintsolver$Ssamples$SNQueens2.java
 
 run_NQueens2: compile_NQueens2
 	$(JAVA_BIN) -Djava.library.path=$(TOP)$Slib -cp $(TOP)$Sobjs$(CPSEP)$(TOP)$Slib$Scom.google.ortools.constraintsolver.jar com.google.ortools.constraintsolver.samples.NQueens2
@@ -119,7 +119,7 @@ run_NQueens2: compile_NQueens2
 compile_AllDifferentExcept0: $(TOP)/objs/com/google/ortools/constraintsolver/samples/AllDifferentExcept0.class
 
 $(TOP)/objs/com/google/ortools/constraintsolver/samples/AllDifferentExcept0.class: javacp $(TOP)/com/google/ortools/constraintsolver/samples/AllDifferentExcept0.java
-	$(JAVAC_BIN) -d $(TOP)$Sobjs -cp $(TOP)$Slib$Scom.google.ortools.constraintsolver.jar $(TOP)$Scom$Sgoogle/ortools/constraintsolver/samples/AllDifferentExcept0.java
+	$(JAVAC_BIN) -d $(TOP)$Sobjs -cp $(TOP)$Slib$Scom.google.ortools.constraintsolver.jar $(TOP)$Scom$Sgoogle$Sortools$Sconstraintsolver$Ssamples$SAllDifferentExcept0.java
 
 run_AllDifferentExcept0: compile_AllDifferentExcept0
 	$(JAVA_BIN) -Djava.library.path=$(TOP)$Slib -cp $(TOP)$Sobjs$(CPSEP)$(TOP)$Slib$Scom.google.ortools.constraintsolver.jar com.google.ortools.constraintsolver.samples.AllDifferentExcept0
@@ -128,7 +128,7 @@ run_AllDifferentExcept0: compile_AllDifferentExcept0
 compile_Diet: $(TOP)/objs/com/google/ortools/constraintsolver/samples/Diet.class
 
 $(TOP)/objs/com/google/ortools/constraintsolver/samples/Diet.class: javacp $(TOP)/com/google/ortools/constraintsolver/samples/Diet.java
-	$(JAVAC_BIN) -d $(TOP)$Sobjs -cp $(TOP)$Slib$Scom.google.ortools.constraintsolver.jar $(TOP)$Scom$Sgoogle/ortools/constraintsolver/samples/Diet.java
+	$(JAVAC_BIN) -d $(TOP)$Sobjs -cp $(TOP)$Slib$Scom.google.ortools.constraintsolver.jar $(TOP)$Scom$Sgoogle$Sortools$Sconstraintsolver$Ssamples$SDiet.java
 
 run_Diet: compile_Diet
 	$(JAVA_BIN) -Djava.library.path=$(TOP)$Slib -cp $(TOP)$Sobjs$(CPSEP)$(TOP)$Slib$Scom.google.ortools.constraintsolver.jar com.google.ortools.constraintsolver.samples.Diet
@@ -137,7 +137,7 @@ run_Diet: compile_Diet
 compile_Map: $(TOP)/objs/com/google/ortools/constraintsolver/samples/Map.class
 
 $(TOP)/objs/com/google/ortools/constraintsolver/samples/Map.class: javacp $(TOP)/com/google/ortools/constraintsolver/samples/Map.java
-	$(JAVAC_BIN) -d $(TOP)$Sobjs -cp $(TOP)$Slib$Scom.google.ortools.constraintsolver.jar $(TOP)$Scom$Sgoogle/ortools/constraintsolver/samples/Map.java
+	$(JAVAC_BIN) -d $(TOP)$Sobjs -cp $(TOP)$Slib$Scom.google.ortools.constraintsolver.jar $(TOP)$Scom$Sgoogle$Sortools$Sconstraintsolver$Ssamples$SMap.java
 
 run_Map: compile_Map
 	$(JAVA_BIN) -Djava.library.path=$(TOP)$Slib -cp $(TOP)$Sobjs$(CPSEP)$(TOP)$Slib$Scom.google.ortools.constraintsolver.jar com.google.ortools.constraintsolver.samples.Map
@@ -146,7 +146,7 @@ run_Map: compile_Map
 compile_Map2: $(TOP)/objs/com/google/ortools/constraintsolver/samples/Map2.class
 
 $(TOP)/objs/com/google/ortools/constraintsolver/samples/Map2.class: javacp $(TOP)/com/google/ortools/constraintsolver/samples/Map2.java
-	$(JAVAC_BIN) -d $(TOP)$Sobjs -cp $(TOP)$Slib$Scom.google.ortools.constraintsolver.jar $(TOP)$Scom$Sgoogle/ortools/constraintsolver/samples/Map2.java
+	$(JAVAC_BIN) -d $(TOP)$Sobjs -cp $(TOP)$Slib$Scom.google.ortools.constraintsolver.jar $(TOP)$Scom$Sgoogle$Sortools$Sconstraintsolver$Ssamples$SMap2.java
 
 run_Map2: compile_Map2
 	$(JAVA_BIN) -Djava.library.path=$(TOP)$Slib -cp $(TOP)$Sobjs$(CPSEP)$(TOP)$Slib$Scom.google.ortools.constraintsolver.jar com.google.ortools.constraintsolver.samples.Map2
@@ -155,7 +155,7 @@ run_Map2: compile_Map2
 compile_Minesweeper: $(TOP)/objs/com/google/ortools/constraintsolver/samples/Minesweeper.class
 
 $(TOP)/objs/com/google/ortools/constraintsolver/samples/Minesweeper.class: javacp $(TOP)/com/google/ortools/constraintsolver/samples/Minesweeper.java
-	$(JAVAC_BIN) -d $(TOP)$Sobjs -cp $(TOP)$Slib$Scom.google.ortools.constraintsolver.jar $(TOP)$Scom$Sgoogle/ortools/constraintsolver/samples/Minesweeper.java
+	$(JAVAC_BIN) -d $(TOP)$Sobjs -cp $(TOP)$Slib$Scom.google.ortools.constraintsolver.jar $(TOP)$Scom$Sgoogle$Sortools$Sconstraintsolver$Ssamples$SMinesweeper.java
 
 run_Minesweeper: compile_Minesweeper
 	$(JAVA_BIN) -Djava.library.path=$(TOP)$Slib -cp $(TOP)$Sobjs$(CPSEP)$(TOP)$Slib$Scom.google.ortools.constraintsolver.jar com.google.ortools.constraintsolver.samples.Minesweeper
@@ -164,7 +164,7 @@ run_Minesweeper: compile_Minesweeper
 compile_QuasigroupCompletion: $(TOP)/objs/com/google/ortools/constraintsolver/samples/QuasigroupCompletion.class
 
 $(TOP)/objs/com/google/ortools/constraintsolver/samples/QuasigroupCompletion.class: javacp $(TOP)/com/google/ortools/constraintsolver/samples/QuasigroupCompletion.java
-	$(JAVAC_BIN) -d $(TOP)$Sobjs -cp $(TOP)$Slib$Scom.google.ortools.constraintsolver.jar $(TOP)$Scom$Sgoogle/ortools/constraintsolver/samples/QuasigroupCompletion.java
+	$(JAVAC_BIN) -d $(TOP)$Sobjs -cp $(TOP)$Slib$Scom.google.ortools.constraintsolver.jar $(TOP)$Scom$Sgoogle$Sortools$Sconstraintsolver$Ssamples$SQuasigroupCompletion.java
 
 run_QuasigroupCompletion: compile_QuasigroupCompletion
 	$(JAVA_BIN) -Djava.library.path=$(TOP)$Slib -cp $(TOP)$Sobjs$(CPSEP)$(TOP)$Slib$Scom.google.ortools.constraintsolver.jar com.google.ortools.constraintsolver.samples.QuasigroupCompletion
@@ -173,7 +173,7 @@ run_QuasigroupCompletion: compile_QuasigroupCompletion
 compile_SendMostMoney: $(TOP)/objs/com/google/ortools/constraintsolver/samples/SendMostMoney.class
 
 $(TOP)/objs/com/google/ortools/constraintsolver/samples/SendMostMoney.class: javacp $(TOP)/com/google/ortools/constraintsolver/samples/SendMostMoney.java
-	$(JAVAC_BIN) -d $(TOP)$Sobjs -cp $(TOP)$Slib$Scom.google.ortools.constraintsolver.jar $(TOP)$Scom$Sgoogle/ortools/constraintsolver/samples/SendMostMoney.java
+	$(JAVAC_BIN) -d $(TOP)$Sobjs -cp $(TOP)$Slib$Scom.google.ortools.constraintsolver.jar $(TOP)$Scom$Sgoogle$Sortools$Sconstraintsolver$Ssamples$SSendMostMoney.java
 
 run_SendMostMoney: compile_SendMostMoney
 	$(JAVA_BIN) -Djava.library.path=$(TOP)$Slib -cp $(TOP)$Sobjs$(CPSEP)$(TOP)$Slib$Scom.google.ortools.constraintsolver.jar com.google.ortools.constraintsolver.samples.SendMostMoney
@@ -182,7 +182,7 @@ run_SendMostMoney: compile_SendMostMoney
 compile_Seseman: $(TOP)/objs/com/google/ortools/constraintsolver/samples/Seseman.class
 
 $(TOP)/objs/com/google/ortools/constraintsolver/samples/Seseman.class: javacp $(TOP)/com/google/ortools/constraintsolver/samples/Seseman.java
-	$(JAVAC_BIN) -d $(TOP)$Sobjs -cp $(TOP)$Slib$Scom.google.ortools.constraintsolver.jar $(TOP)$Scom$Sgoogle/ortools/constraintsolver/samples/Seseman.java
+	$(JAVAC_BIN) -d $(TOP)$Sobjs -cp $(TOP)$Slib$Scom.google.ortools.constraintsolver.jar $(TOP)$Scom$Sgoogle$Sortools$Sconstraintsolver$Ssamples$SSeseman.java
 
 run_Seseman: compile_Seseman
 	$(JAVA_BIN) -Djava.library.path=$(TOP)$Slib -cp $(TOP)$Sobjs$(CPSEP)$(TOP)$Slib$Scom.google.ortools.constraintsolver.jar com.google.ortools.constraintsolver.samples.Seseman
@@ -191,7 +191,7 @@ run_Seseman: compile_Seseman
 compile_Sudoku: $(TOP)/objs/com/google/ortools/constraintsolver/samples/Sudoku.class
 
 $(TOP)/objs/com/google/ortools/constraintsolver/samples/Sudoku.class: javacp $(TOP)/com/google/ortools/constraintsolver/samples/Sudoku.java
-	$(JAVAC_BIN) -d $(TOP)$Sobjs -cp $(TOP)$Slib$Scom.google.ortools.constraintsolver.jar $(TOP)$Scom$Sgoogle/ortools/constraintsolver/samples/Sudoku.java
+	$(JAVAC_BIN) -d $(TOP)$Sobjs -cp $(TOP)$Slib$Scom.google.ortools.constraintsolver.jar $(TOP)$Scom$Sgoogle$Sortools$Sconstraintsolver$Ssamples$SSudoku.java
 
 run_Sudoku: compile_Sudoku
 	$(JAVA_BIN) -Djava.library.path=$(TOP)$Slib -cp $(TOP)$Sobjs$(CPSEP)$(TOP)$Slib$Scom.google.ortools.constraintsolver.jar com.google.ortools.constraintsolver.samples.Sudoku
@@ -200,7 +200,7 @@ run_Sudoku: compile_Sudoku
 compile_Xkcd: $(TOP)/objs/com/google/ortools/constraintsolver/samples/Xkcd.class
 
 $(TOP)/objs/com/google/ortools/constraintsolver/samples/Xkcd.class: javacp $(TOP)/com/google/ortools/constraintsolver/samples/Xkcd.java
-	$(JAVAC_BIN) -d $(TOP)$Sobjs -cp $(TOP)$Slib$Scom.google.ortools.constraintsolver.jar $(TOP)$Scom$Sgoogle/ortools/constraintsolver/samples/Xkcd.java
+	$(JAVAC_BIN) -d $(TOP)$Sobjs -cp $(TOP)$Slib$Scom.google.ortools.constraintsolver.jar $(TOP)$Scom$Sgoogle$Sortools$Sconstraintsolver$Ssamples$SXkcd.java
 
 run_Xkcd: compile_Xkcd
 	$(JAVA_BIN) -Djava.library.path=$(TOP)$Slib -cp $(TOP)$Sobjs$(CPSEP)$(TOP)$Slib$Scom.google.ortools.constraintsolver.jar com.google.ortools.constraintsolver.samples.Xkcd
@@ -209,7 +209,7 @@ run_Xkcd: compile_Xkcd
 compile_SurvoPuzzle: $(TOP)/objs/com/google/ortools/constraintsolver/samples/SurvoPuzzle.class
 
 $(TOP)/objs/com/google/ortools/constraintsolver/samples/SurvoPuzzle.class: javacp $(TOP)/com/google/ortools/constraintsolver/samples/SurvoPuzzle.java
-	$(JAVAC_BIN) -d $(TOP)$Sobjs -cp $(TOP)$Slib$Scom.google.ortools.constraintsolver.jar $(TOP)$Scom$Sgoogle/ortools/constraintsolver/samples/SurvoPuzzle.java
+	$(JAVAC_BIN) -d $(TOP)$Sobjs -cp $(TOP)$Slib$Scom.google.ortools.constraintsolver.jar $(TOP)$Scom$Sgoogle$Sortools$Sconstraintsolver$Ssamples$SSurvoPuzzle.java
 
 run_SurvoPuzzle: compile_SurvoPuzzle
 	$(JAVA_BIN) -Djava.library.path=$(TOP)$Slib -cp $(TOP)$Sobjs$(CPSEP)$(TOP)$Slib$Scom.google.ortools.constraintsolver.jar com.google.ortools.constraintsolver.samples.SurvoPuzzle
@@ -218,7 +218,7 @@ run_SurvoPuzzle: compile_SurvoPuzzle
 compile_Circuit: $(TOP)/objs/com/google/ortools/constraintsolver/samples/Circuit.class
 
 $(TOP)/objs/com/google/ortools/constraintsolver/samples/Circuit.class: javacp $(TOP)/com/google/ortools/constraintsolver/samples/Circuit.java
-	$(JAVAC_BIN) -d $(TOP)$Sobjs -cp $(TOP)$Slib$Scom.google.ortools.constraintsolver.jar $(TOP)$Scom$Sgoogle/ortools/constraintsolver/samples/Circuit.java
+	$(JAVAC_BIN) -d $(TOP)$Sobjs -cp $(TOP)$Slib$Scom.google.ortools.constraintsolver.jar $(TOP)$Scom$Sgoogle$Sortools$Sconstraintsolver$Ssamples$SCircuit.java
 
 run_Circuit: compile_Circuit
 	$(JAVA_BIN) -Djava.library.path=$(TOP)$Slib -cp $(TOP)$Sobjs$(CPSEP)$(TOP)$Slib$Scom.google.ortools.constraintsolver.jar com.google.ortools.constraintsolver.samples.Circuit
@@ -227,7 +227,7 @@ run_Circuit: compile_Circuit
 compile_CoinsGrid: $(TOP)/objs/com/google/ortools/constraintsolver/samples/CoinsGrid.class
 
 $(TOP)/objs/com/google/ortools/constraintsolver/samples/CoinsGrid.class: javacp $(TOP)/com/google/ortools/constraintsolver/samples/CoinsGrid.java
-	$(JAVAC_BIN) -d $(TOP)$Sobjs -cp $(TOP)$Slib$Scom.google.ortools.constraintsolver.jar $(TOP)$Scom$Sgoogle/ortools/constraintsolver/samples/CoinsGrid.java
+	$(JAVAC_BIN) -d $(TOP)$Sobjs -cp $(TOP)$Slib$Scom.google.ortools.constraintsolver.jar $(TOP)$Scom$Sgoogle$Sortools$Sconstraintsolver$Ssamples$SCoinsGrid.java
 
 run_CoinsGrid: compile_CoinsGrid
 	$(JAVA_BIN) -Djava.library.path=$(TOP)$Slib -cp $(TOP)$Sobjs$(CPSEP)$(TOP)$Slib$Scom.google.ortools.constraintsolver.jar com.google.ortools.constraintsolver.samples.CoinsGrid
@@ -237,24 +237,24 @@ run_CoinsGrid: compile_CoinsGrid
 javaalgorithms: $(TOP)/lib/com.google.ortools.knapsacksolver.jar $(LIBPREFIX)jniknapsacksolver.$(JNILIBEXT)
 
 $(TOP)/gen/algorithms/knapsack_solver_java_wrap.cc: $(TOP)/algorithms/knapsack_solver.swig $(TOP)/base/base.swig $(TOP)/util/data.swig $(TOP)/algorithms/knapsack_solver.h
-	$(SWIG_BINARY) -I$(TOP) -c++ -java -o $(TOP)/gen/algorithms/knapsack_solver_java_wrap.cc -package com.google.ortools.knapsacksolver -outdir $(TOP)/gen/com/google/ortools/knapsacksolver $(TOP)/algorithms/knapsack_solver.swig
+	$(SWIG_BINARY) -I$(TOP) -c++ -java -o $(TOP)$Sgen$Salgorithms$Sknapsack_solver_java_wrap.cc -package com.google.ortools.knapsacksolver -outdir $(TOP)$Sgen$Scom$Sgoogle$Sortools$Sknapsacksolver $(TOP)$Salgorithms$Sknapsack_solver.swig
 
 $(TOP)/objs/knapsack_solver_java_wrap.$O: $(TOP)/gen/algorithms/knapsack_solver_java_wrap.cc
-	$(CCC) $(JNIFLAGS) $(JAVA_INC) -c $(TOP)/gen/algorithms/knapsack_solver_java_wrap.cc $(OBJOUT)objs/knapsack_solver_java_wrap.$O
+	$(CCC) $(JNIFLAGS) $(JAVA_INC) -c $(TOP)$Sgen$Salgorithms$Sknapsack_solver_java_wrap.cc $(OBJOUT)objs$Sknapsack_solver_java_wrap.$O
 
 $(TOP)/lib/com.google.ortools.knapsacksolver.jar: $(TOP)/gen/algorithms/knapsack_solver_java_wrap.cc
 	$(JAVAC_BIN) -d $(TOP)$Sobjs $(TOP)$Sgen$Scom$Sgoogle$Sortools$Sknapsacksolver$S*.java
 	$(JAR_BIN) cf $(TOP)$Slib$Scom.google.ortools.knapsacksolver.jar -C $(TOP)$Sobjs com$Sgoogle$Sortools$Sknapsacksolver
 
 $(LIBPREFIX)jniknapsacksolver.$(JNILIBEXT): $(TOP)/objs/knapsack_solver_java_wrap.$O $(ALGORITHMS_DEPS)
-	$(LD) $(LDOUT)$(LIBPREFIX)jniknapsacksolver.$(JNILIBEXT) $(TOP)/objs/knapsack_solver_java_wrap.$O $(ALGORITHMS_LNK) $(LDFLAGS)
+	$(LD) $(LDOUT)$(LIBPREFIX)jniknapsacksolver.$(JNILIBEXT) $(TOP)$Sobjs$Sknapsack_solver_java_wrap.$O $(ALGORITHMS_LNK) $(LDFLAGS)
 
 # Java Algorithms Examples
 
 compile_Knapsack: $(TOP)/objs/com/google/ortools/knapsacksolver/samples/Knapsack.class
 
 $(TOP)/objs/com/google/ortools/knapsacksolver/samples/Knapsack.class: javaalgorithms $(TOP)/com/google/ortools/knapsacksolver/samples/Knapsack.java
-	$(JAVAC_BIN) -d $(TOP)$Sobjs -cp $(TOP)$Slib$Scom.google.ortools.knapsacksolver.jar $(TOP)$Scom$Sgoogle/ortools/knapsacksolver/samples/Knapsack.java
+	$(JAVAC_BIN) -d $(TOP)$Sobjs -cp $(TOP)$Slib$Scom.google.ortools.knapsacksolver.jar $(TOP)$Scom$Sgoogle$Sortools$Sknapsacksolver$Ssamples$SKnapsack.java
 
 run_Knapsack: compile_Knapsack
 	$(JAVA_BIN) -Djava.library.path=$(TOP)$Slib -cp $(TOP)$Sobjs$(CPSEP)$(TOP)$Slib$Scom.google.ortools.knapsacksolver.jar com.google.ortools.knapsacksolver.samples.Knapsack
@@ -264,24 +264,24 @@ run_Knapsack: compile_Knapsack
 javagraph: $(TOP)/lib/com.google.ortools.graph.jar $(LIBPREFIX)jnigraph.$(JNILIBEXT)
 
 $(TOP)/gen/graph/graph_java_wrap.cc: $(TOP)/graph/graph.swig $(TOP)/base/base.swig $(TOP)/util/data.swig $(TOP)/graph/max_flow.h $(TOP)/graph/min_cost_flow.h $(TOP)/graph/linear_assignment.h
-	$(SWIG_BINARY) -I$(TOP) -c++ -java -o $(TOP)/gen/graph/graph_java_wrap.cc -package com.google.ortools.graph -outdir $(TOP)/gen/com/google/ortools/graph graph/graph.swig
+	$(SWIG_BINARY) -I$(TOP) -c++ -java -o $(TOP)$Sgen$Sgraph$Sgraph_java_wrap.cc -package com.google.ortools.graph -outdir $(TOP)$Sgen$Scom$Sgoogle$Sortools$Sgraph graph$Sgraph.swig
 
 $(TOP)/objs/graph_java_wrap.$O: $(TOP)/gen/graph/graph_java_wrap.cc
-	$(CCC) $(JNIFLAGS) $(JAVA_INC) -c $(TOP)/gen/graph/graph_java_wrap.cc $(OBJOUT)objs/graph_java_wrap.$O
+	$(CCC) $(JNIFLAGS) $(JAVA_INC) -c $(TOP)$Sgen$Sgraph$Sgraph_java_wrap.cc $(OBJOUT)objs$Sgraph_java_wrap.$O
 
 $(TOP)/lib/com.google.ortools.graph.jar: $(TOP)/gen/graph/graph_java_wrap.cc
 	$(JAVAC_BIN) -d $(TOP)$Sobjs $(TOP)$Sgen$Scom$Sgoogle$Sortools$Sgraph$S*.java
 	$(JAR_BIN) cf $(TOP)$Slib$Scom.google.ortools.graph.jar -C $(TOP)$Sobjs com$Sgoogle$Sortools$Sgraph
 
 $(LIBPREFIX)jnigraph.$(JNILIBEXT): $(TOP)/objs/graph_java_wrap.$O $(GRAPH_DEPS)
-	$(LD) $(LDOUT)$(LIBPREFIX)jnigraph.$(JNILIBEXT) $(TOP)/objs/graph_java_wrap.$O $(GRAPH_LNK) $(LDFLAGS)
+	$(LD) $(LDOUT)$(LIBPREFIX)jnigraph.$(JNILIBEXT) $(TOP)$Sobjs$Sgraph_java_wrap.$O $(GRAPH_LNK) $(LDFLAGS)
 
 # Java Algorithms Examples
 
 compile_FlowExample: $(TOP)/objs/com/google/ortools/graph/samples/FlowExample.class
 
 $(TOP)/objs/com/google/ortools/graph/samples/FlowExample.class: javagraph $(TOP)/com/google/ortools/graph/samples/FlowExample.java
-	$(JAVAC_BIN) -d $(TOP)$Sobjs -cp $(TOP)$Slib$Scom.google.ortools.graph.jar $(TOP)$Scom$Sgoogle/ortools/graph/samples/FlowExample.java
+	$(JAVAC_BIN) -d $(TOP)$Sobjs -cp $(TOP)$Slib$Scom.google.ortools.graph.jar $(TOP)$Scom$Sgoogle$Sortools$Sgraph$Ssamples$SFlowExample.java
 
 run_FlowExample: compile_FlowExample javagraph
 	$(JAVA_BIN) -Djava.library.path=$(TOP)$Slib -cp $(TOP)$Sobjs$(CPSEP)$(TOP)$Slib$Scom.google.ortools.graph.jar com.google.ortools.graph.samples.FlowExample
@@ -289,7 +289,7 @@ run_FlowExample: compile_FlowExample javagraph
 compile_LinearAssignmentAPI: $(TOP)/objs/com/google/ortools/graph/samples/LinearAssignmentAPI.class
 
 $(TOP)/objs/com/google/ortools/graph/samples/LinearAssignmentAPI.class: javagraph $(TOP)/com/google/ortools/graph/samples/LinearAssignmentAPI.java
-	$(JAVAC_BIN) -d $(TOP)$Sobjs -cp $(TOP)$Slib$Scom.google.ortools.graph.jar $(TOP)$Scom$Sgoogle/ortools/graph/samples/LinearAssignmentAPI.java
+	$(JAVAC_BIN) -d $(TOP)$Sobjs -cp $(TOP)$Slib$Scom.google.ortools.graph.jar $(TOP)$Scom$Sgoogle$Sortools$Sgraph$Ssamples$SLinearAssignmentAPI.java
 
 run_LinearAssignmentAPI: compile_LinearAssignmentAPI javagraph
 	$(JAVA_BIN) -Djava.library.path=$(TOP)$Slib -cp $(TOP)$Sobjs$(CPSEP)$(TOP)$Slib$Scom.google.ortools.graph.jar com.google.ortools.graph.samples.LinearAssignmentAPI
@@ -302,21 +302,21 @@ $(TOP)/gen/linear_solver/linear_solver_java_wrap.cc: $(TOP)/linear_solver/linear
 	$(SWIG_BINARY) $(SWIG_INC) -I$(TOP) -c++ -java -o $(TOP)$Sgen$Slinear_solver$Slinear_solver_java_wrap.cc -package com.google.ortools.linearsolver -outdir $(TOP)$Sgen$Scom$Sgoogle$Sortools$Slinearsolver $(TOP)$Slinear_solver$Slinear_solver.swig
 
 $(TOP)/objs/linear_solver_java_wrap.$O: $(TOP)/gen/linear_solver/linear_solver_java_wrap.cc
-	$(CCC) $(JNIFLAGS) $(JAVA_INC) -c $(TOP)/gen/linear_solver/linear_solver_java_wrap.cc $(OBJOUT)objs/linear_solver_java_wrap.$O
+	$(CCC) $(JNIFLAGS) $(JAVA_INC) -c $(TOP)$Sgen$Slinear_solver$Slinear_solver_java_wrap.cc $(OBJOUT)objs$Slinear_solver_java_wrap.$O
 
 $(TOP)/lib/com.google.ortools.linearsolver.jar: $(TOP)/gen/linear_solver/linear_solver_java_wrap.cc
 	$(JAVAC_BIN) -d $(TOP)$Sobjs $(TOP)$Sgen$Scom$Sgoogle$Sortools$Slinearsolver$S*.java
 	$(JAR_BIN) cf $(TOP)$Slib$Scom.google.ortools.linearsolver.jar -C $(TOP)$Sobjs com$Sgoogle$Sortools$Slinearsolver
 
 $(LIBPREFIX)jnilinearsolver.$(JNILIBEXT): $(TOP)/objs/linear_solver_java_wrap.$O $(LP_DEPS)
-	$(LD) $(LDOUT)$(LIBPREFIX)jnilinearsolver.$(JNILIBEXT) $(TOP)/objs/linear_solver_java_wrap.$O $(LP_LNK) $(LDFLAGS)
+	$(LD) $(LDOUT)$(LIBPREFIX)jnilinearsolver.$(JNILIBEXT) $(TOP)$Sobjs$Slinear_solver_java_wrap.$O $(LP_LNK) $(LDFLAGS)
 
 # Java Linear Programming Examples
 
 compile_LinearProgramming: $(TOP)/objs/com/google/ortools/linearsolver/samples/LinearProgramming.class
 
 $(TOP)/objs/com/google/ortools/linearsolver/samples/LinearProgramming.class: javalp $(TOP)/com/google/ortools/linearsolver/samples/LinearProgramming.java
-	$(JAVAC_BIN) -d $(TOP)$Sobjs -cp $(TOP)$Slib$Scom.google.ortools.linearsolver.jar $(TOP)$Scom$Sgoogle/ortools/linearsolver/samples/LinearProgramming.java
+	$(JAVAC_BIN) -d $(TOP)$Sobjs -cp $(TOP)$Slib$Scom.google.ortools.linearsolver.jar $(TOP)$Scom$Sgoogle$Sortools$Slinearsolver$Ssamples$SLinearProgramming.java
 
 run_LinearProgramming: compile_LinearProgramming
 	$(JAVA_BIN) -Djava.library.path=$(TOP)$Slib -cp $(TOP)$Sobjs$(CPSEP)$(TOP)$Slib$Scom.google.ortools.linearsolver.jar com.google.ortools.linearsolver.samples.LinearProgramming
@@ -324,7 +324,7 @@ run_LinearProgramming: compile_LinearProgramming
 compile_IntegerProgramming: $(TOP)/objs/com/google/ortools/linearsolver/samples/IntegerProgramming.class
 
 $(TOP)/objs/com/google/ortools/linearsolver/samples/IntegerProgramming.class: javalp $(TOP)/com/google/ortools/linearsolver/samples/IntegerProgramming.java
-	$(JAVAC_BIN) -d $(TOP)$Sobjs -cp $(TOP)$Slib$Scom.google.ortools.linearsolver.jar $(TOP)$Scom$Sgoogle/ortools/linearsolver/samples/IntegerProgramming.java
+	$(JAVAC_BIN) -d $(TOP)$Sobjs -cp $(TOP)$Slib$Scom.google.ortools.linearsolver.jar $(TOP)$Scom$Sgoogle$Sortools$Slinearsolver$Ssamples$SIntegerProgramming.java
 
 run_IntegerProgramming: compile_IntegerProgramming
 	$(JAVA_BIN) -Xss2048k -Djava.library.path=$(TOP)$Slib -cp $(TOP)$Sobjs$(CPSEP)$(TOP)$Slib$Scom.google.ortools.linearsolver.jar com.google.ortools.linearsolver.samples.IntegerProgramming
@@ -332,7 +332,7 @@ run_IntegerProgramming: compile_IntegerProgramming
 # Compile and Run CP java example:
 
 $(TOP)/objs/com/google/ortools/constraintsolver/samples/$(EX).class: javacp $(TOP)/com/google/ortools/constraintsolver/samples/$(EX).java
-	$(JAVAC_BIN) -d $(TOP)$Sobjs -cp $(TOP)$Slib$Scom.google.ortools.constraintsolver.jar $(TOP)$Scom$Sgoogle/ortools/constraintsolver/samples/$(EX).java
+	$(JAVAC_BIN) -d $(TOP)$Sobjs -cp $(TOP)$Slib$Scom.google.ortools.constraintsolver.jar $(TOP)$Scom$Sgoogle$Sortools$Sconstraintsolver$Ssamples$S$(EX).java
 
 cjava: $(TOP)/objs/com/google/ortools/constraintsolver/samples/$(EX).class com.google.ortools.constraintsolver.jar
 
diff --git a/makefiles/Makefile.python.mk b/makefiles/Makefile.python.mk
index d0403f0a89..7e39a2d9b7 100644
--- a/makefiles/Makefile.python.mk
+++ b/makefiles/Makefile.python.mk
@@ -5,20 +5,20 @@ python: pycp pyalgorithms pygraph pylp
 
 # Clean target
 clean_python:
-	-$(DEL) gen$Salgorithms$S*python_wrap*
-	-$(DEL) gen$Sconstraint_solver$S*python_wrap*
-	-$(DEL) gen$Sgraph$S*python_wrap*
-	-$(DEL) gen$Slinear_solver$S*python_wrap*
-	-$(DEL) gen$Salgorithms$S*.py
-	-$(DEL) gen$Sconstraint_solver$S*.py
-	-$(DEL) gen$Sgraph$S*.py
-	-$(DEL) gen$Slinear_solver$S*.py
-	-$(DEL) gen$Salgorithms$S*.pyc
-	-$(DEL) gen$Sconstraint_solver$S*.pyc
-	-$(DEL) gen$Sgraph$S*.pyc
-	-$(DEL) gen$Slinear_solver$S*.pyc
-	-$(DEL) lib$S_pywrap*.$(SHAREDLIBEXT)
-	-$(DEL) objs$S*python_wrap.$O
+	-$(DEL) $(TOP)$Sgen$Salgorithms$S*python_wrap*
+	-$(DEL) $(TOP)$Sgen$Sconstraint_solver$S*python_wrap*
+	-$(DEL) $(TOP)$Sgen$Sgraph$S*python_wrap*
+	-$(DEL) $(TOP)$Sgen$Slinear_solver$S*python_wrap*
+	-$(DEL) $(TOP)$Sgen$Salgorithms$S*.py
+	-$(DEL) $(TOP)$Sgen$Sconstraint_solver$S*.py
+	-$(DEL) $(TOP)$Sgen$Sgraph$S*.py
+	-$(DEL) $(TOP)$Sgen$Slinear_solver$S*.py
+	-$(DEL) $(TOP)$Sgen$Salgorithms$S*.pyc
+	-$(DEL) $(TOP)$Sgen$Sconstraint_solver$S*.pyc
+	-$(DEL) $(TOP)$Sgen$Sgraph$S*.pyc
+	-$(DEL) $(TOP)$Sgen$Slinear_solver$S*.pyc
+	-$(DEL) $(TOP)$Slib$S_pywrap*.$(SHAREDLIBEXT)
+	-$(DEL) $(TOP)$Sobjs$S*python_wrap.$O
 
 # pywrapknapsack_solver
 pyalgorithms: $(TOP)/lib/_pywrapknapsack_solver.$(SHAREDLIBEXT) $(TOP)/gen/algorithms/pywrapknapsack_solver.py
diff --git a/makefiles/Makefile.test.unix b/makefiles/Makefile.test.unix
index f89c3223a5..52d0d4a8a9 100644
--- a/makefiles/Makefile.test.unix
+++ b/makefiles/Makefile.test.unix
@@ -2,11 +2,11 @@
 test: test_cc test_python test_java test_csharp
 
 test_cc: cc
-	./bin/golomb --size=5
-	./bin/cvrptw
-	./bin/flow_api
-	./bin/linear_programming
-	./bin/integer_programming
+	$(TOP)/bin/golomb --size=5
+	$(TOP)/bin/cvrptw
+	$(TOP)/bin/flow_api
+	$(TOP)/bin/linear_programming
+	$(TOP)/bin/integer_programming
 
 test_python: python
 	PYTHONPATH=$(TOP) python$(PYTHONVERSION) python/hidato_table.py
diff --git a/makefiles/Makefile.test.win b/makefiles/Makefile.test.win
index 921837b958..07b3263d90 100644
--- a/makefiles/Makefile.test.win
+++ b/makefiles/Makefile.test.win
@@ -1,33 +1,34 @@
 test: test_cc test_python test_java test_csharp
 
 test_cc: cc
-	bin\\golomb --size=5
-	bin\\cvrptw
-	bin\\flow_api
-	bin\\linear_programming
-	bin\\integer_programming
+	$(BINPREFIX)\\golomb --size=5
+	$(BINPREFIX)\\cvrptw
+	$(BINPREFIX)\\flow_api
+	$(BINPREFIX)\\linear_programming
+	$(BINPREFIX)\\integer_programming
+	$(BINPREFIX)\\tsp
 
 test_python: python
-	set PYTHONPATH=$(TOP) && $(WINDOWS_PYTHON_PATH)\\python python/hidato_table.py
-	set PYTHONPATH=$(TOP) && $(WINDOWS_PYTHON_PATH)\\python python/tsp.py
-	set PYTHONPATH=$(TOP) && $(WINDOWS_PYTHON_PATH)\\python python/pyflow_example.py
-	set PYTHONPATH=$(TOP) && $(WINDOWS_PYTHON_PATH)\\python python/knapsack.py
-	set PYTHONPATH=$(TOP) && $(WINDOWS_PYTHON_PATH)\\python python/linear_programming.py
-	set PYTHONPATH=$(TOP) && $(WINDOWS_PYTHON_PATH)\\python python/integer_programming.py
+	set PYTHONPATH=$(TOP) && $(WINDOWS_PYTHON_PATH)\\python $(TOP)\\python\\hidato_table.py
+	set PYTHONPATH=$(TOP) && $(WINDOWS_PYTHON_PATH)\\python $(TOP)\\python\\tsp.py
+	set PYTHONPATH=$(TOP) && $(WINDOWS_PYTHON_PATH)\\python $(TOP)\\python\\pyflow_example.py
+	set PYTHONPATH=$(TOP) && $(WINDOWS_PYTHON_PATH)\\python $(TOP)\\python\\knapsack.py
+	set PYTHONPATH=$(TOP) && $(WINDOWS_PYTHON_PATH)\\python $(TOP)\\python\\linear_programming.py
+	set PYTHONPATH=$(TOP) && $(WINDOWS_PYTHON_PATH)\\python $(TOP)\\python\\integer_programming.py
 
 test_java: java run_RabbitsPheasants run_FlowExample run_LinearProgramming run_IntegerProgramming run_Knapsack
 
 # csharp test
-test_csharp: $(CSHARPEXE) testlp.exe
-	bin\\cslinearprogramming.exe
-	bin\\csintegerprogramming.exe
-	bin\\csrabbitspheasants.exe
-	bin\\csflow.exe
-	bin\\csknapsack.exe
-	bin\\furniture_moving_intervals.exe
-	bin\\organize_day_intervals.exe
-	bin\\cstsp.exe
-	bin\\testlp.exe
+test_csharp: $(CSHARPEXE) $(BINPREFIX)\\testlp.exe
+	$(BINPREFIX)\\cslinearprogramming.exe
+	$(BINPREFIX)\\csintegerprogramming.exe
+	$(BINPREFIX)\\csrabbitspheasants.exe
+	$(BINPREFIX)\\csflow.exe
+	$(BINPREFIX)\\csknapsack.exe
+	$(BINPREFIX)\\furniture_moving_intervals.exe
+	$(BINPREFIX)\\organize_day_intervals.exe
+	$(BINPREFIX)\\cstsp.exe
+	$(BINPREFIX)\\testlp.exe