config modularization in progress
modularization of setup files
fix