Move threading

Moved threading back to development