restructure collection framework
Merge branch 'master' of https://github.com/saggezza/lubeinsightsplatform