Refactor th project