diff --git a/app/define.cpp b/ISLE/define.cpp
similarity index 100%
rename from app/define.cpp
rename to ISLE/define.cpp
diff --git a/app/define.h b/ISLE/define.h
similarity index 100%
rename from app/define.h
rename to ISLE/define.h
diff --git a/lib/lego1.def b/ISLE/ext/lego1.def
similarity index 100%
rename from lib/lego1.def
rename to ISLE/ext/lego1.def
diff --git a/lib/lego1.exp b/ISLE/ext/lego1.exp
similarity index 100%
rename from lib/lego1.exp
rename to ISLE/ext/lego1.exp
diff --git a/lib/lego1.lib b/ISLE/ext/lego1.lib
similarity index 100%
rename from lib/lego1.lib
rename to ISLE/ext/lego1.lib
diff --git a/app/isle.cpp b/ISLE/isle.cpp
similarity index 99%
rename from app/isle.cpp
rename to ISLE/isle.cpp
index 06e49b77..deb3d6e1 100644
--- a/app/isle.cpp
+++ b/ISLE/isle.cpp
@@ -1,10 +1,10 @@
 #include "isle.h"
 
 #include "define.h"
-#include "../lib/legoomni.h"
-#include "../lib/mxdirectdraw.h"
-#include "../lib/mxdsaction.h"
-#include "../lib/mxomni.h"
+#include "legoomni.h"
+#include "mxdirectdraw.h"
+#include "mxdsaction.h"
+#include "mxomni.h"
 #include "res/resource.h"
 
 RECT windowRect = {0, 0, 640, 480};
diff --git a/app/isle.h b/ISLE/isle.h
similarity index 95%
rename from app/isle.h
rename to ISLE/isle.h
index ff70a183..e23fb8cb 100644
--- a/app/isle.h
+++ b/ISLE/isle.h
@@ -3,8 +3,8 @@
 
 #include <Windows.h>
 
