More package changes.

Adopt MVC approach to package organisation.