Reorganizing - laying groundwork for config via UI