refactored

diff --git a/forester/ruby/evoruby/exe/d2f.rb b/forester/ruby/evoruby/exe/d2f.rb
index 132ed3a..ea43e15 100755 (executable)
--- a/forester/ruby/evoruby/exe/d2f.rb
+++ b/forester/ruby/evoruby/exe/d2f.rb
@@ -9,7 +9,7 @@
 #
 # last modified: 06/11/2007
 
-require 'lib/evo/tools/domains_to_forester'
+require 'lib/evo/tool/domains_to_forester'
 
 module Evoruby
 

diff --git a/forester/ruby/evoruby/exe/dsx.rb b/forester/ruby/evoruby/exe/dsx.rb
index cbee678..02091bf 100755 (executable)
--- a/forester/ruby/evoruby/exe/dsx.rb
+++ b/forester/ruby/evoruby/exe/dsx.rb
@@ -9,7 +9,7 @@
 #
 # last modified: 06/11/2007
 
-require 'lib/evo/tools/domain_sequence_extractor'
+require 'lib/evo/tool/domain_sequence_extractor'
 
 module Evoruby
 

diff --git a/forester/ruby/evoruby/exe/evo_nursery.rb b/forester/ruby/evoruby/exe/evo_nursery.rb
index 61fa33d..dd720bd 100755 (executable)
--- a/forester/ruby/evoruby/exe/evo_nursery.rb
+++ b/forester/ruby/evoruby/exe/evo_nursery.rb
@@ -9,7 +9,7 @@
 #
 # last modified: 2009/10/07
 
-require 'lib/evo/tools/evo_nursery'
+require 'lib/evo/tool/evo_nursery'
 
 module Evoruby
 

diff --git a/forester/ruby/evoruby/exe/fasta_tap.rb b/forester/ruby/evoruby/exe/fasta_tap.rb
index 7eff7a2..66448b1 100755 (executable)
--- a/forester/ruby/evoruby/exe/fasta_tap.rb
+++ b/forester/ruby/evoruby/exe/fasta_tap.rb
@@ -8,7 +8,7 @@
 # $Id: fasta_tap.rb,v 1.1 2009/01/20 20:44:54 cmzmasek Exp $
 
 
-require 'lib/evo/tools/fasta_taxonomy_processor'
+require 'lib/evo/tool/fasta_taxonomy_processor'
 
 module Evoruby
 

diff --git a/forester/ruby/evoruby/exe/hsp.rb b/forester/ruby/evoruby/exe/hsp.rb
index 92ed8e0..493cc2d 100755 (executable)
--- a/forester/ruby/evoruby/exe/hsp.rb
+++ b/forester/ruby/evoruby/exe/hsp.rb
@@ -9,7 +9,7 @@
 #
 # last modified: 11/24/2009
 
-require 'lib/evo/tools/hmmscan_parser'
+require 'lib/evo/tool/hmmscan_parser'
 
 module Evoruby
 

diff --git a/forester/ruby/evoruby/exe/msa_pro.rb b/forester/ruby/evoruby/exe/msa_pro.rb
index 240d7b0..ce8192a 100755 (executable)
--- a/forester/ruby/evoruby/exe/msa_pro.rb
+++ b/forester/ruby/evoruby/exe/msa_pro.rb
@@ -9,7 +9,7 @@
 #
 
 
-require 'lib/evo/tools/msa_processor'
+require 'lib/evo/tool/msa_processor'
 
 module Evoruby
 

diff --git a/forester/ruby/evoruby/exe/mse.rb b/forester/ruby/evoruby/exe/mse.rb
index d818136..6dd0c7b 100755 (executable)
--- a/forester/ruby/evoruby/exe/mse.rb
+++ b/forester/ruby/evoruby/exe/mse.rb
@@ -8,7 +8,7 @@
 # $Id: mse.rb,v 1.2 2008/08/28 17:09:06 cmzmasek Exp $
 
 
-require 'lib/evo/tools/multi_sequence_extractor'
+require 'lib/evo/tool/multi_sequence_extractor'
 
 module Evoruby
     

diff --git a/forester/ruby/evoruby/exe/tap.rb b/forester/ruby/evoruby/exe/tap.rb
index 57eb8fe..33c66e0 100755 (executable)
--- a/forester/ruby/evoruby/exe/tap.rb
+++ b/forester/ruby/evoruby/exe/tap.rb
@@ -9,7 +9,7 @@
 #
 # last modified: 05/18/2007
 
-require 'lib/evo/tools/taxonomy_processor'
+require 'lib/evo/tool/taxonomy_processor'
 
 module Evoruby
 

diff --git a/forester/ruby/evoruby/exe/test.rb b/forester/ruby/evoruby/exe/test.rb
index 4a7fa5e..cc9c466 100755 (executable)
--- a/forester/ruby/evoruby/exe/test.rb
+++ b/forester/ruby/evoruby/exe/test.rb
@@ -25,9 +25,9 @@ require 'lib/evo/io/writer/fasta_writer'
 require 'lib/evo/io/parser/fasta_parser'
 require 'lib/evo/io/parser/ncbi_tseq_parser'
 require 'lib/evo/io/parser/hmmsearch_domain_extractor'
-require 'lib/evo/tools/domain_sequence_extractor'
-require 'lib/evo/tools/hmmscan_parser'
-require 'lib/evo/tools/domains_to_forester'
+require 'lib/evo/tool/domain_sequence_extractor'
+require 'lib/evo/tool/hmmscan_parser'
+require 'lib/evo/tool/domains_to_forester'
 require 'lib/evo/io/parser/general_msa_parser'
 require 'lib/evo/io/parser/basic_table_parser'
 require 'lib/evo/util/command_line_arguments'

diff --git a/forester/ruby/evoruby/exe/tseq_tap.rb b/forester/ruby/evoruby/exe/tseq_tap.rb
index 4e467e0..dde6901 100755 (executable)
--- a/forester/ruby/evoruby/exe/tseq_tap.rb
+++ b/forester/ruby/evoruby/exe/tseq_tap.rb
@@ -8,7 +8,7 @@
 # $Id: tseq_tap.rb,v 1.1 2008/12/31 06:00:08 cmzmasek Exp $
 
 
-require 'lib/evo/tools/tseq_taxonomy_processor'
+require 'lib/evo/tool/tseq_taxonomy_processor'
 
 module Evoruby