Some restructuring.
More structure.
Small fixes.