Move JSON generation into serializers

Clean up routes