-#include "../lib/define.h"
-#include "../lib/mxvideoparam.h"
+#include "mxresult.h"
+#include "mxvideoparam.h"
 
 class Isle
 {
diff --git a/app/main.cpp b/ISLE/main.cpp
similarity index 96%
rename from app/main.cpp
rename to ISLE/main.cpp
index 3cd8516a..985c70c0 100644
--- a/app/main.cpp
+++ b/ISLE/main.cpp
@@ -3,7 +3,7 @@
 
 #include "define.h"
 #include "isle.h"
-#include "../lib/legoomni.h"
+#include "legoomni.h"
 
 BOOL findExistingInstance(void)
 {
@@ -31,6 +31,9 @@ BOOL startDirectSound(void)
 
 int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nShowCmd)
 {
+  // TEMP: Load our recompiled library if available
+  LoadLibraryA("LEGO2");
+
   // Look for another instance, if we find one, bring it to the foreground instead
   if (!findExistingInstance()) {
     return 0;
diff --git a/app/res/arrow.cur b/ISLE/res/arrow.cur
similarity index 100%
rename from app/res/arrow.cur
rename to ISLE/res/arrow.cur
diff --git a/app/res/busy.cur b/ISLE/res/busy.cur
similarity index 100%
rename from app/res/busy.cur
rename to ISLE/res/busy.cur
diff --git a/app/res/isle.ico b/ISLE/res/isle.ico
similarity index 100%
rename from app/res/isle.ico
rename to ISLE/res/isle.ico
diff --git a/app/res/isle.rc b/ISLE/res/isle.rc
similarity index 80%
rename from app/res/isle.rc
rename to ISLE/res/isle.rc
index bcf91d2c..59bd314b 100644
Binary files a/app/res/isle.rc and b/ISLE/res/isle.rc differ
diff --git a/app/res/no.cur b/ISLE/res/no.cur
similarity index 100%
rename from app/res/no.cur
rename to ISLE/res/no.cur
diff --git a/app/res/resource.h b/ISLE/res/resource.h
similarity index 100%
rename from app/res/resource.h
rename to ISLE/res/resource.h
diff --git a/LEGO1/dllmain.cpp b/LEGO1/dllmain.cpp
new file mode 100644
index 00000000..060bd70c
--- /dev/null
+++ b/LEGO1/dllmain.cpp
@@ -0,0 +1,6 @@
+#include <Windows.h>
+
+BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
+{
+  return TRUE;
+}
diff --git a/lib/legoanimationmanager.h b/LEGO1/legoanimationmanager.h
similarity index 100%
rename from lib/legoanimationmanager.h
rename to LEGO1/legoanimationmanager.h
diff --git a/lib/legobuildingmanager.h b/LEGO1/legobuildingmanager.h
similarity index 100%
rename from lib/legobuildingmanager.h
rename to LEGO1/legobuildingmanager.h
diff --git a/lib/legogamestate.h b/LEGO1/legogamestate.h
similarity index 100%
rename from lib/legogamestate.h
rename to LEGO1/legogamestate.h
diff --git a/lib/legoinputmanager.h b/LEGO1/legoinputmanager.h
similarity index 100%
rename from lib/legoinputmanager.h
rename to LEGO1/legoinputmanager.h
diff --git a/lib/legomodelpresenter.h b/LEGO1/legomodelpresenter.h
similarity index 100%
rename from lib/legomodelpresenter.h
rename to LEGO1/legomodelpresenter.h
diff --git a/lib/legoomni.h b/LEGO1/legoomni.h
similarity index 100%
rename from lib/legoomni.h
rename to LEGO1/legoomni.h
diff --git a/lib/legopartpresenter.h b/LEGO1/legopartpresenter.h
similarity index 100%
rename from lib/legopartpresenter.h
rename to LEGO1/legopartpresenter.h
diff --git a/lib/legoroi.h b/LEGO1/legoroi.h
similarity index 100%
rename from lib/legoroi.h
rename to LEGO1/legoroi.h
diff --git a/lib/legovideomanager.h b/LEGO1/legovideomanager.h
similarity index 100%
rename from lib/legovideomanager.h
rename to LEGO1/legovideomanager.h
diff --git a/lib/legoworldpresenter.h b/LEGO1/legoworldpresenter.h
similarity index 100%
rename from lib/legoworldpresenter.h
rename to LEGO1/legoworldpresenter.h
diff --git a/lib/mxatomid.h b/LEGO1/mxatomid.h
similarity index 100%
rename from lib/mxatomid.h
rename to LEGO1/mxatomid.h
diff --git a/lib/mxbackgroundaudiomanager.h b/LEGO1/mxbackgroundaudiomanager.h
similarity index 100%
rename from lib/mxbackgroundaudiomanager.h
rename to LEGO1/mxbackgroundaudiomanager.h
diff --git a/lib/mxbitmap.h b/LEGO1/mxbitmap.h
similarity index 100%
rename from lib/mxbitmap.h
rename to LEGO1/mxbitmap.h
diff --git a/LEGO1/mxbool.h b/LEGO1/mxbool.h
new file mode 100644
index 00000000..ce1a9716
--- /dev/null
+++ b/LEGO1/mxbool.h
@@ -0,0 +1,6 @@
+#ifndef MXBOOL_H
+#define MXBOOL_H
+
+typedef unsigned char MxBool;
+
+#endif // MXBOOL_H
diff --git a/LEGO1/mxcore.cpp b/LEGO1/mxcore.cpp
new file mode 100644
index 00000000..290abca4
--- /dev/null
+++ b/LEGO1/mxcore.cpp
@@ -0,0 +1,35 @@
+#include "mxcore.h"
+
+#include <string.h>
+
+unsigned int g_mxcoreCount = 0;
+
+MxCore::MxCore()
+{
+  m_id = g_mxcoreCount;
+  g_mxcoreCount++;
+}
+
+MxCore::~MxCore()
+{
+}
+
+long MxCore::Notify(MxParam &p)
+{
+  return 0;
+}
+
+long MxCore::FUN_10001f70()
+{
+  return 0;
+}
+
+const char *MxCore::GetClassName() const
+{
+  return "MxCore";
+}
+
+MxBool MxCore::IsClass(const char *name) const
+{
+  return strcmp(name, "MxCore") == 0;
+}
diff --git a/LEGO1/mxcore.h b/LEGO1/mxcore.h
new file mode 100644
index 00000000..6561a23f
--- /dev/null
+++ b/LEGO1/mxcore.h
@@ -0,0 +1,23 @@
+#ifndef MXCORE_H
+#define MXCORE_H
+
+#include "mxbool.h"
+
+class MxParam;
+
+class MxCore
+{
+public:
+  __declspec(dllexport) MxCore();
+  __declspec(dllexport) virtual ~MxCore();
+  __declspec(dllexport) virtual long Notify(MxParam &p);
+  virtual long FUN_10001f70();
+  virtual const char *GetClassName() const;
+  virtual MxBool IsClass(const char *name) const;
+
+private:
+  unsigned int m_id;
+
+};
+
+#endif // MXCORE_H
diff --git a/lib/mxdirectdraw.h b/LEGO1/mxdirectdraw.h
similarity index 100%
rename from lib/mxdirectdraw.h
rename to LEGO1/mxdirectdraw.h
diff --git a/lib/mxdsaction.h b/LEGO1/mxdsaction.h
similarity index 100%
rename from lib/mxdsaction.h
rename to LEGO1/mxdsaction.h
diff --git a/lib/mxdsfile.h b/LEGO1/mxdsfile.h
similarity index 100%
rename from lib/mxdsfile.h
rename to LEGO1/mxdsfile.h
diff --git a/lib/mxomni.h b/LEGO1/mxomni.h
similarity index 100%
rename from lib/mxomni.h
rename to LEGO1/mxomni.h
diff --git a/lib/mxomnicreateflags.h b/LEGO1/mxomnicreateflags.h
similarity index 100%
rename from lib/mxomnicreateflags.h
rename to LEGO1/mxomnicreateflags.h
diff --git a/lib/mxomnicreateparam.h b/LEGO1/mxomnicreateparam.h
similarity index 100%
rename from lib/mxomnicreateparam.h
rename to LEGO1/mxomnicreateparam.h
diff --git a/lib/mxomnicreateparambase.cpp b/LEGO1/mxomnicreateparambase.cpp
similarity index 100%
rename from lib/mxomnicreateparambase.cpp
rename to LEGO1/mxomnicreateparambase.cpp
diff --git a/lib/mxomnicreateparambase.h b/LEGO1/mxomnicreateparambase.h
similarity index 100%
rename from lib/mxomnicreateparambase.h
rename to LEGO1/mxomnicreateparambase.h
diff --git a/lib/mxpalette.h b/LEGO1/mxpalette.h
similarity index 100%
rename from lib/mxpalette.h
rename to LEGO1/mxpalette.h
diff --git a/lib/mxrect32.h b/LEGO1/mxrect32.h
similarity index 100%
rename from lib/mxrect32.h
rename to LEGO1/mxrect32.h
diff --git a/lib/define.h b/LEGO1/mxresult.h
similarity index 62%
rename from lib/define.h
rename to LEGO1/mxresult.h
index a591766f..7a56f493 100644
--- a/lib/define.h
+++ b/LEGO1/mxresult.h
@@ -1,8 +1,8 @@
-#ifndef MX_DEFINE
-#define MX_DEFINE
+#ifndef MXRESULT_H
+#define MXRESULT_H
 
 typedef unsigned long MxResult;
 const MxResult SUCCESS = 0;
 const MxResult FAILURE = 0xFFFFFFFFL;
 
-#endif // MX_DEFINE
+#endif // MXRESULT_H
diff --git a/lib/mxstreamcontroller.h b/LEGO1/mxstreamcontroller.h
similarity index 100%
rename from lib/mxstreamcontroller.h
rename to LEGO1/mxstreamcontroller.h
diff --git a/lib/mxstreamer.h b/LEGO1/mxstreamer.h
similarity index 100%
rename from lib/mxstreamer.h
rename to LEGO1/mxstreamer.h
diff --git a/lib/mxstring.h b/LEGO1/mxstring.h
similarity index 100%
rename from lib/mxstring.h
rename to LEGO1/mxstring.h
diff --git a/lib/mxticklemanager.h b/LEGO1/mxticklemanager.h
similarity index 100%
rename from lib/mxticklemanager.h
rename to LEGO1/mxticklemanager.h
diff --git a/lib/mxtimer.h b/LEGO1/mxtimer.h
similarity index 100%
rename from lib/mxtimer.h
rename to LEGO1/mxtimer.h
diff --git a/lib/mxtransitionmanager.h b/LEGO1/mxtransitionmanager.h
similarity index 100%
rename from lib/mxtransitionmanager.h
rename to LEGO1/mxtransitionmanager.h
diff --git a/lib/mxvariabletable.h b/LEGO1/mxvariabletable.h
similarity index 100%
rename from lib/mxvariabletable.h
rename to LEGO1/mxvariabletable.h
diff --git a/lib/mxvideoparam.h b/LEGO1/mxvideoparam.h
similarity index 100%
rename from lib/mxvideoparam.h
rename to LEGO1/mxvideoparam.h
diff --git a/lib/mxvideoparamflags.h b/LEGO1/mxvideoparamflags.h
similarity index 100%
rename from lib/mxvideoparamflags.h
rename to LEGO1/mxvideoparamflags.h
diff --git a/isle.mak b/isle.mak
index 90ce7420..a0ef5353 100644
--- a/isle.mak
+++ b/isle.mak
@@ -2,23 +2,27 @@
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Application" 0x0101
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
 
 !IF "$(CFG)" == ""
-CFG=isle - Win32 Debug
-!MESSAGE No configuration specified.  Defaulting to isle - Win32 Debug.
+CFG=LEGO1 - Win32 Release
+!MESSAGE No configuration specified.  Defaulting to LEGO1 - Win32 Release.
 !ENDIF 
 
-!IF "$(CFG)" != "isle - Win32 Release" && "$(CFG)" != "isle - Win32 Debug"
+!IF "$(CFG)" != "LEGO1 - Win32 Release" && "$(CFG)" != "LEGO1 - Win32 Debug" &&\
+ "$(CFG)" != "ISLE - Win32 Release" && "$(CFG)" != "ISLE - Win32 Debug"
 !MESSAGE Invalid configuration "$(CFG)" specified.
 !MESSAGE You can specify a configuration when running NMAKE on this makefile
 !MESSAGE by defining the macro CFG on the command line.  For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "isle.mak" CFG="isle - Win32 Debug"
+!MESSAGE NMAKE /f "isle.mak" CFG="LEGO1 - Win32 Release"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "isle - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "isle - Win32 Debug" (based on "Win32 (x86) Application")
+!MESSAGE "LEGO1 - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "LEGO1 - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "ISLE - Win32 Release" (based on "Win32 (x86) Application")
+!MESSAGE "ISLE - Win32 Debug" (based on "Win32 (x86) Application")
 !MESSAGE 
 !ERROR An invalid configuration is specified.
 !ENDIF 
@@ -31,147 +35,42 @@ NULL=nul
 ################################################################################
 # Begin Project
 # PROP Target_Last_Scanned "isle - Win32 Debug"
-CPP=cl.exe
-MTL=mktyplib.exe
-RSC=rc.exe
 
-!IF  "$(CFG)" == "isle - Win32 Release"
+!IF  "$(CFG)" == "LEGO1 - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
+# PROP BASE Output_Dir "LEGO1\Release"
+# PROP BASE Intermediate_Dir "LEGO1\Release"
+# PROP BASE Target_Dir "LEGO1"
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-OUTDIR=.\Release
-INTDIR=.\Release
+# PROP Output_Dir "LEGO1\Release"
+# PROP Intermediate_Dir "LEGO1\Release"
+# PROP Target_Dir "LEGO1"
+OUTDIR=.\LEGO1\Release
+INTDIR=.\LEGO1\Release
 
-ALL : "$(OUTDIR)\isle.exe"
+ALL : "$(OUTDIR)\LEGO1.dll"
 
 CLEAN : 
-	-@erase "$(INTDIR)\define.obj"
-	-@erase "$(INTDIR)\isle.obj"
-	-@erase "$(INTDIR)\isle.res"
-	-@erase "$(INTDIR)\main.obj"
-	-@erase "$(INTDIR)\mxomnicreateparambase.obj"
-	-@erase "$(OUTDIR)\isle.exe"
+	-@erase "$(INTDIR)\dllmain.obj"
+	-@erase "$(INTDIR)\mxcore.obj"
+	-@erase "$(OUTDIR)\LEGO1.dll"
+	-@erase "$(OUTDIR)\LEGO1.exp"
+	-@erase "$(OUTDIR)\LEGO1.lib"
+	-@erase "$(OUTDIR)\LEGO1.map"
 
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c
-# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c
-CPP_PROJ=/nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS"\
- /Fp"$(INTDIR)/isle.pch" /YX /Fo"$(INTDIR)/" /c 
-CPP_OBJS=.\Release/
+CPP=cl.exe
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c
+CPP_PROJ=/nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS"\
+ /Fp"$(INTDIR)/LEGO1.pch" /YX /Fo"$(INTDIR)/" /c 
+CPP_OBJS=.\LEGO1\Release/
 CPP_SBRS=.\.
-# ADD BASE MTL /nologo /D "NDEBUG" /win32
-# ADD MTL /nologo /D "NDEBUG" /win32
-MTL_PROJ=/nologo /D "NDEBUG" /win32 
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)/isle.res" /d "NDEBUG" 
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-BSC32_FLAGS=/nologo /o"$(OUTDIR)/isle.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib dsound.lib winmm.lib lib/lego1.lib /nologo /subsystem:windows /machine:I386
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
- advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\
- odbccp32.lib dsound.lib winmm.lib lib/lego1.lib /nologo /subsystem:windows\
- /incremental:no /pdb:"$(OUTDIR)/isle.pdb" /machine:I386\
- /out:"$(OUTDIR)/isle.exe" 
-LINK32_OBJS= \
-	"$(INTDIR)\define.obj" \
-	"$(INTDIR)\isle.obj" \
-	"$(INTDIR)\isle.res" \
-	"$(INTDIR)\main.obj" \
-	"$(INTDIR)\mxomnicreateparambase.obj"
-
-"$(OUTDIR)\isle.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "isle - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-OUTDIR=.\Debug
-INTDIR=.\Debug
-
-ALL : "$(OUTDIR)\isle.exe"
-
-CLEAN : 
-	-@erase "$(INTDIR)\define.obj"
-	-@erase "$(INTDIR)\isle.obj"
-	-@erase "$(INTDIR)\isle.res"
-	-@erase "$(INTDIR)\main.obj"
-	-@erase "$(INTDIR)\mxomnicreateparambase.obj"
-	-@erase "$(INTDIR)\vc40.idb"
-	-@erase "$(INTDIR)\vc40.pdb"
-	-@erase "$(OUTDIR)\isle.exe"
-	-@erase "$(OUTDIR)\isle.ilk"
-	-@erase "$(OUTDIR)\isle.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
-# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
-CPP_PROJ=/nologo /MLd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS"\
- /Fp"$(INTDIR)/isle.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c 
-CPP_OBJS=.\Debug/
-CPP_SBRS=.\.
-# ADD BASE MTL /nologo /D "_DEBUG" /win32
-# ADD MTL /nologo /D "_DEBUG" /win32
-MTL_PROJ=/nologo /D "_DEBUG" /win32 
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)/isle.res" /d "_DEBUG" 
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-BSC32_FLAGS=/nologo /o"$(OUTDIR)/isle.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib dsound.lib winmm.lib lib/lego1.lib /nologo /subsystem:windows /debug /machine:I386
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
- advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\
- odbccp32.lib dsound.lib winmm.lib lib/lego1.lib /nologo /subsystem:windows\
- /incremental:yes /pdb:"$(OUTDIR)/isle.pdb" /debug /machine:I386\
- /out:"$(OUTDIR)/isle.exe" 
-LINK32_OBJS= \
-	"$(INTDIR)\define.obj" \
-	"$(INTDIR)\isle.obj" \
-	"$(INTDIR)\isle.res" \
-	"$(INTDIR)\main.obj" \
-	"$(INTDIR)\mxomnicreateparambase.obj"
-
-"$(OUTDIR)\isle.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
 
 .c{$(CPP_OBJS)}.obj:
    $(CPP) $(CPP_PROJ) $<  
@@ -191,24 +90,367 @@ LINK32_OBJS= \
 .cxx{$(CPP_SBRS)}.sbr:
    $(CPP) $(CPP_PROJ) $<  
 
+MTL=mktyplib.exe
+# ADD BASE MTL /nologo /D "NDEBUG" /win32
+# ADD MTL /nologo /D "NDEBUG" /win32
+MTL_PROJ=/nologo /D "NDEBUG" /win32 
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+BSC32_FLAGS=/nologo /o"$(OUTDIR)/LEGO1.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /map /machine:I386
+LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
+ advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\
+ odbccp32.lib /nologo /subsystem:windows /dll /incremental:no\
+ /pdb:"$(OUTDIR)/LEGO1.pdb" /map:"$(INTDIR)/LEGO1.map" /machine:I386\
+ /out:"$(OUTDIR)/LEGO1.dll" /implib:"$(OUTDIR)/LEGO1.lib" 
+LINK32_OBJS= \
+	"$(INTDIR)\dllmain.obj" \
+	"$(INTDIR)\mxcore.obj"
+
+"$(OUTDIR)\LEGO1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ELSEIF  "$(CFG)" == "LEGO1 - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "LEGO1\Debug"
+# PROP BASE Intermediate_Dir "LEGO1\Debug"
+# PROP BASE Target_Dir "LEGO1"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "LEGO1\Debug"
+# PROP Intermediate_Dir "LEGO1\Debug"
+# PROP Target_Dir "LEGO1"
+OUTDIR=.\LEGO1\Debug
+INTDIR=.\LEGO1\Debug
+
+ALL : "$(OUTDIR)\LEGO1.dll"
+
+CLEAN : 
+	-@erase "$(INTDIR)\dllmain.obj"
+	-@erase "$(INTDIR)\mxcore.obj"
+	-@erase "$(INTDIR)\vc40.idb"
+	-@erase "$(INTDIR)\vc40.pdb"
+	-@erase "$(OUTDIR)\LEGO1.dll"
+	-@erase "$(OUTDIR)\LEGO1.exp"
+	-@erase "$(OUTDIR)\LEGO1.ilk"
+	-@erase "$(OUTDIR)\LEGO1.lib"
+	-@erase "$(OUTDIR)\LEGO1.map"
+	-@erase "$(OUTDIR)\LEGO1.pdb"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
+CPP_PROJ=/nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS"\
+ /Fp"$(INTDIR)/LEGO1.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c 
+CPP_OBJS=.\LEGO1\Debug/
+CPP_SBRS=.\.
+
+.c{$(CPP_OBJS)}.obj:
+   $(CPP) $(CPP_PROJ) $<  
+
+.cpp{$(CPP_OBJS)}.obj:
+   $(CPP) $(CPP_PROJ) $<  
+
+.cxx{$(CPP_OBJS)}.obj:
+   $(CPP) $(CPP_PROJ) $<  
+
+.c{$(CPP_SBRS)}.sbr:
+   $(CPP) $(CPP_PROJ) $<  
+
+.cpp{$(CPP_SBRS)}.sbr:
+   $(CPP) $(CPP_PROJ) $<  
+
+.cxx{$(CPP_SBRS)}.sbr:
+   $(CPP) $(CPP_PROJ) $<  
+
+MTL=mktyplib.exe
+# ADD BASE MTL /nologo /D "_DEBUG" /win32
+# ADD MTL /nologo /D "_DEBUG" /win32
+MTL_PROJ=/nologo /D "_DEBUG" /win32 
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+BSC32_FLAGS=/nologo /o"$(OUTDIR)/LEGO1.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /map /debug /machine:I386
+LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
+ advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\
+ odbccp32.lib /nologo /subsystem:windows /dll /incremental:yes\
+ /pdb:"$(OUTDIR)/LEGO1.pdb" /map:"$(INTDIR)/LEGO1.map" /debug /machine:I386\
+ /out:"$(OUTDIR)/LEGO1.dll" /implib:"$(OUTDIR)/LEGO1.lib" 
+LINK32_OBJS= \
+	"$(INTDIR)\dllmain.obj" \
+	"$(INTDIR)\mxcore.obj"
+
+"$(OUTDIR)\LEGO1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ELSEIF  "$(CFG)" == "ISLE - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "ISLE\Release"
+# PROP BASE Intermediate_Dir "ISLE\Release"
+# PROP BASE Target_Dir "ISLE"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "ISLE\Release"
+# PROP Intermediate_Dir "ISLE\Release"
+# PROP Target_Dir "ISLE"
+OUTDIR=.\ISLE\Release
+INTDIR=.\ISLE\Release
+
+ALL : "$(OUTDIR)\ISLE.exe"
+
+CLEAN : 
+	-@erase "$(INTDIR)\define.obj"
+	-@erase "$(INTDIR)\isle.obj"
+	-@erase "$(INTDIR)\isle.res"
+	-@erase "$(INTDIR)\main.obj"
+	-@erase "$(INTDIR)\mxomnicreateparambase.obj"
+	-@erase "$(OUTDIR)\ISLE.exe"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c
+# ADD CPP /nologo /W3 /GX /O2 /I "LEGO1" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c
+CPP_PROJ=/nologo /ML /W3 /GX /O2 /I "LEGO1" /D "WIN32" /D "NDEBUG" /D\
+ "_WINDOWS" /Fp"$(INTDIR)/ISLE.pch" /YX /Fo"$(INTDIR)/" /c 
+CPP_OBJS=.\ISLE\Release/
+CPP_SBRS=.\.
+
+.c{$(CPP_OBJS)}.obj:
+   $(CPP) $(CPP_PROJ) $<  
+
+.cpp{$(CPP_OBJS)}.obj:
+   $(CPP) $(CPP_PROJ) $<  
+
+.cxx{$(CPP_OBJS)}.obj:
+   $(CPP) $(CPP_PROJ) $<  
+
+.c{$(CPP_SBRS)}.sbr:
+   $(CPP) $(CPP_PROJ) $<  
+
+.cpp{$(CPP_SBRS)}.sbr:
+   $(CPP) $(CPP_PROJ) $<  
+
+.cxx{$(CPP_SBRS)}.sbr:
+   $(CPP) $(CPP_PROJ) $<  
+
+MTL=mktyplib.exe
+# ADD BASE MTL /nologo /D "NDEBUG" /win32
+# ADD MTL /nologo /D "NDEBUG" /win32
+MTL_PROJ=/nologo /D "NDEBUG" /win32 
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)/isle.res" /d "NDEBUG" 
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+BSC32_FLAGS=/nologo /o"$(OUTDIR)/ISLE.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib lego1.lib dsound.lib /nologo /subsystem:windows /machine:I386 /LIBPATH:"ISLE\EXT"
+# SUBTRACT LINK32 /pdb:none
+LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
+ advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\
+ odbccp32.lib winmm.lib lego1.lib dsound.lib /nologo /subsystem:windows\
+ /incremental:no /pdb:"$(OUTDIR)/ISLE.pdb" /machine:I386\
+ /out:"$(OUTDIR)/ISLE.exe" /LIBPATH:"ISLE\EXT" 
+LINK32_OBJS= \
+	"$(INTDIR)\define.obj" \
+	"$(INTDIR)\isle.obj" \
+	"$(INTDIR)\isle.res" \
+	"$(INTDIR)\main.obj" \
+	"$(INTDIR)\mxomnicreateparambase.obj"
+
+"$(OUTDIR)\ISLE.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ELSEIF  "$(CFG)" == "ISLE - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "ISLE\Debug"
+# PROP BASE Intermediate_Dir "ISLE\Debug"
+# PROP BASE Target_Dir "ISLE"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "ISLE\Debug"
+# PROP Intermediate_Dir "ISLE\Debug"
+# PROP Target_Dir "ISLE"
+OUTDIR=.\ISLE\Debug
+INTDIR=.\ISLE\Debug
+
+ALL : "$(OUTDIR)\ISLE.exe"
+
+CLEAN : 
+	-@erase "$(INTDIR)\define.obj"
+	-@erase "$(INTDIR)\isle.obj"
+	-@erase "$(INTDIR)\isle.res"
+	-@erase "$(INTDIR)\main.obj"
+	-@erase "$(INTDIR)\mxomnicreateparambase.obj"
+	-@erase "$(INTDIR)\vc40.idb"
+	-@erase "$(INTDIR)\vc40.pdb"
+	-@erase "$(OUTDIR)\ISLE.exe"
+	-@erase "$(OUTDIR)\ISLE.ilk"
+	-@erase "$(OUTDIR)\ISLE.pdb"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
+# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "LEGO1" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
+CPP_PROJ=/nologo /MLd /W3 /Gm /GX /Zi /Od /I "LEGO1" /D "WIN32" /D "_DEBUG" /D\
+ "_WINDOWS" /Fp"$(INTDIR)/ISLE.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c 
+CPP_OBJS=.\ISLE\Debug/
+CPP_SBRS=.\.
+
+.c{$(CPP_OBJS)}.obj:
+   $(CPP) $(CPP_PROJ) $<  
+
+.cpp{$(CPP_OBJS)}.obj:
+   $(CPP) $(CPP_PROJ) $<  
+
+.cxx{$(CPP_OBJS)}.obj:
+   $(CPP) $(CPP_PROJ) $<  
+
+.c{$(CPP_SBRS)}.sbr:
+   $(CPP) $(CPP_PROJ) $<  
+
+.cpp{$(CPP_SBRS)}.sbr:
+   $(CPP) $(CPP_PROJ) $<  
+
+.cxx{$(CPP_SBRS)}.sbr:
+   $(CPP) $(CPP_PROJ) $<  
+
+MTL=mktyplib.exe
+# ADD BASE MTL /nologo /D "_DEBUG" /win32
+# ADD MTL /nologo /D "_DEBUG" /win32
+MTL_PROJ=/nologo /D "_DEBUG" /win32 
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)/isle.res" /d "_DEBUG" 
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+BSC32_FLAGS=/nologo /o"$(OUTDIR)/ISLE.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib lego1.lib dsound.lib /nologo /subsystem:windows /debug /machine:I386 /LIBPATH:"ISLE\EXT"
+# SUBTRACT LINK32 /pdb:none
+LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
+ advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\
+ odbccp32.lib winmm.lib lego1.lib dsound.lib /nologo /subsystem:windows\
+ /incremental:yes /pdb:"$(OUTDIR)/ISLE.pdb" /debug /machine:I386\
+ /out:"$(OUTDIR)/ISLE.exe" /LIBPATH:"ISLE\EXT" 
+LINK32_OBJS= \
+	"$(INTDIR)\define.obj" \
+	"$(INTDIR)\isle.obj" \
+	"$(INTDIR)\isle.res" \
+	"$(INTDIR)\main.obj" \
+	"$(INTDIR)\mxomnicreateparambase.obj"
+
+"$(OUTDIR)\ISLE.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF 
+
 ################################################################################
 # Begin Target
 
