diff --git a/packages/react-native-expo/plugins/webpack-nx-expo-config.ts b/packages/react-native-expo/plugins/webpack-nx-expo-config.ts
index 4b796a5..79fe85d 100644
--- a/packages/react-native-expo/plugins/webpack-nx-expo-config.ts
+++ b/packages/react-native-expo/plugins/webpack-nx-expo-config.ts
@@ -1,4 +1,4 @@
-const TsconfigPathsPlugin = require('tsconfig-paths-webpack-plugin');
+import { TsconfigPathsPlugin } from 'tsconfig-paths-webpack-plugin';
 
 const babelLoaderRules = {
   test: /\.tsx?$/,
diff --git a/packages/react-native-expo/src/schematics/application/files/app/App.spec.tsx.template b/packages/react-native-expo/src/schematics/application/files/expo/App.spec.tsx.template
similarity index 100%
rename from packages/react-native-expo/src/schematics/application/files/app/App.spec.tsx.template
rename to packages/react-native-expo/src/schematics/application/files/expo/App.spec.tsx.template
diff --git a/packages/react-native-expo/src/schematics/application/files/app/App.tsx.template b/packages/react-native-expo/src/schematics/application/files/expo/App.tsx.template
similarity index 100%
rename from packages/react-native-expo/src/schematics/application/files/app/App.tsx.template
rename to packages/react-native-expo/src/schematics/application/files/expo/App.tsx.template
diff --git a/packages/react-native-expo/src/schematics/application/files/app/app.json.template b/packages/react-native-expo/src/schematics/application/files/expo/app.json.template
similarity index 100%
rename from packages/react-native-expo/src/schematics/application/files/app/app.json.template
rename to packages/react-native-expo/src/schematics/application/files/expo/app.json.template
diff --git a/packages/react-native-expo/src/schematics/application/files/app/assets/favicon.png b/packages/react-native-expo/src/schematics/application/files/expo/assets/favicon.png
similarity index 100%
rename from packages/react-native-expo/src/schematics/application/files/app/assets/favicon.png
rename to packages/react-native-expo/src/schematics/application/files/expo/assets/favicon.png
diff --git a/packages/react-native-expo/src/schematics/application/files/app/assets/icon.png b/packages/react-native-expo/src/schematics/application/files/expo/assets/icon.png
similarity index 100%
rename from packages/react-native-expo/src/schematics/application/files/app/assets/icon.png
rename to packages/react-native-expo/src/schematics/application/files/expo/assets/icon.png
diff --git a/packages/react-native-expo/src/schematics/application/files/app/assets/splash.png b/packages/react-native-expo/src/schematics/application/files/expo/assets/splash.png
similarity index 100%
rename from packages/react-native-expo/src/schematics/application/files/app/assets/splash.png
rename to packages/react-native-expo/src/schematics/application/files/expo/assets/splash.png
diff --git a/packages/react-native-expo/src/schematics/application/files/app/babel.config.js.template b/packages/react-native-expo/src/schematics/application/files/expo/babel.config.js.template
similarity index 100%
rename from packages/react-native-expo/src/schematics/application/files/app/babel.config.js.template
rename to packages/react-native-expo/src/schematics/application/files/expo/babel.config.js.template
diff --git a/packages/react-native-expo/src/schematics/application/files/app/index.js.template b/packages/react-native-expo/src/schematics/application/files/expo/index.js.template
similarity index 100%
rename from packages/react-native-expo/src/schematics/application/files/app/index.js.template
rename to packages/react-native-expo/src/schematics/application/files/expo/index.js.template
diff --git a/packages/react-native-expo/src/schematics/application/files/app/metro.config.js.template b/packages/react-native-expo/src/schematics/application/files/expo/metro.config.js.template
similarity index 100%
rename from packages/react-native-expo/src/schematics/application/files/app/metro.config.js.template
rename to packages/react-native-expo/src/schematics/application/files/expo/metro.config.js.template
diff --git a/packages/react-native-expo/src/schematics/application/files/app/package.json.template b/packages/react-native-expo/src/schematics/application/files/expo/package.json.template
similarity index 100%
rename from packages/react-native-expo/src/schematics/application/files/app/package.json.template
rename to packages/react-native-expo/src/schematics/application/files/expo/package.json.template
diff --git a/packages/react-native-expo/src/schematics/application/files/app/test-setup.ts b/packages/react-native-expo/src/schematics/application/files/expo/test-setup.ts
similarity index 100%
rename from packages/react-native-expo/src/schematics/application/files/app/test-setup.ts
rename to packages/react-native-expo/src/schematics/application/files/expo/test-setup.ts
diff --git a/packages/react-native-expo/src/schematics/application/files/app/tsconfig.json.template b/packages/react-native-expo/src/schematics/application/files/expo/tsconfig.json.template
similarity index 100%
rename from packages/react-native-expo/src/schematics/application/files/app/tsconfig.json.template
rename to packages/react-native-expo/src/schematics/application/files/expo/tsconfig.json.template
diff --git a/packages/react-native-expo/src/schematics/application/files/app/webpack.config.js.template b/packages/react-native-expo/src/schematics/application/files/expo/webpack.config.js.template
similarity index 100%
rename from packages/react-native-expo/src/schematics/application/files/app/webpack.config.js.template
rename to packages/react-native-expo/src/schematics/application/files/expo/webpack.config.js.template
diff --git a/packages/react-native-expo/src/utils/versions.ts b/packages/react-native-expo/src/utils/versions.ts
index 81ca0d8..c1ed1b1 100644
--- a/packages/react-native-expo/src/utils/versions.ts
+++ b/packages/react-native-expo/src/utils/versions.ts
@@ -10,7 +10,7 @@ export const expoStatusBarVersion = '1.0.2';
 export const reactDomVersion = '16.13.1';
 export const reactNativeWebVersion = '0.13.12';
 export const typesReactDomVersion = '16.9.8';
-export const expoCliVersion = '3.28.2';
+export const expoCliVersion = '3.28.5';
 export const testingLibraryReactNativeVersion = '7.1.0';
 export const testingLibraryJestNativeVersion = '3.4.3';
 export const jestReactNativeVersion = '18.0.0';