Remove some files calling other files.

Too much compartmentalization makes this a bit harder to maintain, modify for developers willing to help.
If code is "flattened" a bit further, it's a bit easier to see and improve what you can.