6 deep is some rookie numbers, get those indent levels up.

I actually have no problem with most the code in one file vs. lots of little files. That said right click "Go to definition" is a lovely feature in VS.