separate master modules

artiq/master/scheduler.py

@@ -2,7 +2,7 @@ import asyncio
 from time import time
 
 from artiq.management.sync_struct import Notifier
-from artiq.management.worker import Worker
+from artiq.master.worker import Worker
 
 
 class Scheduler:

artiq/master/worker.py

@@ -26,7 +26,7 @@ class Worker:
     @asyncio.coroutine
     def create_process(self):
         self.process = yield from asyncio.create_subprocess_exec(
-            sys.executable, "-m", "artiq.management.worker_impl",
+            sys.executable, "-m", "artiq.master.worker_impl",
             stdout=subprocess.PIPE, stdin=subprocess.PIPE)
 
     @asyncio.coroutine

frontend/artiq_master.py

@@ -7,8 +7,8 @@ import atexit
 from artiq.management.pc_rpc import Server
 from artiq.management.sync_struct import Publisher
 from artiq.management.db import FlatFileDB, SimpleHistory
-from artiq.management.scheduler import Scheduler
-from artiq.management.rt_results import RTResults
+from artiq.master.scheduler import Scheduler
+from artiq.master.rt_results import RTResults
 
 
 def _get_args():