Index: branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingPlans/BinPacking.cs
===================================================================
--- branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingPlans/BinPacking.cs	(revision 14146)
+++ branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingPlans/BinPacking.cs	(revision 14151)
@@ -26,7 +26,6 @@
 using HeuristicLab.Common;
 using HeuristicLab.Collections;
-using HeuristicLab.Problems.BinPacking;
 
-namespace HeuristicLab.Encodings.PackingEncoding {
+namespace HeuristicLab.Problems.BinPacking {
   [Item("BinPacking", "Represents a single-bin packing for a bin-packing problem.")]
   [StorableClass]
Index: branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingPlans/PackingPlan.cs
===================================================================
--- branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingPlans/PackingPlan.cs	(revision 14146)
+++ branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingPlans/PackingPlan.cs	(revision 14151)
@@ -27,7 +27,6 @@
 using HeuristicLab.Data;
 using HeuristicLab.Collections;
-using HeuristicLab.Problems.BinPacking;
 
-namespace HeuristicLab.Encodings.PackingEncoding {
+namespace HeuristicLab.Problems.BinPacking {
   [Item("PackingPlan", "Represents a concrete solution for a bin-packing problem.")]
   [StorableClass]
@@ -145,66 +144,7 @@
     }
     public void Pack(GroupingVectorEncoding solution, ItemList<I> itemMeasures) {
-      var sequenceMatrix = solution.GenerateSequenceMatrix();
-
-      //Fill bins according to grouping vector
-      List<int> remainingIDs = new List<int>();
-      foreach (var sequence in sequenceMatrix) {
-        remainingIDs = remainingIDs.Concat(sequence).ToList();
-        var bp = NewBinPacking();
-        if (!UseExtremePoints)
-          bp.SlidingBasedPacking(ref remainingIDs, itemMeasures);
-        else
-          bp.ExtremePointBasedPacking(ref remainingIDs, itemMeasures, StackingConstraints);
-        BinPackings.Add(bp);
-      }
-      UpdateBinPackings();
-
-      //Try to put remaining items in existing bins
-      var temp = new List<int>(remainingIDs);
-      foreach (int id in temp) {
-        foreach (var bp in BinPackings) {
-          var position = UseExtremePoints ? bp.FindExtremePointForItem(itemMeasures[id], false, StackingConstraints) : bp.FindPositionBySliding(itemMeasures[id], false);
-          if (position != null) {
-            bp.PackItem(id, itemMeasures[id], position);
-            remainingIDs.Remove(id);
-            break;
-          }
-        }
-      }
-
-      //Put still remaining items in new bins
-      while (remainingIDs.Count > 0) {
-        var bp = NewBinPacking();
-        if (!UseExtremePoints)
-          bp.SlidingBasedPacking(ref remainingIDs, itemMeasures);
-        else
-          bp.ExtremePointBasedPacking(ref remainingIDs, itemMeasures, StackingConstraints);
-        BinPackings.Add(bp);
-      }
-      UpdateBinPackings();
-
-      var newSolution = new int[solution.GroupingVector.Length];
-      int binIndex = 0;
-      foreach (var bp in BinPackings) {
-        foreach (var entry in bp.ItemPositions)
-          newSolution[entry.Key] = binIndex;
-        binIndex++;
-      }
-      solution.GroupingVector = new IntegerVector(newSolution);
     }
      * 
      
-    public void Pack(Permutation solution, ItemList<I> itemMeasures) {
-      List<int> remainingIDs = new List<int>(solution);
-      while (remainingIDs.Count > 0) {
-        var bp = NewBinPacking();
-        if (!UseExtremePoints)
-          bp.SlidingBasedPacking(ref remainingIDs, itemMeasures);
-        else
-          bp.ExtremePointBasedPacking(ref remainingIDs, itemMeasures, StackingConstraints);
-        BinPackings.Add(bp);
-      }
-      UpdateBinPackings();
-    }
 
     */
Index: branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/HeuristicLab.Problems.BinPacking-3.3.csproj
===================================================================
--- branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/HeuristicLab.Problems.BinPacking-3.3.csproj	(revision 14146)
+++ branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/HeuristicLab.Problems.BinPacking-3.3.csproj	(revision 14151)
@@ -160,7 +160,4 @@
     <Compile Include="Encodings\PackingPlans\BinPacking.cs" />
     <Compile Include="Encodings\PackingPlans\PackingPlan.cs" />
-    <Compile Include="Encodings\PackingSolutionCreator.cs" />
-    <Compile Include="Encodings\PackingSolutionCrossover.cs" />
-    <Compile Include="Encodings\PackingSolutionManipulator.cs" />
     <Compile Include="Interfaces\IDecodingEvaluator.cs" />
     <Compile Include="Interfaces\IPackingPosition.cs" />
Index: branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/PackingSolutionDecoder.cs
===================================================================
--- branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/PackingSolutionDecoder.cs	(revision 14146)
+++ branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/PackingSolutionDecoder.cs	(revision 14151)
@@ -27,5 +27,4 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Data;
-using HeuristicLab.Encodings.PackingEncoding;
 
 namespace HeuristicLab.Problems.BinPacking {
@@ -50,5 +49,5 @@
       get { return (ILookupParameter<IItem>)Parameters["EncodedSolution"]; }
     }
-    public ILookupParameter<PackingPlan<D,B,I>> PackingPlanParameter {
+    public ILookupParameter<PackingPlan<D, B, I>> PackingPlanParameter {
       get { return (ILookupParameter<PackingPlan<D, B, I>>)Parameters["PackingPlan"]; }
     }
@@ -58,5 +57,6 @@
 
 
-    public PackingSolutionDecoder() : base() {
+    public PackingSolutionDecoder()
+      : base() {
       Parameters.Add(new LookupParameter<IItem>("EncodedSolution", "The new bin-packing solution represented as encoding."));
       Parameters.Add(new LookupParameter<PackingPlan<D, B, I>>("PackingPlan", "The decoded bin-packing solution represented as generalized packing plan."));
@@ -69,5 +69,5 @@
     [StorableConstructor]
     protected PackingSolutionDecoder(bool deserializing) : base(deserializing) { }
-    protected PackingSolutionDecoder(PackingSolutionDecoder<D,B,I> original, Cloner cloner)
+    protected PackingSolutionDecoder(PackingSolutionDecoder<D, B, I> original, Cloner cloner)
       : base(original, cloner) {
     }
