Restructure config file