Organize the Object Model

Comments