reorganization inclusion of setup files
reorg part two