moving packages around so that it makes more sense and migrating Oauth manager and pool factory