Major refactoring effort, in addition, README updates and the introduction of new custom 'entity' types