Moving thread into their own package