-# Name "isle - Win32 Release"
-# Name "isle - Win32 Debug"
+# Name "LEGO1 - Win32 Release"
+# Name "LEGO1 - Win32 Debug"
 
-!IF  "$(CFG)" == "isle - Win32 Release"
+!IF  "$(CFG)" == "LEGO1 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "isle - Win32 Debug"
+!ELSEIF  "$(CFG)" == "LEGO1 - Win32 Debug"
 
 !ENDIF 
 
 ################################################################################
 # Begin Source File
 
-SOURCE=.\app\define.cpp
+SOURCE=.\LEGO1\mxcore.cpp
+DEP_CPP_MXCOR=\
+	".\LEGO1\mxbool.h"\
+	".\LEGO1\mxcore.h"\
+	
+
+"$(INTDIR)\mxcore.obj" : $(SOURCE) $(DEP_CPP_MXCOR) "$(INTDIR)"
+   $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+# End Source File
+################################################################################
+# Begin Source File
+
+SOURCE=.\LEGO1\dllmain.cpp
+DEP_CPP_DLLMA=\
+	".\LEGO1\mxbool.h"\
+	".\LEGO1\mxcore.h"\
+	
+
+"$(INTDIR)\dllmain.obj" : $(SOURCE) $(DEP_CPP_DLLMA) "$(INTDIR)"
+   $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+# End Source File
+# End Target
+################################################################################
+# Begin Target
+
+# Name "ISLE - Win32 Release"
+# Name "ISLE - Win32 Debug"
+
+!IF  "$(CFG)" == "ISLE - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "ISLE - Win32 Debug"
+
+!ENDIF 
+
+################################################################################
+# Begin Source File
+
+SOURCE=.\ISLE\define.cpp
 DEP_CPP_DEFIN=\
