Rearrange files a bit
Add threading test