Reorg our old layout to Layman compatible