diff --git a/src/components/Auth/AuthProxy.ts b/src/components/Auth/AuthProxy.ts
diff --git a/src/components/Auth/AuthenticatorRouter.1.tsx b/src/components/Auth/AuthenticatorRouter.1.tsx
diff --git a/src/components/Auth/AuthenticatorRouter.tsx b/src/components/Auth/AuthenticatorRouter.tsx
@@ -1,6 +1,6 @@
 import { Route, RouteProps, RouteComponentProps, StaticContext, Redirect } from 'react-router'
 import React from 'react'
-import { AuthProxy } from './AuthProxy'
+import { AuthProxy } from './AuthProxies/AuthProxy'
 import Signin from './SignIn'
 import Forgot from './ForgotPassword'
 import RequireNewPassword from './RequireNewPassword'
@@ -9,6 +9,7 @@ import SignupConfirm from './SignupConfirm'
 import { GET_LOCAL_STATES } from '../../data/actions/Queries'
 import { GetLocalStatesQuery } from '../../data/graphql-types'
 import { Query } from 'react-apollo'
+import VerifyContact from './VerifyContact'
 
 interface IProtectedRouteProps {
   component:
@@ -78,7 +79,7 @@ class ProtectedRoute extends React.Component<IProtectedRouteProps & RouteProps,
             return (
               <Route {...rest} render={props => <RequireNewPassword {...props} authData={this.state.authData} toComp={this.toComp} />} />
             )
-
+          if (componentToShow === 'verifyContact') return <Route {...rest} render={props => <VerifyContact {...props} />} />
           return 'Not Authenticated!' // dummy output
         }}
       </Query>

diff --git a/src/components/Auth/ForgotPassword.tsx b/src/components/Auth/ForgotPassword.tsx
@@ -5,7 +5,7 @@ import { GetLocalStatesQuery } from '../../data/graphql-types'
 import { GET_LOCAL_STATES } from '../../data/actions/Queries'
 import * as yup from 'yup'
 import { TChangeComponent } from './AuthenticatorRouter'
