move config files to subfolder and give them better names