Reorganize files into subdirectories.
Adjust includes.