Some unfinished structuring.
+ Rewritten files.