Reorganize namespaces
Removed source file headers