Add thread library (don’t know how I missed it)
Clean out dependencies of modules - they don’t work with classifiers, so they are just confusing