Small reoraganization, cleaning 'use namespace' usages
11 files changed