Some renaming. Start moving abcs into modules.
More renaming and adding abcs to the modules themselves.

Dumped untested cached lookup.