diff --git a/src/servers/app/Jamfile b/src/servers/app/Jamfile
index 09d5feff2b..4027d3674f 100644
--- a/src/servers/app/Jamfile
+++ b/src/servers/app/Jamfile
@@ -5,7 +5,7 @@ UsePrivateHeaders app graphics input interface kernel shared storage support ;
 
 UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing ] ;
 UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing Painter ] ;
-UseHeaders [ FDirName $(HAIKU_TOP) src servers app StackAndTile ] ;
+UseHeaders [ FDirName $(HAIKU_TOP) src servers app stackandtile ] ;
 UseFreeTypeHeaders ;
 
 
@@ -81,7 +81,7 @@ Server app_server :
 	:
 	libtranslation.so libbe.so libbnetapi.so
 	libasdrawing.a libasremote.a libpainter.a libagg.a libfreetype.so
-	StackAndTile.a liblinprog.a libtextencoding.so libshared.a
+	libstackandtile.a liblinprog.a libtextencoding.so libshared.a
 	$(TARGET_LIBSTDC++)
 
 	: app_server.rdef
@@ -92,4 +92,4 @@ SEARCH on [ FGristFiles $(font_src) ] = [ FDirName $(HAIKU_TOP) src servers app
 
 
 SubInclude HAIKU_TOP src servers app drawing ;
-SubInclude HAIKU_TOP src servers app StackAndTile ;
+SubInclude HAIKU_TOP src servers app stackandtile ;
diff --git a/src/servers/app/StackAndTile/Jamfile b/src/servers/app/stackandtile/Jamfile
similarity index 86%
rename from src/servers/app/StackAndTile/Jamfile
rename to src/servers/app/stackandtile/Jamfile
index b781b141d8..56e4788c6e 100644
--- a/src/servers/app/StackAndTile/Jamfile
+++ b/src/servers/app/stackandtile/Jamfile
@@ -1,4 +1,4 @@
-SubDir HAIKU_TOP src servers app StackAndTile ;
+SubDir HAIKU_TOP src servers app stackandtile ;
 
 UseLibraryHeaders agg lp_solve linprog ;
 UsePrivateHeaders app graphics interface shared kernel ;
@@ -10,7 +10,7 @@ UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing ] ;
 UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing Painter ] ;
 UseFreeTypeHeaders ;
 
-StaticLibrary StackAndTile.a :
+StaticLibrary libstackandtile.a :
 	SATDecorator.cpp
 	SATGroup.cpp
 	SATWindow.cpp
diff --git a/src/servers/app/StackAndTile/SATDecorator.cpp b/src/servers/app/stackandtile/SATDecorator.cpp
similarity index 100%
rename from src/servers/app/StackAndTile/SATDecorator.cpp
rename to src/servers/app/stackandtile/SATDecorator.cpp
diff --git a/src/servers/app/StackAndTile/SATDecorator.h b/src/servers/app/stackandtile/SATDecorator.h
similarity index 100%
rename from src/servers/app/StackAndTile/SATDecorator.h
rename to src/servers/app/stackandtile/SATDecorator.h
diff --git a/src/servers/app/StackAndTile/SATGroup.cpp b/src/servers/app/stackandtile/SATGroup.cpp
similarity index 95%
rename from src/servers/app/StackAndTile/SATGroup.cpp
rename to src/servers/app/stackandtile/SATGroup.cpp
index d434a2ce70..0eb77038f3 100644
--- a/src/servers/app/StackAndTile/SATGroup.cpp
+++ b/src/servers/app/stackandtile/SATGroup.cpp
@@ -66,17 +66,8 @@ bool
 WindowArea::MoveWindowToPosition(SATWindow* window, int32 index)
 {
 	int32 oldIndex = fWindowList.IndexOf(window);
-	if (oldIndex < 0)
-		return false;
 	ASSERT(oldIndex != index);
-	if (oldIndex < index)
-		index++;
-	else
-		oldIndex++;
-	if (!fWindowList.AddItem(window, index))
-		return false;
-	fWindowList.RemoveItemAt(oldIndex);
-	return true;
+	return fWindowList.MoveItem(oldIndex, index);
 }
 
 
