[IMP-dev] minor change to move things to internal headers

This just moves code in internal namespaces to internal headers (or into the IMP namespace as appropriate). The point is to make doxygen docs cleaner.