1. Refactor of Threads
2. Added Logger