Refactored responses and renamed files