more cleanup
moved remaining files into helpful namespaces