gather config-related files in config/ subdir

diff --git a/geni-config-tty b/config/geni-config-tty
similarity index 100%
rename from geni-config-tty
rename to config/geni-config-tty

diff --git a/geni/util/geni_config b/config/geni_config
similarity index 100%
rename from geni/util/geni_config
rename to config/geni_config

diff --git a/setup.py b/setup.py
index b63cffe..bd2fcaa 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -9,9 +9,9 @@ import os, sys
 import shutil
 
 version = '0.2'
-scripts = ['geni/gimport.py', 'geni/plc.py', 'cmdline/sfi.py', 'geni-config-tty']
+scripts = ['geni/gimport.py', 'geni/plc.py', 'cmdline/sfi.py', 'config/geni-config-tty']
 package_dirs = ['geni', 'geni/util', 'geni/methods']
-data_files = [('/etc/geni/', ['geni/aggregates.xml', 'geni/registries.xml', 'geni/util/geni_config', 'cmdline/configSfi.sh']),
+data_files = [('/etc/geni/', ['geni/aggregates.xml', 'geni/registries.xml', 'config/geni_config', 'cmdline/configSfi.sh']),
               ('/etc/init.d/', ['geni/geniwrapper'])]
 symlinks = ['/usr/share/geniwrapper']
 initscripts = ['/etc/init.d/geniwrapper']