Another bunch of namespace and project structure refactoring.
do not use #if MONO because it was already used by the original author.

And I'm not sure what the intent is, I shouldn't guess.