Now includes stub for IT Infrastructure model

Basic re-factoring / cleaning up of mess to allow for additional models
& views to be added