reorg files and start on config api