-	".\app\define.h"\
+	".\ISLE\define.h"\
 	
 
 "$(INTDIR)\define.obj" : $(SOURCE) $(DEP_CPP_DEFIN) "$(INTDIR)"
@@ -219,42 +461,43 @@ DEP_CPP_DEFIN=\
 ################################################################################
 # Begin Source File
 
-SOURCE=.\app\isle.cpp
+SOURCE=.\ISLE\isle.cpp
 DEP_CPP_ISLE_=\
-	".\app\define.h"\
-	".\app\isle.h"\
-	".\app\res\resource.h"\
-	".\lib\define.h"\
-	".\lib\legoanimationmanager.h"\
-	".\lib\legobuildingmanager.h"\
-	".\lib\legogamestate.h"\
-	".\lib\legoinputmanager.h"\
-	".\lib\legomodelpresenter.h"\
-	".\lib\legoomni.h"\
-	".\lib\legopartpresenter.h"\
-	".\lib\legoroi.h"\
-	".\lib\legovideomanager.h"\
-	".\lib\legoworldpresenter.h"\
-	".\lib\mxatomid.h"\
-	".\lib\mxbackgroundaudiomanager.h"\
-	".\lib\mxcore.h"\
-	".\lib\mxdirectdraw.h"\
-	".\lib\mxdsaction.h"\
-	".\lib\mxomni.h"\
-	".\lib\mxomnicreateflags.h"\
-	".\lib\mxomnicreateparam.h"\
-	".\lib\mxomnicreateparambase.h"\
-	".\lib\mxpalette.h"\
-	".\lib\mxrect32.h"\
-	".\lib\mxstreamcontroller.h"\
-	".\lib\mxstreamer.h"\
-	".\lib\mxstring.h"\
-	".\lib\mxticklemanager.h"\
-	".\lib\mxtimer.h"\
-	".\lib\mxtransitionmanager.h"\
-	".\lib\mxvariabletable.h"\
-	".\lib\mxvideoparam.h"\
-	".\lib\mxvideoparamflags.h"\
+	".\ISLE\define.h"\
+	".\ISLE\isle.h"\
+	".\ISLE\res\resource.h"\
+	".\LEGO1\legoanimationmanager.h"\
+	".\LEGO1\legobuildingmanager.h"\
+	".\LEGO1\legogamestate.h"\
+	".\LEGO1\legoinputmanager.h"\
+	".\LEGO1\legomodelpresenter.h"\
+	".\LEGO1\legoomni.h"\
+	".\LEGO1\legopartpresenter.h"\
+	".\LEGO1\legoroi.h"\
+	".\LEGO1\legovideomanager.h"\
+	".\LEGO1\legoworldpresenter.h"\
+	".\LEGO1\mxatomid.h"\
+	".\LEGO1\mxbackgroundaudiomanager.h"\
+	".\LEGO1\mxbool.h"\
+	".\LEGO1\mxcore.h"\
+	".\LEGO1\mxdirectdraw.h"\
+	".\LEGO1\mxdsaction.h"\
+	".\LEGO1\mxomni.h"\
+	".\LEGO1\mxomnicreateflags.h"\
+	".\LEGO1\mxomnicreateparam.h"\
+	".\LEGO1\mxomnicreateparambase.h"\
+	".\LEGO1\mxpalette.h"\
+	".\LEGO1\mxrect32.h"\
+	".\LEGO1\mxresult.h"\
+	".\LEGO1\mxstreamcontroller.h"\
+	".\LEGO1\mxstreamer.h"\
+	".\LEGO1\mxstring.h"\
+	".\LEGO1\mxticklemanager.h"\
+	".\LEGO1\mxtimer.h"\
+	".\LEGO1\mxtransitionmanager.h"\
+	".\LEGO1\mxvariabletable.h"\
+	".\LEGO1\mxvideoparam.h"\
+	".\LEGO1\mxvideoparamflags.h"\
 	
 
 "$(INTDIR)\isle.obj" : $(SOURCE) $(DEP_CPP_ISLE_) "$(INTDIR)"
