#6| * Split core files out into separate 'class' files - This is an ongoing exercise as the frameworks develops.