Moved down one namespace. No need for Perf
Completed removal of Perf namespace
cleaned up type signatures