move session manager and proxy includes