Restructuring for (in progress) config export feature