diff --git a/lib/qasim/config.rb b/lib/qasim/config.rb
index 766be48..a02baed 100644
--- a/lib/qasim/config.rb
+++ b/lib/qasim/config.rb
@@ -5,7 +5,7 @@ require 'pp'
 require 'find'
 
 require 'qasim/map'
-require 'qasim/map_ssh'
+require 'qasim/map/ssh'
 
 module Qasim
 	class Config
diff --git a/lib/qasim/map.rb b/lib/qasim/map.rb
index 6c85d9b..c91f00a 100644
--- a/lib/qasim/map.rb
+++ b/lib/qasim/map.rb
@@ -2,7 +2,7 @@
 require 'fileutils'
 
 #require 'rdebug/base'
-require 'qasim'
+#require 'qasim/map/generic'
 
 module Qasim ; module Map
 
diff --git a/lib/qasim/map_ssh.rb b/lib/qasim/map/ssh.rb
similarity index 100%
rename from lib/qasim/map_ssh.rb
rename to lib/qasim/map/ssh.rb