diff --git a/Finders/ApplicationFinder/STApplicationFinder.h b/Finders/ApplicationFinder/STApplicationFinder.h
index 2c0b881..27cb1a3 100644
--- a/Finders/ApplicationFinder/STApplicationFinder.h
+++ b/Finders/ApplicationFinder/STApplicationFinder.h
@@ -24,7 +24,7 @@
  
  */
 
-#import <StepTalk/STModule.h>
+#import <Foundation/NSObject.h>
 
 @interface STApplicationFinder:NSObject
 {
diff --git a/Modules/AppKit/GNUmakefile b/Modules/AppKit/GNUmakefile
index 7ec3394..db5b0be 100644
--- a/Modules/AppKit/GNUmakefile
+++ b/Modules/AppKit/GNUmakefile
@@ -43,7 +43,6 @@ AppKit_BUNDLE_LIBS += -lStepTalk $(GUI_LIBS)
 ADDITIONAL_INCLUDE_DIRS += -I../../Source/Headers
 ADDITIONAL_LIB_DIRS += -L../../Source/$(GNUSTEP_OBJ_DIR)
 
-BUNDLE_EXTENSION := .stmodule
 BUNDLE_INSTALL_DIR:=$(GNUSTEP_INSTALLATION_DIR)/Library/StepTalk/Modules
 
 -include GNUmakefile.preamble
diff --git a/Modules/Foundation/GNUmakefile b/Modules/Foundation/GNUmakefile
index 3867351..b4a8ac1 100644
--- a/Modules/Foundation/GNUmakefile
+++ b/Modules/Foundation/GNUmakefile
@@ -40,7 +40,6 @@ Foundation_BUNDLE_LIBS += -lStepTalk
 ADDITIONAL_INCLUDE_DIRS += -I../../Source/Headers
 ADDITIONAL_LIB_DIRS += -L../../Source/$(GNUSTEP_OBJ_DIR)
 
-BUNDLE_EXTENSION := .stmodule
 BUNDLE_INSTALL_DIR:=$(GNUSTEP_INSTALLATION_DIR)/Library/StepTalk/Modules
 
 -include GNUmakefile.preamble
diff --git a/Modules/GDL2/GNUmakefile b/Modules/GDL2/GNUmakefile
index 640b2de..f26907f 100644
--- a/Modules/GDL2/GNUmakefile
+++ b/Modules/GDL2/GNUmakefile
@@ -45,7 +45,6 @@ GDL2_BUNDLE_LIBS += -lStepTalk \
 ADDITIONAL_INCLUDE_DIRS += -I../../Source/Headers
 ADDITIONAL_LIB_DIRS += -L../../Source/$(GNUSTEP_OBJ_DIR)
 
-BUNDLE_EXTENSION := .stmodule
 BUNDLE_INSTALL_DIR:=$(GNUSTEP_INSTALLATION_DIR)/Library/StepTalk/Modules
 
 # Include gdl2.make IF there
diff --git a/Modules/ObjectiveC/GNUmakefile b/Modules/ObjectiveC/GNUmakefile
index 4431177..8eeb437 100644
--- a/Modules/ObjectiveC/GNUmakefile
+++ b/Modules/ObjectiveC/GNUmakefile
@@ -42,8 +42,6 @@ ObjectiveC_BUNDLE_LIBS += -lStepTalk
 ADDITIONAL_INCLUDE_DIRS += -I../../Source/Headers
 ADDITIONAL_LIB_DIRS += -L../../Source/$(GNUSTEP_OBJ_DIR)
 
-
-BUNDLE_EXTENSION := .stmodule
 BUNDLE_INSTALL_DIR:=$(GNUSTEP_INSTALLATION_DIR)/Library/StepTalk/Modules
 
 -include GNUmakefile.preamble
diff --git a/Modules/SimpleTranscript/GNUmakefile b/Modules/SimpleTranscript/GNUmakefile
index 61b41cd..d2cbc3d 100644
--- a/Modules/SimpleTranscript/GNUmakefile
+++ b/Modules/SimpleTranscript/GNUmakefile
@@ -39,7 +39,6 @@ ADDITIONAL_INCLUDE_DIRS += -I../../Source/Headers
 ADDITIONAL_LIB_DIRS += -L../../Source/$(GNUSTEP_OBJ_DIR)
 
 
-BUNDLE_EXTENSION := .stmodule
 BUNDLE_INSTALL_DIR:=$(GNUSTEP_INSTALLATION_DIR)/Library/StepTalk/Modules
 
 -include GNUmakefile.preamble
diff --git a/Modules/StepTalk/GNUmakefile b/Modules/StepTalk/GNUmakefile
index d165bb7..bd713c6 100644
--- a/Modules/StepTalk/GNUmakefile
+++ b/Modules/StepTalk/GNUmakefile
@@ -38,7 +38,6 @@ ADDITIONAL_INCLUDE_DIRS += -I../../Source/Headers
 ADDITIONAL_LIB_DIRS += -L../../Source/$(GNUSTEP_OBJ_DIR)
 
 
-BUNDLE_EXTENSION := .stmodule
 BUNDLE_INSTALL_DIR:=$(GNUSTEP_INSTALLATION_DIR)/Library/StepTalk/Modules
 
 -include GNUmakefile.preamble
diff --git a/NEWS b/NEWS
index 7e5b0f0..dd5c92d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,15 @@
+0.6.3
+    * Added ability to use any bundle or framework for scripting 
+    * Moved scripting information from bundle info dictionary into separate
+    file.
+    * Replaced .stmodules with plain bundles.
+    * Removed STModule class
+    * Added conditional GDL2 module installation.
+    * Small improvements and bug-fixes.
+
+    IMPORTANT NOTE: You have to rebuild and reinstall all modules, because the
+    format has changed.
+
 0.6.2
 
     * Smalltalk: Added parsing of real numbers
diff --git a/Source/STExterns.m b/Source/STExterns.m
index bef636e..d8ea6db 100644
--- a/Source/STExterns.m
+++ b/Source/STExterns.m
@@ -44,7 +44,7 @@ NSString *STLibraryDirectory = @"StepTalk";
 NSString *STScriptsDirectory = @"Scripts";
 
 NSString *STModulesDirectory = @"Modules";
-NSString *STModuleExtension  = @"stmodule";
+NSString *STModuleExtension  = @"bundle";
 
 NSString *STScriptingEnvironmentsDirectory = @"Environments";
 NSString *STScriptingEnvironmentExtension  = @"stenv";