Start putting things in subdirs.
More.