Changed class structure to use RunupData more effectively and provide a

more logical hierarchy between managers.