move more config files to conf-subdir