Clean Up & Separating Request & Response Model

Clean Up & Separating Request & Response Model