@@ -94,8 +85,7 @@ WindowArea::_AddWindow(SATWindow* window, SATWindow* after)
 		int32 indexAfter = fWindowList.IndexOf(after);
 		if (!fWindowList.AddItem(window, indexAfter + 1))
 			return false;
-	}
-	else if (!fWindowList.AddItem(window))
+	} else if (fWindowList.AddItem(window) == false)
 		return false;
 
 	AcquireReference();
@@ -361,7 +351,14 @@ Crossing::~Crossing()
 Corner*
 Crossing::GetCorner(Corner::position_t corner) const
 {
-	return _GetCorner(corner);
+	return &const_cast<Corner*>(fCorners)[corner];
+}
+
+
+Corner*
+Crossing::GetOppositeCorner(Corner::position_t corner) const
+{
+	return &const_cast<Corner*>(fCorners)[3 - corner];
 }
 
 
@@ -383,47 +380,13 @@ void
 Crossing::Trace() const
 {
 	STRACE_SAT("left-top corner: ");
-	fLeftTop.Trace();
+	fCorners[Corner::kLeftTop].Trace();
 	STRACE_SAT("right-top corner: ");
-	fRightTop.Trace();
+	fCorners[Corner::kRightTop].Trace();
 	STRACE_SAT("left-bottom corner: ");
-	fLeftBottom.Trace();
+	fCorners[Corner::kLeftBottom].Trace();
 	STRACE_SAT("right-bottom corner: ");
-	fRightBottom.Trace();
-}
-
-
-Corner*
-Crossing::_GetCorner(Corner::position_t corner) const
-{
-	switch (corner) {
-		case Corner::kLeftTop:
-			return const_cast<Corner*>(&fLeftTop);
-		case Corner::kRightTop:
-			return const_cast<Corner*>(&fRightTop);
-		case Corner::kLeftBottom:
-			return const_cast<Corner*>(&fLeftBottom);
-		case Corner::kRightBottom:
-			return const_cast<Corner*>(&fRightBottom);
-	};
-	return NULL;
-}
-
-
-Corner*
-Crossing::GetOppositeCorner(Corner::position_t corner) const
-{
-	switch (corner) {
-		case Corner::kLeftTop:
-			return const_cast<Corner*>(&fRightBottom);
-		case Corner::kRightTop:
-			return const_cast<Corner*>(&fLeftBottom);
-		case Corner::kLeftBottom:
-			return const_cast<Corner*>(&fRightTop);
-		case Corner::kRightBottom:
-			return const_cast<Corner*>(&fLeftTop);
-	};
-	return NULL;
+	fCorners[Corner::kRightBottom].Trace();
 }
 
 
@@ -520,13 +483,15 @@ int32
 Tab::FindCrossingIndex(Tab* tab)
 {
 	if (fOrientation == kVertical) {
-		for (int32 i = 0; i < fCrossingList.CountItems(); i++)
+		for (int32 i = 0; i < fCrossingList.CountItems(); i++) {
 			if (fCrossingList.ItemAt(i)->HorizontalTab() == tab)
 				return i;
+		}
 	} else {
-		for (int32 i = 0; i < fCrossingList.CountItems(); i++)
+		for (int32 i = 0; i < fCrossingList.CountItems(); i++) {
 			if (fCrossingList.ItemAt(i)->VerticalTab() == tab)
 				return i;
+		}
 	}
 	return -1;
 }
@@ -536,13 +501,15 @@ int32
 Tab::FindCrossingIndex(float pos)
 {
 	if (fOrientation == kVertical) {
-		for (int32 i = 0; i < fCrossingList.CountItems(); i++)
+		for (int32 i = 0; i < fCrossingList.CountItems(); i++) {
 			if (fCrossingList.ItemAt(i)->HorizontalTab()->Position() == pos)
 				return i;
+		}
 	} else {
-		for (int32 i = 0; i < fCrossingList.CountItems(); i++)
+		for (int32 i = 0; i < fCrossingList.CountItems(); i++) {
 			if (fCrossingList.ItemAt(i)->VerticalTab()->Position() == pos)
 				return i;
+		}
 	}
 	return -1;
 }
