dnd is now known as nvswitch, refactor src layout