Restructuring, cleanup, start DDS