@@ -265,37 +508,40 @@ DEP_CPP_ISLE_=\
 ################################################################################
 # Begin Source File
 
-SOURCE=.\app\main.cpp
+SOURCE=.\ISLE\main.cpp
 DEP_CPP_MAIN_=\
-	".\app\define.h"\
-	".\app\isle.h"\
-	".\lib\define.h"\
-	".\lib\legoanimationmanager.h"\
-	".\lib\legobuildingmanager.h"\
-	".\lib\legogamestate.h"\
-	".\lib\legoinputmanager.h"\
-	".\lib\legomodelpresenter.h"\
-	".\lib\legoomni.h"\
-	".\lib\legopartpresenter.h"\
-	".\lib\legoroi.h"\
-	".\lib\legovideomanager.h"\
-	".\lib\legoworldpresenter.h"\
-	".\lib\mxatomid.h"\
-	".\lib\mxbackgroundaudiomanager.h"\
-	".\lib\mxdsaction.h"\
-	".\lib\mxomnicreateflags.h"\
-	".\lib\mxomnicreateparam.h"\
-	".\lib\mxpalette.h"\
-	".\lib\mxrect32.h"\
-	".\lib\mxstreamcontroller.h"\
-	".\lib\mxstreamer.h"\
-	".\lib\mxstring.h"\
-	".\lib\mxticklemanager.h"\
-	".\lib\mxtimer.h"\
-	".\lib\mxtransitionmanager.h"\
-	".\lib\mxvariabletable.h"\
-	".\lib\mxvideoparam.h"\
-	".\lib\mxvideoparamflags.h"\
+	".\ISLE\define.h"\
+	".\ISLE\isle.h"\
+	".\LEGO1\legoanimationmanager.h"\
+	".\LEGO1\legobuildingmanager.h"\
+	".\LEGO1\legogamestate.h"\
+	".\LEGO1\legoinputmanager.h"\
+	".\LEGO1\legomodelpresenter.h"\
+	".\LEGO1\legoomni.h"\
+	".\LEGO1\legopartpresenter.h"\
+	".\LEGO1\legoroi.h"\
+	".\LEGO1\legovideomanager.h"\
+	".\LEGO1\legoworldpresenter.h"\
+	".\LEGO1\mxatomid.h"\
+	".\LEGO1\mxbackgroundaudiomanager.h"\
+	".\LEGO1\mxbool.h"\
+	".\LEGO1\mxcore.h"\
+	".\LEGO1\mxdsaction.h"\
+	".\LEGO1\mxomnicreateflags.h"\
+	".\LEGO1\mxomnicreateparam.h"\
+	".\LEGO1\mxomnicreateparambase.h"\
+	".\LEGO1\mxpalette.h"\
+	".\LEGO1\mxrect32.h"\
+	".\LEGO1\mxresult.h"\
+	".\LEGO1\mxstreamcontroller.h"\
+	".\LEGO1\mxstreamer.h"\
+	".\LEGO1\mxstring.h"\
+	".\LEGO1\mxticklemanager.h"\
+	".\LEGO1\mxtimer.h"\
+	".\LEGO1\mxtransitionmanager.h"\
+	".\LEGO1\mxvariabletable.h"\
+	".\LEGO1\mxvideoparam.h"\
+	".\LEGO1\mxvideoparamflags.h"\
 	
 
 "$(INTDIR)\main.obj" : $(SOURCE) $(DEP_CPP_MAIN_) "$(INTDIR)"
