Config reorg
Initial layouts