Moved using statements back out of the namespace to be consistent with all the other files