@@ -306,20 +552,20 @@ DEP_CPP_MAIN_=\
 ################################################################################
 # Begin Source File
 
-SOURCE=.\app\res\isle.rc
+SOURCE=.\ISLE\res\isle.rc
 
-!IF  "$(CFG)" == "isle - Win32 Release"
+!IF  "$(CFG)" == "ISLE - Win32 Release"
 
 
 "$(INTDIR)\isle.res" : $(SOURCE) "$(INTDIR)"
-   $(RSC) /l 0x409 /fo"$(INTDIR)/isle.res" /i "app\res" /d "NDEBUG" $(SOURCE)
+   $(RSC) /l 0x409 /fo"$(INTDIR)/isle.res" /i "ISLE\res" /d "NDEBUG" $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "isle - Win32 Debug"
+!ELSEIF  "$(CFG)" == "ISLE - Win32 Debug"
 
 
 "$(INTDIR)\isle.res" : $(SOURCE) "$(INTDIR)"
-   $(RSC) /l 0x409 /fo"$(INTDIR)/isle.res" /i "app\res" /d "_DEBUG" $(SOURCE)
+   $(RSC) /l 0x409 /fo"$(INTDIR)/isle.res" /i "ISLE\res" /d "_DEBUG" $(SOURCE)
 
 
 !ENDIF 
