removing unnecessary mocks, renaming and restructuring classes, adding in threading
adding echo response