diff --git a/src/servers/app/StackAndTile/SATGroup.h b/src/servers/app/stackandtile/SATGroup.h
similarity index 94%
rename from src/servers/app/StackAndTile/SATGroup.h
rename to src/servers/app/stackandtile/SATGroup.h
index 3f26050c6c..df8feeaefb 100644
--- a/src/servers/app/StackAndTile/SATGroup.h
+++ b/src/servers/app/stackandtile/SATGroup.h
@@ -35,10 +35,10 @@ public:
 
 		enum position_t
 		{
-			kLeftTop,
-			kRightTop,
-			kLeftBottom,
-			kRightBottom
+			kLeftTop = 0,
+			kRightTop = 1,
+			kLeftBottom = 2,
+			kRightBottom = 3
 		};
 
 						Corner();
@@ -58,22 +58,21 @@ public:
 			Corner*				GetOppositeCorner(
 									Corner::position_t corner) const;
 
-			Corner*				LeftTopCorner() { return &fLeftTop; }
-			Corner*				RightTopCorner() { return &fRightTop; }
-			Corner*				LeftBottomCorner() { return &fLeftBottom; }
-			Corner*				RightBottomCorner() { return &fRightBottom; }
+			Corner*				LeftTopCorner()
+									{ return &fCorners[Corner::kLeftTop]; }
+			Corner*				RightTopCorner()
+									{ return &fCorners[Corner::kRightTop]; }
+			Corner*				LeftBottomCorner()
+									{ return &fCorners[Corner::kLeftBottom]; }
+			Corner*				RightBottomCorner()
+									{ return &fCorners[Corner::kRightBottom]; }
 
 			Tab*				VerticalTab() const;
 			Tab*				HorizontalTab() const;
 
 			void				Trace() const;
 private:
-		Corner*		_GetCorner(Corner::position_t corner) const;
-
-		Corner		fLeftTop;
-		Corner		fRightTop;
-		Corner		fLeftBottom;
-		Corner		fRightBottom;
+		Corner		fCorners[4];
 
 		Tab*		fVerticalTab;
 		Tab*		fHorizontalTab;
diff --git a/src/servers/app/StackAndTile/SATWindow.cpp b/src/servers/app/stackandtile/SATWindow.cpp
similarity index 100%
rename from src/servers/app/StackAndTile/SATWindow.cpp
rename to src/servers/app/stackandtile/SATWindow.cpp
diff --git a/src/servers/app/StackAndTile/SATWindow.h b/src/servers/app/stackandtile/SATWindow.h
similarity index 100%
rename from src/servers/app/StackAndTile/SATWindow.h
rename to src/servers/app/stackandtile/SATWindow.h
diff --git a/src/servers/app/StackAndTile/StackAndTile.cpp b/src/servers/app/stackandtile/StackAndTile.cpp
similarity index 100%
rename from src/servers/app/StackAndTile/StackAndTile.cpp
rename to src/servers/app/stackandtile/StackAndTile.cpp
diff --git a/src/servers/app/StackAndTile/StackAndTile.h b/src/servers/app/stackandtile/StackAndTile.h
similarity index 100%
rename from src/servers/app/StackAndTile/StackAndTile.h
rename to src/servers/app/stackandtile/StackAndTile.h
diff --git a/src/servers/app/StackAndTile/Stacking.cpp b/src/servers/app/stackandtile/Stacking.cpp
similarity index 100%
rename from src/servers/app/StackAndTile/Stacking.cpp
rename to src/servers/app/stackandtile/Stacking.cpp
diff --git a/src/servers/app/StackAndTile/Stacking.h b/src/servers/app/stackandtile/Stacking.h
similarity index 100%
rename from src/servers/app/StackAndTile/Stacking.h
rename to src/servers/app/stackandtile/Stacking.h
diff --git a/src/servers/app/StackAndTile/Tiling.cpp b/src/servers/app/stackandtile/Tiling.cpp
similarity index 100%
rename from src/servers/app/StackAndTile/Tiling.cpp
rename to src/servers/app/stackandtile/Tiling.cpp
diff --git a/src/servers/app/StackAndTile/Tiling.h b/src/servers/app/stackandtile/Tiling.h
similarity index 100%
rename from src/servers/app/StackAndTile/Tiling.h
rename to src/servers/app/stackandtile/Tiling.h