--- a/build/common/bld.inf	Wed Aug 11 12:05:02 2010 +0100
+++ b/build/common/bld.inf	Wed Aug 11 12:57:25 2010 +0100
@@ -25,17 +25,6 @@
 #include "..\..\libraries\spcre\group\bld.inf"
 #endif
 #include "..\..\plugins\consoles\common\bld.inf"
-#include "..\..\plugins\consoles\consoleproxy\group\bld.inf"
-#include "..\..\plugins\consoles\defcons\group\bld.inf"
-#include "..\..\plugins\consoles\guicons\group\bld.inf"
-#include "..\..\plugins\consoles\iocons\group\bld.inf"
-#include "..\..\plugins\consoles\nullcons\group\bld.inf"
-#include "..\..\plugins\consoles\rcons\group\bld.inf"
-#include "..\..\plugins\consoles\vt100cons\group\bld.inf"
-#include "..\..\plugins\consoles\win32cons\group\bld.inf"
-#ifdef FSHELL_TESTEXECUTE_SUPPORT
-#include "..\..\plugins\consoles\tefcons\bld.inf"
-#endif
 #include "..\..\plugins\networking\nullnif\group\bld.inf"
 #include "..\..\plugins\networking\tcpcsy\group\bld.inf"
 #include "..\..\plugins\networking\winsockprt\group\bld.inf"

--- a/plugins/consoles/common/bld.inf	Wed Aug 11 12:05:02 2010 +0100
+++ b/plugins/consoles/common/bld.inf	Wed Aug 11 12:57:25 2010 +0100
@@ -14,6 +14,37 @@
 #endif
 
 PRJ_EXPORTS
-.\consoleextensions.h \epoc32\include\fshell\consoleextensions.h
-.\consoleextensions.inl \epoc32\include\fshell\consoleextensions.inl
+consoleextensions.h						\epoc32\include\fshell\consoleextensions.h
+consoleextensions.inl					\epoc32\include\fshell\consoleextensions.inl
+..\consoleproxy\inc\consoleproxy.h		\epoc32\include\fshell\consoleproxy.h
+..\rcons\server\win32\rcons.exe			\epoc32\tools\rcons.exe
+..\rcons\client\data\rcons.idf			z:\resource\rcons.idf
+..\rcons\client\data\rcons.ini.emulator	\epoc32\winscw\c\system\console\rcons.ini
+..\win32cons\group\fshell.bat			\epoc32\tools\fshell.bat
+..\win32cons\group\fshellconsole.ini	\epoc32\data\fshellconsole.ini
+
+FSHELL_ROM_INCLUDE2(..\consoleproxy\group\consoleproxy.iby, consoleproxy.iby)
+FSHELL_ROM_INCLUDE2(..\defcons\group\defcons.iby, defcons.iby)
+FSHELL_ROM_INCLUDE2(..\nullcons\group\nullcons.iby, nullcons.iby)
+FSHELL_ROM_INCLUDE2(..\rcons\client\group\rcons.iby, rcons.iby)
+
+PRJ_MMPFILES
 
+..\consoleproxy\group\consoleproxy.mmp
+..\defcons\src\defcons.mmp
+..\iocons\group\iocons.mmp
+..\nullcons\src\nullcons.mmp
+..\rcons\client\group\remote_console.mmp
+
+#if defined(WINS)
+gnumakefile ..\win32cons\group\os_ver.mk
+..\win32cons\group\win32cons.mmp
+#endif
+
+#include "../guicons/group/bld.inf"
+#include "../vt100cons/group/bld.inf"
+
+#ifdef FSHELL_TESTEXECUTE_SUPPORT
+PRJ_MMPFILES
+..\tefcons\tefcons.mmp
+#endif

