Restructure sources associated with Edit mode; work on WTD-788 has increased number of sources here so more organization is useful.