Re-jigging of the code structure underway...