Threading work

Removed client-side threads
Moved all server-side threads to the Controller