diff --git a/README.md b/README.md
index e2a78a32c0c8..a3dec5db2653 100644
--- a/README.md
+++ b/README.md
@@ -100,15 +100,6 @@ Our React Native Android app now uses the `Hermes` JS engine which requires your
 1. The application uses [React-Router](https://reactrouter.com/native/guides/quick-start) for navigating between parts of the app.
 1. [Higher Order Components](https://reactjs.org/docs/higher-order-components.html) are used to connect React components to persistent storage via Ion.
 
-## Platform-Specific File Extensions
-In most cases, the code written for this repo should be platform-independent. In such cases, each module should have a single file, `index.js`, which defines the module's exports. There are, however, some cases in which a feature is intrinsically tied to the underlying platform. In such cases, the following file extensions can be used to export platform-specific code from a module:
-- Mobile => `index.native.js`
-- iOS/Android => `index.ios.js`/`index.android.js`
-- Web => `index.website.js`
-- Desktop => `index.desktop.js`
-
-Note that `index.js` should be the default. i.e: If you have mobile-specific implementation in `index.native.js`, then the desktop/web implementation can be contained in a shared `index.js`. Furthermore, `index.native.js` should not be included in the same module as `index.ios.js` or `index.android.js`, nor should `index.js` be included in the same module as `index.website.js` or `index.desktop.js`.
-
 ## Structure of the app
 These are the main pieces of the application.
 
@@ -138,6 +129,43 @@ This layer is solely responsible for:
 - Reflecting exactly the data that is in persistent storage by using `withIon()` to bind to Ion data.
 - Taking user input and passing it to an action
 
+### Directory structure
+
+Almost all the code is located in the `src` folder, inside it there's some organization, we chose to name directories that are 
+created to house a collection of items in plural form and using camelCase (eg: pages, libs, etc), the main ones we have for now are:
+
+- components: React native components that are re-used in several places.
+- libs: Library classes/functions, these are not React native components (ie: they are not UI)
+- pages: These are components that define pages in the app. The component that defines the page itself should be named 
+`<pageName>Page` if there are components used only inside one page, they should live in its own directory named after the `<pageName>`.
+- styles: These files define styles used among components/pages
+
+### File naming/structure
+
+Files should be named after the component/function/constants they export, respecting the casing used for it. ie: 
+
+- If you export a constant named `CONST` it's file/directory should be named the `CONST`.
+- If you export a component named `Text` the file/directory should be named `Text` 
+- If you export a function named `guid` the file/directory should be named `guid`. 
+- For files that are utilities that export several functions/classes use the UpperCamelCase version ie: `DateUtils`.
+- HOCs should be named in camelCase like withIon.
+- All React components should be PascalCase (a.k.a. UpperCamelCase 🐫).
+
+## Platform-Specific File Extensions
+In most cases, the code written for this repo should be platform-independent. In such cases, each module should have a single file, `index.js`, which defines the module's exports. There are, however, some cases in which a feature is intrinsically tied to the underlying platform. In such cases, the following file extensions can be used to export platform-specific code from a module:
+- Mobile => `index.native.js`
+- iOS/Android => `index.ios.js`/`index.android.js`
+- Web => `index.website.js`
+- Desktop => `index.desktop.js`
+
+Note that `index.js` should be the default. i.e: If you have mobile-specific implementation in `index.native.js`, then the desktop/web implementation can be contained in a shared `index.js`. Furthermore, `index.native.js` should not be included in the same module as `index.ios.js` or `index.android.js`, nor should `index.js` be included in the same module as `index.website.js` or `index.desktop.js`.
+
+### API building
+
+When adding new API commands (and preferrably when starting using a new one that was not yet used in this codebase) always
+prefer to return the created/updated data in the command itself, instead of saving and reloading. ie: if we call `CreateTransaction`,
+we should prefer making `CreateTransaction` return the data it just created instead of calling `CreateTransaction` then `Get` rvl=transactionList
+
 # Deploying 
 ##  Continuous deployment / GitHub workflows
 Every PR merged into `master` will kick off the **Create a new version** GitHub workflow defined in `.github/workflows/version.yml`.
diff --git a/src/Expensify.js b/src/Expensify.js
index bf627e6901af..bbbf268c97e8 100644
--- a/src/Expensify.js
+++ b/src/Expensify.js
@@ -1,21 +1,21 @@
 import React, {Component} from 'react';
 import {View} from 'react-native';
 import PropTypes from 'prop-types';
-import {recordCurrentlyViewedReportID, recordCurrentRoute} from './lib/actions/App';
-import SignInPage from './page/SignInPage';
-import HomePage from './page/home/HomePage';
-import Ion from './lib/Ion';
-import * as ActiveClientManager from './lib/ActiveClientManager';
+import {recordCurrentlyViewedReportID, recordCurrentRoute} from './libs/actions/App';
+import SignInPage from './pages/SignInPage';
+import HomePage from './pages/home/HomePage';
+import Ion from './libs/Ion';
+import * as ActiveClientManager from './libs/ActiveClientManager';
 import IONKEYS from './IONKEYS';
 import withIon from './components/withIon';
-import styles from './style/StyleSheet';
+import styles from './styles/StyleSheet';
 
 import {
     Route,
     Router,
     Redirect,
     Switch
-} from './lib/Router';
+} from './libs/Router';
 import ROUTES from './ROUTES';
 
 // Initialize the store when the app loads for the first time
diff --git a/src/components/InlineCodeBlock/index.android.js b/src/components/InlineCodeBlock/index.android.js
index d081fbd2eeee..00f294e3a327 100644
--- a/src/components/InlineCodeBlock/index.android.js
+++ b/src/components/InlineCodeBlock/index.android.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import {View} from 'react-native';
-import {webViewStyles} from '../../style/StyleSheet';
+import {webViewStyles} from '../../styles/StyleSheet';
 
 const propTypes = {
     children: PropTypes.node.isRequired,
diff --git a/src/components/InlineCodeBlock/index.ios.js b/src/components/InlineCodeBlock/index.ios.js
index 3887a5e23ab4..40ce39772dc8 100644
--- a/src/components/InlineCodeBlock/index.ios.js
+++ b/src/components/InlineCodeBlock/index.ios.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import {View} from 'react-native';
-import styles, {webViewStyles} from '../../style/StyleSheet';
+import styles, {webViewStyles} from '../../styles/StyleSheet';
 
 const propTypes = {
     children: PropTypes.node.isRequired,
diff --git a/src/components/InlineCodeBlock/index.js b/src/components/InlineCodeBlock/index.js
index 85f1208bd0a9..6264e55b0264 100644
--- a/src/components/InlineCodeBlock/index.js
+++ b/src/components/InlineCodeBlock/index.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import {Text} from 'react-native';
-import {webViewStyles} from '../../style/StyleSheet';
+import {webViewStyles} from '../../styles/StyleSheet';
 
 const propTypes = {
     children: PropTypes.node.isRequired,
diff --git a/src/components/InvertedFlatList/BaseInvertedFlatList.js b/src/components/InvertedFlatList/BaseInvertedFlatList.js
index 01f5df1cb194..5b1d5616abd2 100644
--- a/src/components/InvertedFlatList/BaseInvertedFlatList.js
+++ b/src/components/InvertedFlatList/BaseInvertedFlatList.js
@@ -2,7 +2,7 @@ import _ from 'underscore';
 import React, {forwardRef, Component} from 'react';
 import PropTypes from 'prop-types';
 import {FlatList, View} from 'react-native';
-import {lastItem} from '../../lib/CollectionUtils';
+import {lastItem} from '../../libs/CollectionUtils';
 
 const propTypes = {
     // Same as FlatList can be any array of anything
diff --git a/src/components/PressableLink/index.js b/src/components/PressableLink/index.js
index 5f8c647f3cb7..68daa28fec63 100644
--- a/src/components/PressableLink/index.js
+++ b/src/components/PressableLink/index.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import {Link} from '../../lib/Router';
+import {Link} from '../../libs/Router';
 
 /**
  * On web, no changes to Link are required to make links pressable
diff --git a/src/components/PressableLink/index.native.js b/src/components/PressableLink/index.native.js
index 9d7522aab7eb..c2a10bbcfa81 100644
--- a/src/components/PressableLink/index.native.js
+++ b/src/components/PressableLink/index.native.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import {Link} from '../../lib/Router';
+import {Link} from '../../libs/Router';
 
 /**
  * On the native layers, we need to convert the onClick prop to onPress for react-router-native
diff --git a/src/components/Text.js b/src/components/Text.js
index 2e9754218225..ce0e28ed0ef3 100644
--- a/src/components/Text.js
+++ b/src/components/Text.js
@@ -2,8 +2,8 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import _ from 'underscore';
 import {Text as RNText} from 'react-native';
-import fontFamily from '../style/fontFamily';
-import {colors} from '../style/StyleSheet';
+import fontFamily from '../styles/fontFamily';
+import {colors} from '../styles/StyleSheet';
 
 const propTypes = {
     // The color of the text
diff --git a/src/components/withIon.js b/src/components/withIon.js
index 0fc59fac944f..98133af64df8 100644
--- a/src/components/withIon.js
+++ b/src/components/withIon.js
@@ -5,7 +5,7 @@
  */
 import React from 'react';
 import _ from 'underscore';
-import Ion from '../lib/Ion';
+import Ion from '../libs/Ion';
 
 /**
  * Returns the display name of a component
diff --git a/src/lib/API.js b/src/libs/API.js
similarity index 99%
rename from src/lib/API.js
rename to src/libs/API.js
index 4a6b294b6e83..921be5aced7d 100644
--- a/src/lib/API.js
+++ b/src/libs/API.js
@@ -7,7 +7,7 @@ import CONFIG from '../CONFIG';
 import * as Pusher from './Pusher/pusher';
 import ROUTES from '../ROUTES';
 import Str from './Str';
-import Guid from './Guid';
+import guid from './guid';
 import redirectToSignIn from './actions/SignInRedirect';
 
 // Queue for network requests so we don't lose actions done by the user while offline
@@ -364,7 +364,7 @@ function authenticate(parameters) {
         // After the user authenticates, create a new login for the user so that we can reauthenticate when the
         // authtoken expires
         .then(response => (
-            createLogin(Str.generateDeviceLoginID(), Guid())
+            createLogin(Str.generateDeviceLoginID(), guid())
                 .then(() => setSuccessfulSignInData(response, parameters.exitTo))
         ))
         .catch((error) => {
diff --git a/src/lib/ActiveClientManager/index.js b/src/libs/ActiveClientManager/index.js
similarity index 93%
rename from src/lib/ActiveClientManager/index.js
rename to src/libs/ActiveClientManager/index.js
index 13deeb1c44ac..426b4883c9b3 100644
--- a/src/lib/ActiveClientManager/index.js
+++ b/src/libs/ActiveClientManager/index.js
@@ -1,9 +1,9 @@
 import _ from 'underscore';
-import Guid from '../Guid';
+import guid from '../guid';
 import Ion from '../Ion';
 import IONKEYS from '../../IONKEYS';
 
-const clientID = Guid();
+const clientID = guid();
 const maxClients = 20;
 
 let activeClients;
diff --git a/src/lib/ActiveClientManager/index.native.js b/src/libs/ActiveClientManager/index.native.js
similarity index 100%
rename from src/lib/ActiveClientManager/index.native.js
rename to src/libs/ActiveClientManager/index.native.js
diff --git a/src/lib/CollectionUtils.js b/src/libs/CollectionUtils.js
similarity index 100%
rename from src/lib/CollectionUtils.js
rename to src/libs/CollectionUtils.js
diff --git a/src/lib/DateUtils.js b/src/libs/DateUtils.js
similarity index 100%
rename from src/lib/DateUtils.js
rename to src/libs/DateUtils.js
diff --git a/src/lib/ImagePicker/index.js b/src/libs/ImagePicker/index.js
similarity index 100%
rename from src/lib/ImagePicker/index.js
rename to src/libs/ImagePicker/index.js
diff --git a/src/lib/ImagePicker/index.native.js b/src/libs/ImagePicker/index.native.js
similarity index 100%
rename from src/lib/ImagePicker/index.native.js
rename to src/libs/ImagePicker/index.native.js
diff --git a/src/lib/Ion.js b/src/libs/Ion.js
similarity index 100%
rename from src/lib/Ion.js
rename to src/libs/Ion.js
diff --git a/src/lib/KeyboardShortcut/index.js b/src/libs/KeyboardShortcut/index.js
similarity index 100%
rename from src/lib/KeyboardShortcut/index.js
rename to src/libs/KeyboardShortcut/index.js
diff --git a/src/lib/KeyboardShortcut/index.native.js b/src/libs/KeyboardShortcut/index.native.js
similarity index 100%
rename from src/lib/KeyboardShortcut/index.native.js
rename to src/libs/KeyboardShortcut/index.native.js
diff --git a/src/lib/NetworkConnection.js b/src/libs/NetworkConnection.js
similarity index 100%
rename from src/lib/NetworkConnection.js
rename to src/libs/NetworkConnection.js
diff --git a/src/lib/Notification/BrowserNotifications.js b/src/libs/Notification/BrowserNotifications.js
similarity index 100%
rename from src/lib/Notification/BrowserNotifications.js
rename to src/libs/Notification/BrowserNotifications.js
diff --git a/src/lib/Notification/index.js b/src/libs/Notification/index.js
similarity index 100%
rename from src/lib/Notification/index.js
rename to src/libs/Notification/index.js
diff --git a/src/lib/Notification/index.native.js b/src/libs/Notification/index.native.js
similarity index 100%
rename from src/lib/Notification/index.native.js
rename to src/libs/Notification/index.native.js
diff --git a/src/lib/Pusher/library/index.js b/src/libs/Pusher/library/index.js
similarity index 100%
rename from src/lib/Pusher/library/index.js
rename to src/libs/Pusher/library/index.js
diff --git a/src/lib/Pusher/library/index.native.js b/src/libs/Pusher/library/index.native.js
similarity index 100%
rename from src/lib/Pusher/library/index.native.js
rename to src/libs/Pusher/library/index.native.js
diff --git a/src/lib/Pusher/pusher.js b/src/libs/Pusher/pusher.js
similarity index 100%
rename from src/lib/Pusher/pusher.js
rename to src/libs/Pusher/pusher.js
diff --git a/src/lib/Router/index.js b/src/libs/Router/index.js
similarity index 100%
rename from src/lib/Router/index.js
rename to src/libs/Router/index.js
diff --git a/src/lib/Router/index.native.js b/src/libs/Router/index.native.js
similarity index 100%
rename from src/lib/Router/index.native.js
rename to src/libs/Router/index.native.js
diff --git a/src/lib/Str.js b/src/libs/Str.js
similarity index 97%
rename from src/lib/Str.js
rename to src/libs/Str.js
index 83ddfb02bae0..4e5045c67ab4 100644
--- a/src/lib/Str.js
+++ b/src/libs/Str.js
@@ -1,6 +1,6 @@
 import _ from 'underscore';
 import {AllHtmlEntities} from 'html-entities';
-import Guid from './Guid';
+import guid from './guid';
 
 
 const Str = {
@@ -59,7 +59,7 @@ const Str = {
      * @returns {string}
      */
     generateDeviceLoginID() {
-        return `react-native-chat-${Guid()}`;
+        return `react-native-chat-${guid()}`;
     },
 
     /**
diff --git a/src/lib/UnreadIndicatorUpdater/index.js b/src/libs/UnreadIndicatorUpdater/index.js
similarity index 100%
rename from src/lib/UnreadIndicatorUpdater/index.js
rename to src/libs/UnreadIndicatorUpdater/index.js
diff --git a/src/lib/UnreadIndicatorUpdater/updateUnread/index.android.js b/src/libs/UnreadIndicatorUpdater/updateUnread/index.android.js
similarity index 100%
rename from src/lib/UnreadIndicatorUpdater/updateUnread/index.android.js
rename to src/libs/UnreadIndicatorUpdater/updateUnread/index.android.js
diff --git a/src/lib/UnreadIndicatorUpdater/updateUnread/index.desktop.js b/src/libs/UnreadIndicatorUpdater/updateUnread/index.desktop.js
similarity index 100%
rename from src/lib/UnreadIndicatorUpdater/updateUnread/index.desktop.js
rename to src/libs/UnreadIndicatorUpdater/updateUnread/index.desktop.js
diff --git a/src/lib/UnreadIndicatorUpdater/updateUnread/index.ios.js b/src/libs/UnreadIndicatorUpdater/updateUnread/index.ios.js
similarity index 100%
rename from src/lib/UnreadIndicatorUpdater/updateUnread/index.ios.js
rename to src/libs/UnreadIndicatorUpdater/updateUnread/index.ios.js
diff --git a/src/lib/UnreadIndicatorUpdater/updateUnread/index.website.js b/src/libs/UnreadIndicatorUpdater/updateUnread/index.website.js
similarity index 100%
rename from src/lib/UnreadIndicatorUpdater/updateUnread/index.website.js
rename to src/libs/UnreadIndicatorUpdater/updateUnread/index.website.js
diff --git a/src/lib/Visibility/index.js b/src/libs/Visibility/index.js
similarity index 100%
rename from src/lib/Visibility/index.js
rename to src/libs/Visibility/index.js
diff --git a/src/lib/Visibility/index.native.js b/src/libs/Visibility/index.native.js
similarity index 100%
rename from src/lib/Visibility/index.native.js
rename to src/libs/Visibility/index.native.js
diff --git a/src/lib/actions/App.js b/src/libs/actions/App.js
similarity index 100%
rename from src/lib/actions/App.js
rename to src/libs/actions/App.js
diff --git a/src/lib/actions/PersonalDetails.js b/src/libs/actions/PersonalDetails.js
similarity index 100%
rename from src/lib/actions/PersonalDetails.js
rename to src/libs/actions/PersonalDetails.js
diff --git a/src/lib/actions/Report.js b/src/libs/actions/Report.js
similarity index 100%
rename from src/lib/actions/Report.js
rename to src/libs/actions/Report.js
diff --git a/src/lib/actions/Session.js b/src/libs/actions/Session.js
similarity index 100%
rename from src/lib/actions/Session.js
rename to src/libs/actions/Session.js
diff --git a/src/lib/actions/SignInRedirect.js b/src/libs/actions/SignInRedirect.js
similarity index 100%
rename from src/lib/actions/SignInRedirect.js
rename to src/libs/actions/SignInRedirect.js
diff --git a/src/lib/addStorageEventHandler/index.js b/src/libs/addStorageEventHandler/index.js
similarity index 100%
rename from src/lib/addStorageEventHandler/index.js
rename to src/libs/addStorageEventHandler/index.js
diff --git a/src/lib/addStorageEventHandler/index.native.js b/src/libs/addStorageEventHandler/index.native.js
similarity index 100%
rename from src/lib/addStorageEventHandler/index.native.js
rename to src/libs/addStorageEventHandler/index.native.js
diff --git a/src/lib/compose.js b/src/libs/compose.js
similarity index 100%
rename from src/lib/compose.js
rename to src/libs/compose.js
diff --git a/src/lib/Guid.js b/src/libs/guid.js
similarity index 100%
rename from src/lib/Guid.js
rename to src/libs/guid.js
diff --git a/src/lib/md5.js b/src/libs/md5.js
similarity index 100%
rename from src/lib/md5.js
rename to src/libs/md5.js
diff --git a/src/lib/openURLInNewTab/index.js b/src/libs/openURLInNewTab/index.js
similarity index 100%
rename from src/lib/openURLInNewTab/index.js
rename to src/libs/openURLInNewTab/index.js
diff --git a/src/lib/openURLInNewTab/index.native.js b/src/libs/openURLInNewTab/index.native.js
similarity index 100%
rename from src/lib/openURLInNewTab/index.native.js
rename to src/libs/openURLInNewTab/index.native.js
diff --git a/src/lib/promiseAllSettled/index.js b/src/libs/promiseAllSettled/index.js
similarity index 100%
rename from src/lib/promiseAllSettled/index.js
rename to src/libs/promiseAllSettled/index.js
diff --git a/src/lib/promiseAllSettled/index.native.js b/src/libs/promiseAllSettled/index.native.js
similarity index 100%
rename from src/lib/promiseAllSettled/index.native.js
rename to src/libs/promiseAllSettled/index.native.js
diff --git a/src/lib/xhr.js b/src/libs/xhr.js
similarity index 100%
rename from src/lib/xhr.js
rename to src/libs/xhr.js
diff --git a/src/page/SafeAreaInsetPropTypes.js b/src/pages/SafeAreaInsetPropTypes.js
similarity index 100%
rename from src/page/SafeAreaInsetPropTypes.js
rename to src/pages/SafeAreaInsetPropTypes.js
diff --git a/src/page/SignInPage.js b/src/pages/SignInPage.js
similarity index 96%
rename from src/page/SignInPage.js
rename to src/pages/SignInPage.js
index b696d3ac9664..2806b3288ed5 100644
--- a/src/page/SignInPage.js
+++ b/src/pages/SignInPage.js
@@ -12,12 +12,12 @@ import {
 import PropTypes from 'prop-types';
 import _ from 'underscore';
 import CONFIG from '../CONFIG';
-import compose from '../lib/compose';
-import {withRouter} from '../lib/Router';
-import {signIn} from '../lib/actions/Session';
+import compose from '../libs/compose';
+import {withRouter} from '../libs/Router';
+import {signIn} from '../libs/actions/Session';
 import IONKEYS from '../IONKEYS';
 import withIon from '../components/withIon';
-import styles, {colors} from '../style/StyleSheet';
+import styles, {colors} from '../styles/StyleSheet';
 import logo from '../../assets/images/expensify-logo_reversed.png';
 
 const propTypes = {
diff --git a/src/page/home/HeaderView.js b/src/pages/home/HeaderView.js
similarity index 93%
rename from src/page/home/HeaderView.js
rename to src/pages/home/HeaderView.js
index 863e8b3e92b1..ab408e5f3af4 100644
--- a/src/page/home/HeaderView.js
+++ b/src/pages/home/HeaderView.js
@@ -2,12 +2,12 @@ import React from 'react';
 import {View, Image, TouchableOpacity} from 'react-native';
 import PropTypes from 'prop-types';
 import Text from '../../components/Text';
-import styles from '../../style/StyleSheet';
+import styles from '../../styles/StyleSheet';
 import IONKEYS from '../../IONKEYS';
 import withIon from '../../components/withIon';
-import {withRouter} from '../../lib/Router';
+import {withRouter} from '../../libs/Router';
 import LHNToggle from '../../../assets/images/icon-menu-toggle.png';
-import compose from '../../lib/compose';
+import compose from '../../libs/compose';
 
 const propTypes = {
     // Toggles the hamburger menu open and closed
diff --git a/src/page/home/HomePage.js b/src/pages/home/HomePage.js
similarity index 94%
rename from src/page/home/HomePage.js
rename to src/pages/home/HomePage.js
index 42547a3bae86..8036c28837e1 100644
--- a/src/page/home/HomePage.js
+++ b/src/pages/home/HomePage.js
@@ -7,17 +7,17 @@ import {
     Easing
 } from 'react-native';
 import {SafeAreaInsetsContext, SafeAreaProvider} from 'react-native-safe-area-context';
-import {Route} from '../../lib/Router';
-import styles, {getSafeAreaPadding} from '../../style/StyleSheet';
+import {Route} from '../../libs/Router';
+import styles, {getSafeAreaPadding} from '../../styles/StyleSheet';
 import Header from './HeaderView';
 import Sidebar from './sidebar/SidebarView';
 import Main from './MainView';
-import {subscribeToReportCommentEvents, fetchAll as fetchAllReports} from '../../lib/actions/Report';
-import {fetch as fetchPersonalDetails} from '../../lib/actions/PersonalDetails';
-import * as Pusher from '../../lib/Pusher/pusher';
-import UnreadIndicatorUpdater from '../../lib/UnreadIndicatorUpdater';
+import {subscribeToReportCommentEvents, fetchAll as fetchAllReports} from '../../libs/actions/Report';
+import {fetch as fetchPersonalDetails} from '../../libs/actions/PersonalDetails';
+import * as Pusher from '../../libs/Pusher/pusher';
+import UnreadIndicatorUpdater from '../../libs/UnreadIndicatorUpdater';
 import ROUTES from '../../ROUTES';
-import NetworkConnection from '../../lib/NetworkConnection';
+import NetworkConnection from '../../libs/NetworkConnection';
 
 const windowSize = Dimensions.get('window');
 const widthBreakPoint = 1000;
diff --git a/src/page/home/MainView.js b/src/pages/home/MainView.js
similarity index 94%
rename from src/page/home/MainView.js
rename to src/pages/home/MainView.js
index af59011d7369..d23a00a5a516 100644
--- a/src/page/home/MainView.js
+++ b/src/pages/home/MainView.js
@@ -5,9 +5,9 @@ import _ from 'underscore';
 import ReportView from './report/ReportView';
 import withIon from '../../components/withIon';
 import IONKEYS from '../../IONKEYS';
-import styles from '../../style/StyleSheet';
-import {withRouter} from '../../lib/Router';
-import compose from '../../lib/compose';
+import styles from '../../styles/StyleSheet';
+import {withRouter} from '../../libs/Router';
+import compose from '../../libs/compose';
 
 const propTypes = {
     // This comes from withRouter
diff --git a/src/page/home/report/ReportActionCompose.js b/src/pages/home/report/ReportActionCompose.js
similarity index 97%
rename from src/page/home/report/ReportActionCompose.js
rename to src/pages/home/report/ReportActionCompose.js
index 2ee6c069c813..4d4e809a79b1 100644
--- a/src/page/home/report/ReportActionCompose.js
+++ b/src/pages/home/report/ReportActionCompose.js
@@ -2,14 +2,14 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import {View, Image, TouchableOpacity} from 'react-native';
 import _ from 'underscore';
-import styles, {colors} from '../../../style/StyleSheet';
+import styles, {colors} from '../../../styles/StyleSheet';
 import TextInputFocusable from '../../../components/TextInputFocusable';
 import sendIcon from '../../../../assets/images/icon-send.png';
 import IONKEYS from '../../../IONKEYS';
 import paperClipIcon from '../../../../assets/images/icon-paper-clip.png';
-import ImagePicker from '../../../lib/ImagePicker';
+import ImagePicker from '../../../libs/ImagePicker';
 import withIon from '../../../components/withIon';
-import {addAction, saveReportComment} from '../../../lib/actions/Report';
+import {addAction, saveReportComment} from '../../../libs/actions/Report';
 
 const propTypes = {
     // A method to call when the form is submitted
diff --git a/src/page/home/report/ReportActionFragmentPropTypes.js b/src/pages/home/report/ReportActionFragmentPropTypes.js
similarity index 100%
rename from src/page/home/report/ReportActionFragmentPropTypes.js
rename to src/pages/home/report/ReportActionFragmentPropTypes.js
diff --git a/src/page/home/report/ReportActionItem.js b/src/pages/home/report/ReportActionItem.js
similarity index 100%
rename from src/page/home/report/ReportActionItem.js
rename to src/pages/home/report/ReportActionItem.js
diff --git a/src/page/home/report/ReportActionItemDate.js b/src/pages/home/report/ReportActionItemDate.js
similarity index 84%
rename from src/page/home/report/ReportActionItemDate.js
rename to src/pages/home/report/ReportActionItemDate.js
index 7e31d510d10f..7377de81c45b 100644
--- a/src/page/home/report/ReportActionItemDate.js
+++ b/src/pages/home/report/ReportActionItemDate.js
@@ -1,8 +1,8 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import {Text} from 'react-native';
-import DateUtils from '../../../lib/DateUtils';
-import styles from '../../../style/StyleSheet';
+import DateUtils from '../../../libs/DateUtils';
+import styles from '../../../styles/StyleSheet';
 
 const propTypes = {
     // UTC timestamp for when the action was created
diff --git a/src/page/home/report/ReportActionItemFragment.js b/src/pages/home/report/ReportActionItemFragment.js
similarity index 97%
rename from src/page/home/report/ReportActionItemFragment.js
rename to src/pages/home/report/ReportActionItemFragment.js
index 18eea963ce86..eb5a3b132745 100644
--- a/src/page/home/report/ReportActionItemFragment.js
+++ b/src/pages/home/report/ReportActionItemFragment.js
@@ -4,12 +4,12 @@ import {
     Linking, ActivityIndicator, View, Dimensions
 } from 'react-native';
 import PropTypes from 'prop-types';
-import Str from '../../../lib/Str';
+import Str from '../../../libs/Str';
 import ReportActionFragmentPropTypes from './ReportActionFragmentPropTypes';
-import styles, {webViewStyles, colors} from '../../../style/StyleSheet';
+import styles, {webViewStyles, colors} from '../../../styles/StyleSheet';
 import Text from '../../../components/Text';
 import AnchorForCommentsOnly from '../../../components/AnchorForCommentsOnly';
-import {getAuthToken} from '../../../lib/API';
+import {getAuthToken} from '../../../libs/API';
 import InlineCodeBlock from '../../../components/InlineCodeBlock';
 
 const propTypes = {
diff --git a/src/page/home/report/ReportActionItemGrouped.js b/src/pages/home/report/ReportActionItemGrouped.js
similarity index 93%
rename from src/page/home/report/ReportActionItemGrouped.js
rename to src/pages/home/report/ReportActionItemGrouped.js
index b8276ef8aaa7..75bdba0720cd 100644
--- a/src/page/home/report/ReportActionItemGrouped.js
+++ b/src/pages/home/report/ReportActionItemGrouped.js
@@ -3,7 +3,7 @@ import {View} from 'react-native';
 import PropTypes from 'prop-types';
 import ReportActionPropTypes from './ReportActionPropTypes';
 import ReportActionItemMessage from './ReportActionItemMessage';
-import styles from '../../../style/StyleSheet';
+import styles from '../../../styles/StyleSheet';
 
 const propTypes = {
     // All the data of the action
diff --git a/src/page/home/report/ReportActionItemMessage.js b/src/pages/home/report/ReportActionItemMessage.js
similarity index 94%
rename from src/page/home/report/ReportActionItemMessage.js
rename to src/pages/home/report/ReportActionItemMessage.js
index c185b4fca784..ac5b4f8a649c 100644
--- a/src/page/home/report/ReportActionItemMessage.js
+++ b/src/pages/home/report/ReportActionItemMessage.js
@@ -2,7 +2,7 @@ import React from 'react';
 import {View} from 'react-native';
 import PropTypes from 'prop-types';
 import _ from 'underscore';
-import styles from '../../../style/StyleSheet';
+import styles from '../../../styles/StyleSheet';
 import ReportActionItemFragment from './ReportActionItemFragment';
 import ReportActionPropTypes from './ReportActionPropTypes';
 
diff --git a/src/page/home/report/ReportActionItemSingle.js b/src/pages/home/report/ReportActionItemSingle.js
similarity index 97%
rename from src/page/home/report/ReportActionItemSingle.js
rename to src/pages/home/report/ReportActionItemSingle.js
index 9a8e451f0760..53bce584549c 100644
--- a/src/page/home/report/ReportActionItemSingle.js
+++ b/src/pages/home/report/ReportActionItemSingle.js
@@ -5,7 +5,7 @@ import _ from 'underscore';
 import ReportActionPropTypes from './ReportActionPropTypes';
 import ReportActionItemMessage from './ReportActionItemMessage';
 import ReportActionItemFragment from './ReportActionItemFragment';
-import styles from '../../../style/StyleSheet';
+import styles from '../../../styles/StyleSheet';
 import CONST from '../../../CONST';
 import ReportActionItemDate from './ReportActionItemDate';
 
diff --git a/src/page/home/report/ReportActionPropTypes.js b/src/pages/home/report/ReportActionPropTypes.js
similarity index 100%
rename from src/page/home/report/ReportActionPropTypes.js
rename to src/pages/home/report/ReportActionPropTypes.js
diff --git a/src/page/home/report/ReportActionsView.js b/src/pages/home/report/ReportActionsView.js
similarity index 98%
rename from src/page/home/report/ReportActionsView.js
rename to src/pages/home/report/ReportActionsView.js
index 283db85ad9f2..8c2770c241b4 100644
--- a/src/page/home/report/ReportActionsView.js
+++ b/src/pages/home/report/ReportActionsView.js
@@ -5,13 +5,13 @@ import _ from 'underscore';
 import lodashGet from 'lodash.get';
 import Text from '../../../components/Text';
 import withIon from '../../../components/withIon';
-import {fetchActions, updateLastReadActionID} from '../../../lib/actions/Report';
+import {fetchActions, updateLastReadActionID} from '../../../libs/actions/Report';
 import IONKEYS from '../../../IONKEYS';
 import ReportActionItem from './ReportActionItem';
-import styles from '../../../style/StyleSheet';
+import styles from '../../../styles/StyleSheet';
 import ReportActionPropTypes from './ReportActionPropTypes';
 import InvertedFlatList from '../../../components/InvertedFlatList';
-import {lastItem} from '../../../lib/CollectionUtils';
+import {lastItem} from '../../../libs/CollectionUtils';
 
 const propTypes = {
     // The ID of the report actions will be created for
diff --git a/src/page/home/report/ReportView.js b/src/pages/home/report/ReportView.js
similarity index 94%
rename from src/page/home/report/ReportView.js
rename to src/pages/home/report/ReportView.js
index 4032f706c71d..e74269199344 100644
--- a/src/page/home/report/ReportView.js
+++ b/src/pages/home/report/ReportView.js
@@ -3,9 +3,9 @@ import {View} from 'react-native';
 import PropTypes from 'prop-types';
 import ReportActionView from './ReportActionsView';
 import ReportActionCompose from './ReportActionCompose';
-import {addAction} from '../../../lib/actions/Report';
+import {addAction} from '../../../libs/actions/Report';
 import KeyboardSpacer from '../../../components/KeyboardSpacer';
-import styles from '../../../style/StyleSheet';
+import styles from '../../../styles/StyleSheet';
 
 const propTypes = {
     // The ID of the report actions will be created for
diff --git a/src/page/home/sidebar/AppLinks/index.desktop.js b/src/pages/home/sidebar/AppLinks/index.desktop.js
similarity index 86%
rename from src/page/home/sidebar/AppLinks/index.desktop.js
rename to src/pages/home/sidebar/AppLinks/index.desktop.js
index 2d966d9e149b..6f56a2038486 100644
--- a/src/page/home/sidebar/AppLinks/index.desktop.js
+++ b/src/pages/home/sidebar/AppLinks/index.desktop.js
@@ -1,7 +1,7 @@
 import React from 'react';
 
-import styles from '../../../../style/StyleSheet';
-import openURLInNewTab from '../../../../lib/openURLInNewTab';
+import styles from '../../../../styles/StyleSheet';
+import openURLInNewTab from '../../../../libs/openURLInNewTab';
 import Text from '../../../../components/Text';
 
 const AppLinks = () => (
diff --git a/src/page/home/sidebar/AppLinks/index.native.js b/src/pages/home/sidebar/AppLinks/index.native.js
similarity index 74%
rename from src/page/home/sidebar/AppLinks/index.native.js
rename to src/pages/home/sidebar/AppLinks/index.native.js
index 7488b7905b4a..b8355295b889 100644
--- a/src/page/home/sidebar/AppLinks/index.native.js
+++ b/src/pages/home/sidebar/AppLinks/index.native.js
@@ -1,6 +1,6 @@
 import React from 'react';
-import styles from '../../../../style/StyleSheet';
-import openURLInNewTab from '../../../../lib/openURLInNewTab';
+import styles from '../../../../styles/StyleSheet';
+import openURLInNewTab from '../../../../libs/openURLInNewTab';
 import Text from '../../../../components/Text';
 
 const AppLinks = () => (
diff --git a/src/page/home/sidebar/AppLinks/index.website.js b/src/pages/home/sidebar/AppLinks/index.website.js
similarity index 87%
rename from src/page/home/sidebar/AppLinks/index.website.js
rename to src/pages/home/sidebar/AppLinks/index.website.js
index 59204dc80c84..4d5294537e90 100644
--- a/src/page/home/sidebar/AppLinks/index.website.js
+++ b/src/pages/home/sidebar/AppLinks/index.website.js
@@ -1,7 +1,7 @@
 import React from 'react';
 
-import styles from '../../../../style/StyleSheet';
-import openURLInNewTab from '../../../../lib/openURLInNewTab';
+import styles from '../../../../styles/StyleSheet';
+import openURLInNewTab from '../../../../libs/openURLInNewTab';
 import Text from '../../../../components/Text';
 
 const AppLinks = () => (
diff --git a/src/page/home/sidebar/ChatSwitcherList.js b/src/pages/home/sidebar/ChatSwitcherList.js
similarity index 98%
rename from src/page/home/sidebar/ChatSwitcherList.js
rename to src/pages/home/sidebar/ChatSwitcherList.js
index 766e9cdfb77c..4df4f79b1781 100644
--- a/src/page/home/sidebar/ChatSwitcherList.js
+++ b/src/pages/home/sidebar/ChatSwitcherList.js
@@ -7,7 +7,7 @@ import {
     TouchableOpacity,
     View
 } from 'react-native';
-import styles from '../../../style/StyleSheet';
+import styles from '../../../styles/StyleSheet';
 
 const propTypes = {
     // The index of the option that is currently in focus
diff --git a/src/page/home/sidebar/ChatSwitcherSearchForm.js b/src/pages/home/sidebar/ChatSwitcherSearchForm.js
similarity index 98%
rename from src/page/home/sidebar/ChatSwitcherSearchForm.js
rename to src/pages/home/sidebar/ChatSwitcherSearchForm.js
index b9b5eab61f0c..5426df194e40 100644
--- a/src/page/home/sidebar/ChatSwitcherSearchForm.js
+++ b/src/pages/home/sidebar/ChatSwitcherSearchForm.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import {Image, TouchableOpacity, View} from 'react-native';
 import PropTypes from 'prop-types';
-import styles, {colors} from '../../../style/StyleSheet';
+import styles, {colors} from '../../../styles/StyleSheet';
 import logoCircle from '../../../../assets/images/expensify-logo-round.png';
 import TextInputWithFocusStyles from '../../../components/TextInputWithFocusStyles';
 import iconX from '../../../../assets/images/icon-x.png';
diff --git a/src/page/home/sidebar/ChatSwitcherView.js b/src/pages/home/sidebar/ChatSwitcherView.js
similarity index 97%
rename from src/page/home/sidebar/ChatSwitcherView.js
rename to src/pages/home/sidebar/ChatSwitcherView.js
index 5e3b5cf1a467..45a935009bc0 100644
--- a/src/page/home/sidebar/ChatSwitcherView.js
+++ b/src/pages/home/sidebar/ChatSwitcherView.js
@@ -3,12 +3,12 @@ import PropTypes from 'prop-types';
 import _ from 'underscore';
 import withIon from '../../../components/withIon';
 import IONKEYS from '../../../IONKEYS';
-import Str from '../../../lib/Str';
-import KeyboardShortcut from '../../../lib/KeyboardShortcut';
+import Str from '../../../libs/Str';
+import KeyboardShortcut from '../../../libs/KeyboardShortcut';
 import ChatSwitcherList from './ChatSwitcherList';
 import ChatSwitcherSearchForm from './ChatSwitcherSearchForm';
-import {fetchOrCreateChatReport} from '../../../lib/actions/Report';
-import {redirect} from '../../../lib/actions/App';
+import {fetchOrCreateChatReport} from '../../../libs/actions/Report';
+import {redirect} from '../../../libs/actions/App';
 import ROUTES from '../../../ROUTES';
 
 const personalDetailsPropTypes = PropTypes.shape({
diff --git a/src/page/home/sidebar/SidebarBottom.js b/src/pages/home/sidebar/SidebarBottom.js
similarity index 95%
rename from src/page/home/sidebar/SidebarBottom.js
rename to src/pages/home/sidebar/SidebarBottom.js
index e53f8beb790b..aa18e9472bdf 100644
--- a/src/page/home/sidebar/SidebarBottom.js
+++ b/src/pages/home/sidebar/SidebarBottom.js
@@ -2,10 +2,10 @@ import React from 'react';
 import {Image, View, StyleSheet} from 'react-native';
 import PropTypes from 'prop-types';
 import _ from 'underscore';
-import styles, {getSafeAreaMargins} from '../../../style/StyleSheet';
+import styles, {getSafeAreaMargins} from '../../../styles/StyleSheet';
 import Text from '../../../components/Text';
 import AppLinks from './AppLinks';
-import {signOut} from '../../../lib/actions/Session';
+import {signOut} from '../../../libs/actions/Session';
 import IONKEYS from '../../../IONKEYS';
 import withIon from '../../../components/withIon';
 import SafeAreaInsetPropTypes from '../../SafeAreaInsetPropTypes';
diff --git a/src/page/home/sidebar/SidebarLink.js b/src/pages/home/sidebar/SidebarLink.js
similarity index 97%
rename from src/page/home/sidebar/SidebarLink.js
rename to src/pages/home/sidebar/SidebarLink.js
index afffd65adb2e..786d6434fa01 100644
--- a/src/page/home/sidebar/SidebarLink.js
+++ b/src/pages/home/sidebar/SidebarLink.js
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import {View} from 'react-native';
 import Text from '../../../components/Text';
-import styles from '../../../style/StyleSheet';
+import styles from '../../../styles/StyleSheet';
 import PressableLink from '../../../components/PressableLink';
 import ROUTES from '../../../ROUTES';
 
diff --git a/src/page/home/sidebar/SidebarLinks.js b/src/pages/home/sidebar/SidebarLinks.js
similarity index 96%
rename from src/page/home/sidebar/SidebarLinks.js
rename to src/pages/home/sidebar/SidebarLinks.js
index 6af6c4e51905..2fd993ec354f 100644
--- a/src/page/home/sidebar/SidebarLinks.js
+++ b/src/pages/home/sidebar/SidebarLinks.js
@@ -3,15 +3,15 @@ import {View} from 'react-native';
 import _ from 'underscore';
 import PropTypes from 'prop-types';
 import lodashOrderby from 'lodash.orderby';
-import styles from '../../../style/StyleSheet';
+import styles from '../../../styles/StyleSheet';
 import Text from '../../../components/Text';
 import SidebarLink from './SidebarLink';
 import withIon from '../../../components/withIon';
 import IONKEYS from '../../../IONKEYS';
 import ChatSwitcherView from './ChatSwitcherView';
 import SafeAreaInsetPropTypes from '../../SafeAreaInsetPropTypes';
-import compose from '../../../lib/compose';
-import {withRouter} from '../../../lib/Router';
+import compose from '../../../libs/compose';
+import {withRouter} from '../../../libs/Router';
 
 const propTypes = {
     // These are from withRouter
diff --git a/src/page/home/sidebar/SidebarView.js b/src/pages/home/sidebar/SidebarView.js
similarity index 97%
rename from src/page/home/sidebar/SidebarView.js
rename to src/pages/home/sidebar/SidebarView.js
index 7e34791f780d..cbbbf4a7e6c2 100644
--- a/src/page/home/sidebar/SidebarView.js
+++ b/src/pages/home/sidebar/SidebarView.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import {View} from 'react-native';
 import PropTypes from 'prop-types';
-import styles from '../../../style/StyleSheet';
+import styles from '../../../styles/StyleSheet';
 import SidebarBottom from './SidebarBottom';
 import SidebarLinks from './SidebarLinks';
 import SafeAreaInsetPropTypes from '../../SafeAreaInsetPropTypes';
diff --git a/src/style/StyleSheet.js b/src/styles/StyleSheet.js
similarity index 100%
rename from src/style/StyleSheet.js
rename to src/styles/StyleSheet.js
diff --git a/src/style/bold/index.android.js b/src/styles/bold/index.android.js
similarity index 100%
rename from src/style/bold/index.android.js
rename to src/styles/bold/index.android.js
diff --git a/src/style/bold/index.js b/src/styles/bold/index.js
similarity index 100%
rename from src/style/bold/index.js
rename to src/styles/bold/index.js
diff --git a/src/style/fontFamily/index.js b/src/styles/fontFamily/index.js
similarity index 100%
rename from src/style/fontFamily/index.js
rename to src/styles/fontFamily/index.js
diff --git a/src/style/fontFamily/monospace/index.js b/src/styles/fontFamily/monospace/index.js
similarity index 100%
rename from src/style/fontFamily/monospace/index.js
rename to src/styles/fontFamily/monospace/index.js
diff --git a/src/style/fontFamily/monospace/index.native.js b/src/styles/fontFamily/monospace/index.native.js
similarity index 100%
rename from src/style/fontFamily/monospace/index.native.js
rename to src/styles/fontFamily/monospace/index.native.js
diff --git a/src/style/italic/index.android.js b/src/styles/italic/index.android.js
similarity index 100%
rename from src/style/italic/index.android.js
rename to src/styles/italic/index.android.js
diff --git a/src/style/italic/index.js b/src/styles/italic/index.js
similarity index 100%
rename from src/style/italic/index.js
rename to src/styles/italic/index.js