diff --git a/Cog.xcodeproj/project.pbxproj b/Cog.xcodeproj/project.pbxproj
index 67de276a3..fc79e7387 100644
--- a/Cog.xcodeproj/project.pbxproj
+++ b/Cog.xcodeproj/project.pbxproj
@@ -103,9 +103,10 @@
 		17F3BB890CBC565900864489 /* CueSheet.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17F3BB880CBC565100864489 /* CueSheet.bundle */; };
 		17F561400C3BD4F30019975C /* CogAudio.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17F561330C3BD4DC0019975C /* CogAudio.framework */; };
 		17F562390C3BD91B0019975C /* General.preferencePane in Resources */ = {isa = PBXBuildFile; fileRef = 17F5622E0C3BD8FB0019975C /* General.preferencePane */; };
-		567E73780D5F456D006C6486 /* SpotlightSearchController.m in Sources */ = {isa = PBXBuildFile; fileRef = 567E73770D5F456D006C6486 /* SpotlightSearchController.m */; };
-		567E75070D5F71E7006C6486 /* SpotlightTransformers.m in Sources */ = {isa = PBXBuildFile; fileRef = 567E75060D5F71E7006C6486 /* SpotlightTransformers.m */; };
-		569C52E60D5F34F500BDBDC9 /* SpotlightPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = 569C52E50D5F34F500BDBDC9 /* SpotlightPanel.xib */; };
+		5604D4500D60332A004F5C5D /* SpotlightWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5604D44E0D60332A004F5C5D /* SpotlightWindowController.m */; };
+		5604D4550D603430004F5C5D /* SpotlightSearchController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5604D4510D603430004F5C5D /* SpotlightSearchController.m */; };
+		5604D4560D603430004F5C5D /* SpotlightTransformers.m in Sources */ = {isa = PBXBuildFile; fileRef = 5604D4530D603430004F5C5D /* SpotlightTransformers.m */; };
+		5604D4580D603459004F5C5D /* SpotlightPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5604D4570D603459004F5C5D /* SpotlightPanel.xib */; };
 		8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; };
 		8D11072D0486CEB800E47090 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; settings = {ATTRIBUTES = (); }; };
 		8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
@@ -588,12 +589,14 @@
 		29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
 		29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
 		32CA4F630368D1EE00C91783 /* Cog_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Cog_Prefix.pch; sourceTree = "<group>"; };
+		5604D44E0D60332A004F5C5D /* SpotlightWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SpotlightWindowController.m; sourceTree = "<group>"; };
+		5604D44F0D60332A004F5C5D /* SpotlightWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SpotlightWindowController.h; sourceTree = "<group>"; };
+		5604D4510D603430004F5C5D /* SpotlightSearchController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SpotlightSearchController.m; path = Spotlight/SpotlightSearchController.m; sourceTree = "<group>"; };
+		5604D4520D603430004F5C5D /* SpotlightSearchController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SpotlightSearchController.h; path = Spotlight/SpotlightSearchController.h; sourceTree = "<group>"; };
+		5604D4530D603430004F5C5D /* SpotlightTransformers.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SpotlightTransformers.m; path = Spotlight/SpotlightTransformers.m; sourceTree = "<group>"; };
+		5604D4540D603430004F5C5D /* SpotlightTransformers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SpotlightTransformers.h; path = Spotlight/SpotlightTransformers.h; sourceTree = "<group>"; };
+		5604D4570D603459004F5C5D /* SpotlightPanel.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = SpotlightPanel.xib; path = Spotlight/SpotlightPanel.xib; sourceTree = "<group>"; };
 		566D32160D538550004466A5 /* APL.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = APL.xcodeproj; path = Plugins/APL/APL.xcodeproj; sourceTree = "<group>"; };
-		567E73760D5F456D006C6486 /* SpotlightSearchController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SpotlightSearchController.h; sourceTree = "<group>"; };
-		567E73770D5F456D006C6486 /* SpotlightSearchController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SpotlightSearchController.m; sourceTree = "<group>"; };
-		567E75050D5F71E7006C6486 /* SpotlightTransformers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SpotlightTransformers.h; sourceTree = "<group>"; };
-		567E75060D5F71E7006C6486 /* SpotlightTransformers.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SpotlightTransformers.m; sourceTree = "<group>"; };
-		569C52E50D5F34F500BDBDC9 /* SpotlightPanel.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SpotlightPanel.xib; sourceTree = "<group>"; };
 		8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
 		8E07AAEE0AAC910500A4B32F /* SS_PreferencePaneProtocol.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SS_PreferencePaneProtocol.h; path = Preferences/SS_PreferencePaneProtocol.h; sourceTree = "<group>"; };
 		8E07AAEF0AAC910500A4B32F /* SS_PrefsController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SS_PrefsController.h; path = Preferences/SS_PrefsController.h; sourceTree = "<group>"; };
@@ -1056,8 +1059,8 @@
 				1791005D0CB44D6D0070BC5C /* Cog.scriptTerminology */,
 				17342A980D5FD20B00E8D854 /* MainMenu.xib */,
 				17342ABD0D5FD36400E8D854 /* OpenURLPanel.xib */,