-import { AuthProxy } from './AuthProxy'
+import { AuthProxy } from './AuthProxies/AuthProxy'
 
 // *1 define the form values interface
 interface IRequestFormValues {
@@ -112,7 +112,6 @@ class ForgotPassword extends React.Component<IForgotPasswordProps, IForgotPasswo
   public resetPassword = async (values: IResetFormValues, formikBag: FormikActions<IResetFormValues>) => {
     formikBag.setSubmitting(true)
     const res = await AuthProxy.resetPassword(values.email, values.code, values.password)
-
     if (res.data) {
       formikBag.resetForm()
       formikBag.setSubmitting(false)

diff --git a/src/components/Auth/RequireNewPassword.tsx b/src/components/Auth/RequireNewPassword.tsx
@@ -5,8 +5,9 @@ import { GetLocalStatesQuery } from '../../data/graphql-types'
 import { GET_LOCAL_STATES } from '../../data/actions/Queries'
 import * as yup from 'yup'
 import { TChangeComponent } from './AuthenticatorRouter'
-import { AuthProxy, verifyUser } from './AuthProxy'
+import { AuthProxy } from './AuthProxies/AuthProxy'
 import { JS } from 'aws-amplify'
+import { verifyUser } from './AuthProxies/verifyUser'
 
 // *1 define the form values interface
 interface IRequireNewPasswordValues {
@@ -55,7 +56,7 @@ class RequireNewPassword extends React.Component<IRequireNewPasswordProps, IRequ
     if (res.data) {
       formikBag.resetForm()
       formikBag.setSubmitting(false)
-      if (res.data.user.challengeName === 'SMS_MFA') {
+      if (res.data.challengeName === 'SMS_MFA') {
         this.props.toComp('confirmSignIn')
       } else {
         const verificationDetail = await verifyUser(res.data)

diff --git a/src/components/Auth/SignIn.tsx b/src/components/Auth/SignIn.tsx
@@ -5,9 +5,10 @@ import { GetLocalStatesQuery } from '../../data/graphql-types'
 import { GET_LOCAL_STATES } from '../../data/actions/Queries'
 import * as yup from 'yup'
 import { RouteComponentProps } from 'react-router'
-import { AuthProxy, verifyUser } from './AuthProxy'
+import { AuthProxy } from './AuthProxies/AuthProxy'
 import { TChangeComponent } from './AuthenticatorRouter'
 import { JS } from 'aws-amplify'
+import { verifyUser } from './AuthProxies/verifyUser'
 
 // *1 define the form values interface
 interface ISigninFormValues {
@@ -68,9 +69,9 @@ class Signin extends React.Component<ISignInProps & RouteComponentProps<{}>, ISi
     }
     const res = await AuthProxy.signIn(values.email, values.password)
     if (res.data) {
-      if (res.data.user.challengeName === 'SMS_MFA' || res.data.user.challengeName === 'SOFTWARE_TOKEN_MFA') {
+      if (res.data.challengeName === 'SMS_MFA' || res.data.challengeName === 'SOFTWARE_TOKEN_MFA') {
         this.props.toComp('confirmSignIn') // TODO: check if mfa works
-      } else if (res.data.user.challengeName === 'NEW_PASSWORD_REQUIRED') {
+      } else if (res.data.challengeName === 'NEW_PASSWORD_REQUIRED') {
         this.props.toComp('requireNewPassword', res.data)
       } else {
         const verificationDetail = await verifyUser(res.data)

diff --git a/src/components/Auth/SignUp.tsx b/src/components/Auth/SignUp.tsx
@@ -5,7 +5,7 @@ import { Query, QueryResult } from 'react-apollo'
 import { GET_LOCAL_STATES } from '../../data/actions/Queries'
 import { GetLocalStatesQuery } from '../../data/graphql-types'
 import { TChangeComponent } from './AuthenticatorRouter'
-import { AuthProxy } from './AuthProxy'
+import { AuthProxy } from './AuthProxies/AuthProxy'
 
 interface ISignupFormValues {
   email: string

diff --git a/src/components/Auth/SignupConfirm.tsx b/src/components/Auth/SignupConfirm.tsx
@@ -6,7 +6,7 @@ import { Query } from 'react-apollo'
 import { GET_LOCAL_STATES } from '../../data/actions/Queries'
 import { GetLocalStatesQuery } from '../../data/graphql-types'
 import { TChangeComponent } from './AuthenticatorRouter'
-import { AuthProxy } from './AuthProxy'
+import { AuthProxy } from './AuthProxies/AuthProxy'
 
 interface IAuthFormValues {
   email: string

diff --git a/src/components/DummyFiles/Protected.tsx b/src/components/DummyFiles/Protected.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react'
-import { AuthProxy } from '../Auth/AuthProxy'
+import { AuthProxy } from '../Auth/AuthProxies/AuthProxy'
 import { RouteComponentProps } from 'react-router'
 
 class Protected extends React.Component<RouteComponentProps<{}>> {

diff --git a/src/index.tsx b/src/index.tsx
@@ -10,9 +10,9 @@ import Amplify, { Auth } from 'aws-amplify'
 import awsconfig from './aws-exports'
 // *aws appsync imports - download from AppSync
 import { Rehydrated } from 'aws-appsync-react'
-import AWSAppSyncClient, { createAppSyncLink, createLinkWithCache } from 'aws-appsync'
+import AWSAppSyncClient, { createAppSyncLink, createLinkWithCache } from 'aws-appsync/lib'
 import { withClientState } from 'apollo-link-state'
-import appSyncConfig from './AppSync.js'
+import appSyncConfig from './AppSync'
 
 // *configure using mobilehub export
 Amplify.configure(awsconfig)