Reorganize config
New layout file