Fully moved thread code to module, got rid of core class