More crazy namespace refactoring.

Moving to one class per file pardgim.