done daily job and refectored the solutaion structure