48 - Refactoring build responses
48 - Refactoring the controllers