Created by: Strum355
some minor drive-by flattening of the files
N/A, very basic flattening, would be caught by compiler/existing tests
Push commits to the source branch or add previously merged commits to review them.
