--- nsm.orig	2008-03-31 13:23:21.000000000 +0900
+++ nsm	2008-05-26 13:57:04.000000000 +0900
@@ -24,8 +24,8 @@
 include Readline
 
 ## Require commands
-require 'lib/command_manager'
-require 'lib/commands'
+require 'nsm-console/command_manager'
+require 'nsm-console/commands'
 
 ## Required for tab completion
 $tabstrings = CommandManager.get_commands_as_array()
@@ -70,32 +70,32 @@
 
 ## Require nsm console specific files
 # Logging
-require 'lib/logging'
+require 'nsm-console/logging'
 # The history module
-require 'lib/history'
+require 'nsm-console/history'
 # Module loading, options and running
-require 'lib/nsm_module'
+require 'nsm-console/nsm_module'
 # Module category function
-require 'lib/nsm_category'
+require 'nsm-console/nsm_category'
 # Helper methods (mostly for commands)
-require 'lib/nsm_helper'
+require 'nsm-console/nsm_helper'
 # Alias functions
-require 'lib/nsm_alias'
+require 'nsm-console/nsm_alias'
 # Main shell functions
-require 'lib/nsm_console'
+require 'nsm-console/nsm_console'
 # Library for encoding and decoding
-require 'lib/encodelib'
+require 'nsm-console/encodelib'
 # Library for print and dump
-require 'lib/pcaplib'
+require 'nsm-console/pcaplib'
 # Scholar's pcap library so libpcap isn't supported
-require 'lib/pcapparser'
+require 'nsm-console/pcapparser'
 # Terminal color definitions
-require 'lib/colors'
+require 'nsm-console/colors'
 
 
 ## Defaults for variables
 ## Default module directory
-$moduledir = "modules"
+$moduledir = "%%DATADIR%%/modules"
 ## Default output directory
 $outputdir = "${PCAP_BASE}-output"