+				5604D4570D603459004F5C5D /* SpotlightPanel.xib */,
 				17E41E060C130DFF00AC744D /* Credits.html */,
-				569C52E50D5F34F500BDBDC9 /* SpotlightPanel.xib */,
 			);
 			name = Resources;
 			sourceTree = "<group>";
@@ -1082,10 +1085,12 @@
 		569C52C50D5F2BD500BDBDC9 /* Spotlight */ = {
 			isa = PBXGroup;
 			children = (
-				567E73760D5F456D006C6486 /* SpotlightSearchController.h */,
-				567E73770D5F456D006C6486 /* SpotlightSearchController.m */,
-				567E75050D5F71E7006C6486 /* SpotlightTransformers.h */,
-				567E75060D5F71E7006C6486 /* SpotlightTransformers.m */,
+				5604D4510D603430004F5C5D /* SpotlightSearchController.m */,
+				5604D4520D603430004F5C5D /* SpotlightSearchController.h */,
+				5604D4530D603430004F5C5D /* SpotlightTransformers.m */,
+				5604D4540D603430004F5C5D /* SpotlightTransformers.h */,
+				5604D44E0D60332A004F5C5D /* SpotlightWindowController.m */,
+				5604D44F0D60332A004F5C5D /* SpotlightWindowController.h */,
 			);
 			name = Spotlight;
 			sourceTree = "<group>";
@@ -1559,9 +1564,9 @@
 				17D1B2810CF8B2830028F5B5 /* song.icns in Resources */,
 				17D1B2820CF8B2830028F5B5 /* vg.icns in Resources */,
 				17D1B2830CF8B2830028F5B5 /* xm.icns in Resources */,
-				569C52E60D5F34F500BDBDC9 /* SpotlightPanel.xib in Resources */,
 				17342A9A0D5FD20B00E8D854 /* MainMenu.xib in Resources */,
 				17342ABF0D5FD36400E8D854 /* OpenURLPanel.xib in Resources */,
+				5604D4580D603459004F5C5D /* SpotlightPanel.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1619,9 +1624,10 @@
 				178BAB9A0CD4E1B700B33D47 /* GCWindowMenu.m in Sources */,
 				178BAB9B0CD4E1B700B33D47 /* PopupButton.m in Sources */,
 				17BBE5BC0CD95CFA00258F7A /* InvertedToolbarWindow.m in Sources */,
-				567E73780D5F456D006C6486 /* SpotlightSearchController.m in Sources */,
-				567E75070D5F71E7006C6486 /* SpotlightTransformers.m in Sources */,
 				173428F50D5FB1C400E8D854 /* EntriesController.m in Sources */,
+				5604D4500D60332A004F5C5D /* SpotlightWindowController.m in Sources */,
+				5604D4550D603430004F5C5D /* SpotlightSearchController.m in Sources */,
+				5604D4560D603430004F5C5D /* SpotlightTransformers.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/SpotlightPanel.xib b/Spotlight/SpotlightPanel.xib
similarity index 100%
rename from SpotlightPanel.xib
rename to Spotlight/SpotlightPanel.xib
diff --git a/SpotlightSearchController.h b/Spotlight/SpotlightSearchController.h
similarity index 100%
rename from SpotlightSearchController.h
rename to Spotlight/SpotlightSearchController.h
diff --git a/SpotlightSearchController.m b/Spotlight/SpotlightSearchController.m
similarity index 100%
rename from SpotlightSearchController.m
rename to Spotlight/SpotlightSearchController.m
diff --git a/SpotlightTransformers.h b/Spotlight/SpotlightTransformers.h
similarity index 100%
rename from SpotlightTransformers.h
rename to Spotlight/SpotlightTransformers.h
diff --git a/SpotlightTransformers.m b/Spotlight/SpotlightTransformers.m
similarity index 100%
rename from SpotlightTransformers.m
rename to Spotlight/SpotlightTransformers.m
diff --git a/SpotlightWindowController.h b/SpotlightWindowController.h
new file mode 100644
index 000000000..ab8cada61
--- /dev/null
+++ b/SpotlightWindowController.h
@@ -0,0 +1,19 @@
+//
+//  SpotlightWindowController.h
+//  Cog
+//
+//  Created by Matthew Grinshpun on 10/02/08.
+//  Copyright 2008 __MyCompanyName__. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+
+@class PlaylistLoader;
+
+@interface SpotlightWindowController : NSWindowController {
+    IBOutlet PlaylistLoader *playlistLoader;
+}
+
+@property(retain) PlaylistLoader *playlistLoader;
+
+@end
diff --git a/SpotlightWindowController.m b/SpotlightWindowController.m
new file mode 100644
index 000000000..d5d2013a3
--- /dev/null
+++ b/SpotlightWindowController.m
@@ -0,0 +1,16 @@
+//
+//  SpotlightWindowController.m
+//  Cog
+//
+//  Created by Matthew Grinshpun on 10/02/08.
+//  Copyright 2008 __MyCompanyName__. All rights reserved.
+//
+
+#import "SpotlightWindowController.h"
+
+
+@implementation SpotlightWindowController
+
+@synthesize playlistLoader;
+
+@end