@@ -328,23 +574,433 @@ SOURCE=.\app\res\isle.rc
 ################################################################################
 # Begin Source File
 
-SOURCE=.\lib\mxomnicreateparambase.cpp
+SOURCE=.\LEGO1\mxomnicreateparambase.cpp
 DEP_CPP_MXOMN=\
-	".\lib\mxomnicreateflags.h"\
-	".\lib\mxomnicreateparam.h"\
-	".\lib\mxomnicreateparambase.h"\
-	".\lib\mxpalette.h"\
-	".\lib\mxrect32.h"\
-	".\lib\mxstring.h"\
-	".\lib\mxvariabletable.h"\
-	".\lib\mxvideoparam.h"\
-	".\lib\mxvideoparamflags.h"\
+	".\LEGO1\mxbool.h"\
+	".\LEGO1\mxcore.h"\
+	".\LEGO1\mxomnicreateflags.h"\
+	".\LEGO1\mxomnicreateparam.h"\
+	".\LEGO1\mxomnicreateparambase.h"\
+	".\LEGO1\mxpalette.h"\
+	".\LEGO1\mxrect32.h"\
+	".\LEGO1\mxstring.h"\
+	".\LEGO1\mxvariabletable.h"\
+	".\LEGO1\mxvideoparam.h"\
+	".\LEGO1\mxvideoparamflags.h"\
 	
 
 "$(INTDIR)\mxomnicreateparambase.obj" : $(SOURCE) $(DEP_CPP_MXOMN) "$(INTDIR)"
    $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+# End Source File
