Refactoring of responses and
Fixed file hierarchy error.