Renamed packages.

Refactored location of delete thread code. Still work to do.