diff --git a/src/apps/terminal/Jamfile b/src/apps/terminal/Jamfile
deleted file mode 100644
index 20396bef2d..0000000000
--- a/src/apps/terminal/Jamfile
+++ /dev/null
@@ -1,3 +0,0 @@
-SubDir OBOS_TOP src apps terminal ;
-
-SubInclude OBOS_TOP src apps terminal MYOB ;
diff --git a/src/apps/terminal/MYOB/Jamfile b/src/apps/terminal/MYOB/Jamfile
index 94d759be6b..2775a67a68 100644
--- a/src/apps/terminal/MYOB/Jamfile
+++ b/src/apps/terminal/MYOB/Jamfile
@@ -23,7 +23,7 @@ App Terminal :
 	UTF8WidthTbl.c
 	VTKeyTbl.c
 	VTPrsTbl.c
-	: be tracker textencoding game
+	: libopenbeos.so libtracker.so libtextencoding.so #libgame.so
 	: Terminal.rdef Terminal.icons.rdef Terminal.version.rdef
 	;
 
diff --git a/src/apps/terminal/MYOB/TermWindow.cpp b/src/apps/terminal/MYOB/TermWindow.cpp
index 724e6e50f8..fd07c53487 100644
--- a/src/apps/terminal/MYOB/TermWindow.cpp
+++ b/src/apps/terminal/MYOB/TermWindow.cpp
@@ -620,7 +620,8 @@ TermWindow::TermWinActivate (void)
   
   if (focus_follows_mouse()) {
     BPoint aMouseLoc = this->Frame().LeftTop();
-    set_mouse_position(int32(aMouseLoc.x + 16), int32(aMouseLoc.y + 2));
+    // ToDo: deactivated for now
+    //set_mouse_position(int32(aMouseLoc.x + 16), int32(aMouseLoc.y + 2));
     be_app->SetCursor(B_HAND_CURSOR);
   }
 }
diff --git a/src/apps/terminal/Constants.h b/src/apps/terminal/andrew/Constants.h
similarity index 100%
rename from src/apps/terminal/Constants.h
rename to src/apps/terminal/andrew/Constants.h
diff --git a/src/apps/terminal/Terminal.cpp b/src/apps/terminal/andrew/Terminal.cpp
similarity index 100%
rename from src/apps/terminal/Terminal.cpp
rename to src/apps/terminal/andrew/Terminal.cpp
diff --git a/src/apps/terminal/Terminal.icons.rdef b/src/apps/terminal/andrew/Terminal.icons.rdef
similarity index 100%
rename from src/apps/terminal/Terminal.icons.rdef
rename to src/apps/terminal/andrew/Terminal.icons.rdef
diff --git a/src/apps/terminal/Terminal.rdef b/src/apps/terminal/andrew/Terminal.rdef
similarity index 100%
rename from src/apps/terminal/Terminal.rdef
rename to src/apps/terminal/andrew/Terminal.rdef
diff --git a/src/apps/terminal/Terminal.version.rdef b/src/apps/terminal/andrew/Terminal.version.rdef
similarity index 100%
rename from src/apps/terminal/Terminal.version.rdef
rename to src/apps/terminal/andrew/Terminal.version.rdef
diff --git a/src/apps/terminal/TerminalApp.cpp b/src/apps/terminal/andrew/TerminalApp.cpp
similarity index 100%
rename from src/apps/terminal/TerminalApp.cpp
rename to src/apps/terminal/andrew/TerminalApp.cpp
diff --git a/src/apps/terminal/TerminalApp.h b/src/apps/terminal/andrew/TerminalApp.h
similarity index 100%
rename from src/apps/terminal/TerminalApp.h
rename to src/apps/terminal/andrew/TerminalApp.h
diff --git a/src/apps/terminal/TerminalWindow.cpp b/src/apps/terminal/andrew/TerminalWindow.cpp
similarity index 100%
rename from src/apps/terminal/TerminalWindow.cpp
rename to src/apps/terminal/andrew/TerminalWindow.cpp
diff --git a/src/apps/terminal/TerminalWindow.h b/src/apps/terminal/andrew/TerminalWindow.h
similarity index 100%
rename from src/apps/terminal/TerminalWindow.h
rename to src/apps/terminal/andrew/TerminalWindow.h
diff --git a/src/apps/terminal/ToggleScrollView.cpp b/src/apps/terminal/andrew/ToggleScrollView.cpp
similarity index 100%
rename from src/apps/terminal/ToggleScrollView.cpp
rename to src/apps/terminal/andrew/ToggleScrollView.cpp
diff --git a/src/apps/terminal/ToggleScrollView.h b/src/apps/terminal/andrew/ToggleScrollView.h
similarity index 100%
rename from src/apps/terminal/ToggleScrollView.h
rename to src/apps/terminal/andrew/ToggleScrollView.h
diff --git a/src/apps/terminal/muterm-2.3.zip b/src/apps/terminal/muterm-2.3.zip
deleted file mode 100644
index 5e9710b069..0000000000
Binary files a/src/apps/terminal/muterm-2.3.zip and /dev/null differ