More restructuring of code.
Merge branch 'master' of https://github.com/inpaner/information-asset-registry.git