Cleanup imports
Initial commit
Introduce MasterActor