Rename subdaemons, move them into top level.

We leave the *build* results in lightningd/ for ease of in-place testing though.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

tests/test_lightningd.py

@@ -238,8 +238,8 @@ class LightningDTests(BaseLightningDTests):
         assert 'state: UNINITIALIZED -> GOSSIPD' in p1['log']
 
         # Both should still be owned by gossip
-        assert p1['owner'] == 'lightningd_gossip'
-        assert p2['owner'] == 'lightningd_gossip'
+        assert p1['owner'] == 'lightning_gossipd'
+        assert p2['owner'] == 'lightning_gossipd'
 
     def test_balance(self):
         l1,l2 = self.connect()