Refactored and reordered resources, improved responses