Changes to configuration; code restructuring