Reverted back to original structure.

Revisit model view controller and see if this fits the definition..