Refactor more to add Response class and remove some file