Build config file
Reorg