Re-organization of the semantics files.
More work on the resolver.