Fix: reformat config files into modules