Move response class to own file