Cleanup of 'Controls' namespace started.

I'll do more when I feel like it, it's soooooooooo boring.