re-arrange hieradata/common slightly