Restructure configuration and completed config checks.