Remove any dependency cycles from the dependency structure matrix

[markpollack]

trafficstars

also look into adding a model package. Then move messages package should move to beneath model package.