Checkpoint on the way to re-organized files.
Looks like compiling is good, check again tomorrow.