--- a/plugins/consoles/consoleproxy/group/bld.inf	Wed Aug 11 12:05:02 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-// bld.inf
-// 
-// Copyright (c) 2009 - 2010 Accenture. All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-// 
-// Initial Contributors:
-// Accenture - Initial contribution
-//
-
-#ifndef FSHELL_COMMON_MMH
-#include <fshell/common.mmh>
-#endif
-
-PRJ_EXPORTS
-..\inc\consoleproxy.h	\epoc32\include\fshell\consoleproxy.h
-FSHELL_ROM_INCLUDE(consoleproxy.iby)
-
-PRJ_MMPFILES
-.\consoleproxy.mmp
-

--- a/plugins/consoles/defcons/group/bld.inf	Wed Aug 11 12:05:02 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-// bld.inf
-// 
-// Copyright (c) 2010 Accenture. All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-// 
-// Initial Contributors:
-// Accenture - Initial contribution
-//
-#ifndef FSHELL_COMMON_MMH
-#include <fshell/common.mmh>
-#endif
-
-PRJ_EXPORTS
-FSHELL_ROM_INCLUDE(defcons.iby)
-
-PRJ_MMPFILES
-..\src\defcons
-

--- a/plugins/consoles/iocons/group/bld.inf	Wed Aug 11 12:05:02 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-// bld.inf
-// 
-// Copyright (c) 2010 Accenture. All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-// 
-// Initial Contributors:
-// Accenture - Initial contribution
-//
-#ifndef FSHELL_COMMON_MMH
-#include <fshell/common.mmh>
-#endif
-
-PRJ_MMPFILES
-.\iocons.mmp
-

--- a/plugins/consoles/nullcons/group/bld.inf	Wed Aug 11 12:05:02 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-// bld.inf
-// 
-// Copyright (c) 2010 Accenture. All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-// 
-// Initial Contributors:
-// Accenture - Initial contribution
-//
-#ifndef FSHELL_COMMON_MMH
-#include <fshell/common.mmh>
-#endif
-
-PRJ_EXPORTS
-FSHELL_ROM_INCLUDE(nullcons.iby)
-
-PRJ_MMPFILES
-..\src\nullcons
-

--- a/plugins/consoles/rcons/group/bld.inf	Wed Aug 11 12:05:02 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-// bld.inf
-// 
-// Copyright (c) 2010 Accenture. All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-// 
-// Initial Contributors:
-// Accenture - Initial contribution
-//
-#ifndef FSHELL_COMMON_MMH
-#include <fshell/common.mmh>
-#endif
-
-PRJ_EXPORTS
-FSHELL_ROM_INCLUDE2(..\client\group\rcons.iby, rcons.iby)
-..\server\win32\rcons.exe       	\epoc32\tools\rcons.exe
-..\client\data\rcons.ini.emulator	\epoc32\winscw\c\system\console\rcons.ini
-..\client\data\rcons.idf		Z:\resource\rcons.idf
-
-PRJ_MMPFILES
-..\client\group\remote_console.mmp
-

--- a/plugins/consoles/tefcons/bld.inf	Wed Aug 11 12:05:02 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-// bld.inf
-// 
-// Copyright (c) 2010 Accenture. All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-// 
-// Initial Contributors:
-// Accenture - Initial contribution
-//
-#ifndef FSHELL_COMMON_MMH
-#include <fshell/common.mmh>
-#endif
-
-PRJ_EXPORTS
-//TODO sort this FSHELL_ROM_INCLUDE(tefcons.iby)
-
-PRJ_MMPFILES
-tefcons.mmp
-

--- a/plugins/consoles/win32cons/group/bld.inf	Wed Aug 11 12:05:02 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-// bld.inf
-// 
-// Copyright (c) 2010 Accenture. All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-// 
-// Initial Contributors:
-// Accenture - Initial contribution
-//
-#ifndef FSHELL_COMMON_MMH
-#include <fshell/common.mmh>
-#endif
-
-PRJ_EXPORTS
-
-.\fshell.bat                           \epoc32\tools\fshell.bat
-.\fshellconsole.ini                    \epoc32\data\fshellconsole.ini
-
-PRJ_MMPFILES
-
-#if defined(WINS)
-
-gnumakefile .\os_ver.mk
-.\win32cons.mmp
-
-#endif
\ No newline at end of file