Renamed the top level namespace. Refactored the thor task contents into a client class