Moved some shared pointer typedefs inside their corresponding classes