Restructure of configuration