+################################################################################
+# Begin Source File
+
+SOURCE=.\LEGO1\legoanimationmanager.h
+
+!IF  "$(CFG)" == "ISLE - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "ISLE - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+################################################################################
+# Begin Source File
+
+SOURCE=.\LEGO1\legobuildingmanager.h
+
+!IF  "$(CFG)" == "ISLE - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "ISLE - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+################################################################################
+# Begin Source File
+
+SOURCE=.\LEGO1\legogamestate.h
+
+!IF  "$(CFG)" == "ISLE - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "ISLE - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+################################################################################
+# Begin Source File
+
+SOURCE=.\LEGO1\legoinputmanager.h
+
+!IF  "$(CFG)" == "ISLE - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "ISLE - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+################################################################################
+# Begin Source File
+
+SOURCE=.\LEGO1\legomodelpresenter.h
+
+!IF  "$(CFG)" == "ISLE - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "ISLE - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+################################################################################
+# Begin Source File
+
+SOURCE=.\LEGO1\legoomni.h
+
+!IF  "$(CFG)" == "ISLE - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "ISLE - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+################################################################################
+# Begin Source File
+
+SOURCE=.\LEGO1\legopartpresenter.h
+
+!IF  "$(CFG)" == "ISLE - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "ISLE - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+################################################################################
+# Begin Source File
+
+SOURCE=.\LEGO1\legoroi.h
+
+!IF  "$(CFG)" == "ISLE - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "ISLE - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+################################################################################
+# Begin Source File
+
+SOURCE=.\LEGO1\legovideomanager.h
+
+!IF  "$(CFG)" == "ISLE - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "ISLE - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+################################################################################
+# Begin Source File
+
+SOURCE=.\LEGO1\legoworldpresenter.h
+
+!IF  "$(CFG)" == "ISLE - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "ISLE - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+################################################################################
+# Begin Source File
+
+SOURCE=.\LEGO1\mxatomid.h
+
+!IF  "$(CFG)" == "ISLE - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "ISLE - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+################################################################################
+# Begin Source File
+
+SOURCE=.\LEGO1\mxbackgroundaudiomanager.h
+
+!IF  "$(CFG)" == "ISLE - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "ISLE - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+################################################################################
+# Begin Source File
+
+SOURCE=.\LEGO1\mxbitmap.h
+
+!IF  "$(CFG)" == "ISLE - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "ISLE - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+################################################################################
+# Begin Source File
+
+SOURCE=.\LEGO1\mxbool.h
+
+!IF  "$(CFG)" == "ISLE - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "ISLE - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+################################################################################
+# Begin Source File
+
+SOURCE=.\LEGO1\mxcore.h
+
+!IF  "$(CFG)" == "ISLE - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "ISLE - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+################################################################################
+# Begin Source File
+
+SOURCE=.\LEGO1\mxdirectdraw.h
+
+!IF  "$(CFG)" == "ISLE - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "ISLE - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+################################################################################
+# Begin Source File
+
+SOURCE=.\LEGO1\mxdsaction.h
+
+!IF  "$(CFG)" == "ISLE - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "ISLE - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+################################################################################
+# Begin Source File
+
+SOURCE=.\LEGO1\mxdsfile.h
+
+!IF  "$(CFG)" == "ISLE - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "ISLE - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+################################################################################
+# Begin Source File
+
+SOURCE=.\LEGO1\mxomni.h
+
+!IF  "$(CFG)" == "ISLE - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "ISLE - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+################################################################################
+# Begin Source File
+
+SOURCE=.\LEGO1\mxomnicreateflags.h
+
+!IF  "$(CFG)" == "ISLE - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "ISLE - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+################################################################################
+# Begin Source File
+
+SOURCE=.\LEGO1\mxomnicreateparam.h
+
+!IF  "$(CFG)" == "ISLE - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "ISLE - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+################################################################################
+# Begin Source File
+
+SOURCE=.\LEGO1\mxomnicreateparambase.h
+
+!IF  "$(CFG)" == "ISLE - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "ISLE - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+################################################################################
+# Begin Source File
+
+SOURCE=.\LEGO1\mxpalette.h
+
+!IF  "$(CFG)" == "ISLE - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "ISLE - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+################################################################################
+# Begin Source File
+
+SOURCE=.\LEGO1\mxrect32.h
+
+!IF  "$(CFG)" == "ISLE - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "ISLE - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+################################################################################
+# Begin Source File
+
+SOURCE=.\LEGO1\mxresult.h
+
+!IF  "$(CFG)" == "ISLE - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "ISLE - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+################################################################################
+# Begin Source File
+
+SOURCE=.\LEGO1\mxstreamcontroller.h
+
+!IF  "$(CFG)" == "ISLE - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "ISLE - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+################################################################################
+# Begin Source File
+
+SOURCE=.\LEGO1\mxstreamer.h
+
+!IF  "$(CFG)" == "ISLE - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "ISLE - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+################################################################################
+# Begin Source File
+
+SOURCE=.\LEGO1\mxstring.h
+
+!IF  "$(CFG)" == "ISLE - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "ISLE - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+################################################################################
+# Begin Source File
+
+SOURCE=.\LEGO1\mxticklemanager.h
+
+!IF  "$(CFG)" == "ISLE - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "ISLE - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+################################################################################
+# Begin Source File
+
+SOURCE=.\LEGO1\mxtimer.h
+
+!IF  "$(CFG)" == "ISLE - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "ISLE - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+################################################################################
+# Begin Source File
+
+SOURCE=.\LEGO1\mxtransitionmanager.h
+
+!IF  "$(CFG)" == "ISLE - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "ISLE - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+################################################################################
+# Begin Source File
+
+SOURCE=.\LEGO1\mxvariabletable.h
+
+!IF  "$(CFG)" == "ISLE - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "ISLE - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+################################################################################
+# Begin Source File
+
+SOURCE=.\LEGO1\mxvideoparam.h
+
+!IF  "$(CFG)" == "ISLE - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "ISLE - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+################################################################################
+# Begin Source File
+
+SOURCE=.\LEGO1\mxvideoparamflags.h
+
+!IF  "$(CFG)" == "ISLE - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "ISLE - Win32 Debug"
+
+!ENDIF 
+
 # End Source File
 # End Target
 # End Project
diff --git a/isle.mdp b/isle.mdp
index f6af68b7..44ab9740 100644
Binary files a/isle.mdp and b/isle.mdp differ
diff --git a/lib/mxcore.h b/lib/mxcore.h
deleted file mode 100644
index a3ec87c7..00000000
--- a/lib/mxcore.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef MXCORE_H
-#define MXCORE_H
-
-class MxCore
-{
-public:
-  virtual ~MxCore();
-
-private:
-  unsigned int m_id;
-
-};
-
-#endif // MXCORE_H