Rework threading and runnable class structures