rex.rb in librex-0.0.32

- old
+ new
@@ -38,63 +38,56 @@
 end
 
 # Generic classes
 require 'rex/constants'
 require 'rex/exceptions'
+require 'rex/transformer'
+require 'rex/text'
+require 'rex/time'
+require 'rex/job_container'
+require 'rex/file'
 
-module Rex
-	# Generic modules
-	autoload :File,         'rex/file'
-	autoload :Text,         'rex/text'
-	autoload :Job,          'rex/job_container'
-	autoload :JobContainer, 'rex/job_container'
-	autoload :Transformer,  'rex/transformer'
-	autoload :ExtTime,      'rex/time'
+# Thread safety and synchronization
+require 'rex/sync'
 
-	# Thread safety and synchronization
-	autoload :ReadWriteLock, 'rex/sync/read_write_lock'
-	autoload :ThreadSafe,    'rex/sync/thread_safe'
-	autoload :Ref,           'rex/sync/ref'
-	autoload :Sync,          'rex/sync/event'
+# Thread factory
+require 'rex/thread_factory'
 
-	# Thread factory
-	autoload :ThreadFactory, 'rex/thread_factory'
+# Encoding
+require 'rex/encoder/xor'
+require 'rex/encoding/xor'
 
-	# Encoding
-	autoload :Encoder,  'rex/encoder'
-	autoload :Encoders, 'rex/encoders'
-	autoload :Encoding, 'rex/encoding'
+# Architecture subsystem
+require 'rex/arch'
 
-	# Architecture subsystem
-	autoload :Arch, 'rex/arch'
+# Assembly
+require 'rex/assembly/nasm'
 
-	# Assembly
-	autoload :Assembly, 'rex/assembly/nasm'
+# Logging
+require 'rex/logging/log_dispatcher'
 
-	# Logging
-	autoload :Logging, 'rex/logging'
+# IO
+require 'rex/io/stream'
+require 'rex/io/stream_abstraction'
+require 'rex/io/stream_server'
 
-	# IO
-	autoload :IO, 'rex/io'
+# Sockets
+require 'rex/socket'
 
-	# Sockets
-	autoload :Socket, 'rex/socket'
+# Protocols
 
-	# Platforms
-	autoload :Platforms, 'rex/platforms'
+require 'rex/proto'
 
-	# Protocols
-	autoload :Proto, 'rex/proto'
+# Parsers
+require 'rex/parser/arguments'
+require 'rex/parser/ini'
 
-	# Service handling
-	autoload :Service, 'rex/service'
 
-	# Parsers
-	autoload :Parser, 'rex/parser'
+# Compatibility
+require 'rex/compat'
 
-	# Compatibility
-	autoload :Compat, 'rex/compat'
-end
+# Platforms
+require 'rex/platforms'
 
 
 # Overload the Kernel.sleep() function to be thread-safe
 Kernel.class_eval("
 	def sleep(seconds)