Restructure config file parser section