diff --git a/components/app-wrapper.js b/components/app-wrapper.js
index fc70bcd..cef5d06 100644
--- a/components/app-wrapper.js
+++ b/components/app-wrapper.js
@@ -7,7 +7,7 @@ import { openDb } from '../db'
 import App from './app'
 import PasswordPrompt from './password-prompt'
 import License from './license'
-import AppLoadingView from './app-loading'
+import AppLoadingView from './common/app-loading'
 
 import store from "../store"
 import { Provider } from 'react-redux'
diff --git a/components/chart/chart-legend.js b/components/chart/chart-legend.js
index 4dc00b6..f94609a 100644
--- a/components/chart/chart-legend.js
+++ b/components/chart/chart-legend.js
@@ -2,7 +2,7 @@ import React from 'react'
 import PropTypes from 'prop-types'
 import { View } from 'react-native'
 
-import AppText from '../app-text'
+import AppText from '../common/app-text'
 import DripHomeIcon from '../../assets/drip-home-icons'
 
 import styles from './styles'
diff --git a/components/chart/tick.js b/components/chart/tick.js
index 173cfbe..4dc6b28 100644
--- a/components/chart/tick.js
+++ b/components/chart/tick.js
@@ -1,7 +1,7 @@
 import React from 'react'
 import PropTypes from 'prop-types'
 
-import AppText from '../app-text'
+import AppText from '../common/app-text'
 
 import styles from './styles'
 
diff --git a/components/app-loading.js b/components/common/app-loading.js
similarity index 88%
rename from components/app-loading.js
rename to components/common/app-loading.js
index ebac28f..0c00571 100644
--- a/components/app-loading.js
+++ b/components/common/app-loading.js
@@ -3,7 +3,7 @@ import React from 'react'
 import { View } from 'react-native'
 
 import AppText from './app-text'
-import { shared } from '../i18n/en/labels'
+import { shared } from '../../i18n/en/labels'
 
 const AppLoadingView = () => {
   return (
diff --git a/components/app-text-input.js b/components/common/app-text-input.js
similarity index 95%
rename from components/app-text-input.js
rename to components/common/app-text-input.js
index 54e4a19..2353375 100644
--- a/components/app-text-input.js
+++ b/components/common/app-text-input.js
@@ -1,7 +1,7 @@
 import React from 'react'
 import PropTypes from 'prop-types'
 import { TextInput } from 'react-native'
-import styles from '../styles'
+import styles from '../../styles'
 
 export default function AppTextInput({ style, ...props }) {
   if (!Array.isArray(style)) style = [style]
diff --git a/components/app-text.js b/components/common/app-text.js
similarity index 94%
rename from components/app-text.js
rename to components/common/app-text.js
index e2c6210..ad861e6 100644
--- a/components/app-text.js
+++ b/components/common/app-text.js
@@ -1,7 +1,7 @@
 import React from 'react'
 import PropTypes from 'prop-types'
 import { Text } from 'react-native'
-import styles from "../styles"
+import styles from "../../styles"
 import Link from './link'
 
 export default function AppText({ children, onPress, numberOfLines, style}) {
diff --git a/components/button.js b/components/common/button.js
similarity index 95%
rename from components/button.js
rename to components/common/button.js
index be06408..f493cf7 100644
--- a/components/button.js
+++ b/components/common/button.js
@@ -2,7 +2,7 @@ import React from 'react'
 import PropTypes from 'prop-types'
 import { TouchableOpacity } from 'react-native'
 import AppText from './app-text'
-import styles from '../styles'
+import styles from '../../styles'
 
 export default function Button({
   backgroundColor,
diff --git a/components/framed-segment.js b/components/common/framed-segment.js
similarity index 95%
rename from components/framed-segment.js
rename to components/common/framed-segment.js
index 49bce23..7321615 100644
--- a/components/framed-segment.js
+++ b/components/common/framed-segment.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types'
 
 import { View } from 'react-native'
 import AppText from './app-text'
-import styles from '../styles'
+import styles from '../../styles'
 
 const FramedSegment = ({ children, last, style, title }) => {
   const viewStyle = [styles.framedSegment, style]
diff --git a/components/link.js b/components/common/link.js
similarity index 88%
rename from components/link.js
rename to components/common/link.js
index caea792..3b62c4c 100644
--- a/components/link.js
+++ b/components/common/link.js
@@ -1,8 +1,8 @@
 import React from 'react'
 import PropTypes from 'prop-types'
 import Hyperlink from 'react-native-hyperlink'
-import styles from '../styles'
-import links from '../i18n/en/links'
+import styles from '../../styles'
+import links from '../../i18n/en/links'
 
 export default function Link(props) {
   return (
diff --git a/components/cycle-day/SymptomBox.js b/components/cycle-day/SymptomBox.js
index 62f5df0..71bc042 100644
--- a/components/cycle-day/SymptomBox.js
+++ b/components/cycle-day/SymptomBox.js
@@ -2,7 +2,7 @@ import React from 'react'
 import PropTypes from 'prop-types'
 import { View, TouchableOpacity } from 'react-native'
 
-import AppText from '../app-text'
+import AppText from '../common/app-text'
 import DripIcon from '../../assets/drip-icons'
 
 import styles from '../../styles'
diff --git a/components/cycle-day/select-box-group.js b/components/cycle-day/select-box-group.js
index ee64d00..94a2607 100644
--- a/components/cycle-day/select-box-group.js
+++ b/components/cycle-day/select-box-group.js
@@ -2,7 +2,7 @@ import React from 'react'
 import PropTypes from 'prop-types'
 import { View, TouchableOpacity } from 'react-native'
 
-import AppText from '../app-text'
+import AppText from '../common/app-text'
 
 import styles from '../../styles'
 
diff --git a/components/cycle-day/select-tab-group.js b/components/cycle-day/select-tab-group.js
index a8fffc6..77dcc25 100644
--- a/components/cycle-day/select-tab-group.js
+++ b/components/cycle-day/select-tab-group.js
@@ -2,7 +2,7 @@ import React from 'react'
 import PropTypes from 'prop-types'
 import { View, TouchableOpacity } from 'react-native'
 
-import AppText from '../app-text'
+import AppText from '../common/app-text'
 
 import styles from '../../styles'
 
diff --git a/components/cycle-day/symptoms/info-symptom.js b/components/cycle-day/symptoms/info-symptom.js
index 93820e2..d45984a 100644
--- a/components/cycle-day/symptoms/info-symptom.js
+++ b/components/cycle-day/symptoms/info-symptom.js
@@ -2,7 +2,7 @@ import React from 'react'
 import PropTypes from 'prop-types'
 import { ScrollView, View, TouchableOpacity } from 'react-native'
 import Icon from 'react-native-vector-icons/SimpleLineIcons'
-import AppText from '../../app-text'
+import AppText from '../../common/app-text'
 import labels from '../../../i18n/en/symptom-info.js'
 import styles, {iconStyles} from '../../../styles/index'
 
diff --git a/components/cycle-day/symptoms/symptom-section.js b/components/cycle-day/symptoms/symptom-section.js
index 92192df..e2fe60b 100644
--- a/components/cycle-day/symptoms/symptom-section.js
+++ b/components/cycle-day/symptoms/symptom-section.js
@@ -1,6 +1,6 @@
 import React, { Component } from 'react'
 import { View } from 'react-native'
-import AppText from '../../app-text'
+import AppText from '../../common/app-text'
 import styles from '../../../styles'
 
 export default class SymptomSection extends Component {
diff --git a/components/cycle-day/symptoms/temperature-input.js b/components/cycle-day/symptoms/temperature-input.js
index cc0dbd9..c333e77 100644
--- a/components/cycle-day/symptoms/temperature-input.js
+++ b/components/cycle-day/symptoms/temperature-input.js
@@ -2,8 +2,8 @@ import React, { Component } from 'react'
 import PropTypes from 'prop-types'
 
 import { View } from 'react-native'
-import AppText from '../../app-text'
-import AppTextInput from '../../app-text-input'
+import AppText from '../../common/app-text'
+import AppTextInput from '../../common/app-text-input'
 
 import { temperature as labels } from '../../../i18n/en/cycle-day'
 
diff --git a/components/cycle-day/symptoms/temperature.js b/components/cycle-day/symptoms/temperature.js
index 5c033c9..1acd975 100644
--- a/components/cycle-day/symptoms/temperature.js
+++ b/components/cycle-day/symptoms/temperature.js
@@ -6,7 +6,7 @@ import { LocalTime, ChronoUnit } from 'js-joda'
 import { temperature as labels } from '../../../i18n/en/cycle-day'
 import { shared as sharedLabels } from '../../../i18n/en/labels'
 
-import AppTextInput from '../../app-text-input'
+import AppTextInput from '../../common/app-text-input'
 import SymptomSection from './symptom-section'
 import SymptomView from './symptom-view'
 import TimeInput from './time-input'
diff --git a/components/cycle-day/symptoms/time-input.js b/components/cycle-day/symptoms/time-input.js
index 1d0bc0f..2c48923 100644
--- a/components/cycle-day/symptoms/time-input.js
+++ b/components/cycle-day/symptoms/time-input.js
@@ -2,7 +2,7 @@ import React, { Component } from 'react'
 import PropTypes from 'prop-types'
 import { Keyboard } from 'react-native'
 
-import AppTextInput from '../../app-text-input'
+import AppTextInput from '../../common/app-text-input'
 import styles from '../../../styles'
 
 import DateTimePicker from 'react-native-modal-datetime-picker-nevo'
diff --git a/components/home-element.js b/components/home-element.js
index 5c2423b..7f50f35 100644
--- a/components/home-element.js
+++ b/components/home-element.js
@@ -2,7 +2,7 @@ import React from 'react'
 import { View } from 'react-native'
 import PropTypes from 'prop-types'
 
-import Button from './button'
+import Button from './common/button'
 
 import styles from '../styles'
 
diff --git a/components/home.js b/components/home.js
index 2b900d5..b76bfd6 100644
--- a/components/home.js
+++ b/components/home.js
@@ -9,7 +9,7 @@ import { getDate, setDate } from '../slices/date'
 
 import DripHomeIcon from '../assets/drip-home-icons'
 
-import AppText from './app-text'
+import AppText from './common/app-text'
 import IconText from './icon-text'
 import HomeElement from './home-element'
 
diff --git a/components/icon-text.js b/components/icon-text.js
index be30d48..be3b406 100644
--- a/components/icon-text.js
+++ b/components/icon-text.js
@@ -2,7 +2,7 @@ import React from 'react'
 import { View } from 'react-native'
 import PropTypes from 'prop-types'
 
-import AppText from './app-text'
+import AppText from './common/app-text'
 
 import styles from '../styles'
 
diff --git a/components/license.js b/components/license.js
index b433063..fbe7928 100644
--- a/components/license.js
+++ b/components/license.js
@@ -1,11 +1,11 @@
 import React from 'react'
 import PropTypes from 'prop-types'
 import { ScrollView, View, BackHandler } from 'react-native'
-import AppText from './app-text'
+import AppText from './common/app-text'
 import { shared } from '../i18n/en/labels'
 import settingsLabels from '../i18n/en/settings'
 import styles,{secondaryColor} from '../styles'
-import Button from './button'
+import Button from './common/button'
 import { saveLicenseFlag } from '../local-storage'
 
 const labels = settingsLabels.license
diff --git a/components/password-prompt.js b/components/password-prompt.js
index b2b7af4..152b93b 100644
--- a/components/password-prompt.js
+++ b/components/password-prompt.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types'
 import { View, TextInput, TouchableOpacity, Alert } from 'react-native'
 import nodejs from 'nodejs-mobile-react-native'
 import { saveEncryptionFlag } from '../local-storage'
-import AppText from './app-text'
+import AppText from './common/app-text'
 import Header from './header'
 import styles from '../styles'
 import { passwordPrompt as labels, shared, menuTitles } from '../i18n/en/labels'
diff --git a/components/settings/about.js b/components/settings/about.js
index f5be4c4..5d289f1 100644
--- a/components/settings/about.js
+++ b/components/settings/about.js
@@ -1,9 +1,9 @@
 import React, { Component } from 'react'
 import { ScrollView } from 'react-native'
-import AppText from '../app-text'
+import AppText from '../common/app-text'
 import labels from '../../i18n/en/settings'
 import links from '../../i18n/en/links'
-import FramedSegment from '../framed-segment'
+import FramedSegment from '../common/framed-segment'
 
 export default class AboutSection extends Component {
   render() {
diff --git a/components/settings/data-management/index.js b/components/settings/data-management/index.js
index bf32d6d..ff67c4d 100644
--- a/components/settings/data-management/index.js
+++ b/components/settings/data-management/index.js
@@ -1,8 +1,8 @@
 import React, { Component } from 'react'
 import { ScrollView, View } from 'react-native'
-import AppText from '../../app-text'
-import FramedSegment from '../../framed-segment'
-import AppLoadingView from '../../app-loading'
+import AppText from '../../common/app-text'
+import FramedSegment from '../../common/framed-segment'
+import AppLoadingView from '../../common/app-loading'
 import SettingsButton from '../shared/settings-button'
 import { openImportDialog, getFileContent, importData } from './import-dialog'
 import openShareDialogAndExport from './export-dialog'
diff --git a/components/settings/license.js b/components/settings/license.js
index 7091882..7821edd 100644
--- a/components/settings/license.js
+++ b/components/settings/license.js
@@ -1,6 +1,6 @@
 import React, { Component } from 'react'
 import { View, ScrollView } from 'react-native'
-import AppText from '../app-text'
+import AppText from '../common/app-text'
 import styles from '../../styles/index'
 import labels from '../../i18n/en/settings'
 
diff --git a/components/settings/nfp-settings/index.js b/components/settings/nfp-settings/index.js
index 423f8e7..2c077bb 100644
--- a/components/settings/nfp-settings/index.js
+++ b/components/settings/nfp-settings/index.js
@@ -4,8 +4,8 @@ import {
 } from 'react-native'
 import styles from '../../../styles'
 import labels from '../../../i18n/en/settings'
-import AppText from '../../app-text'
-import FramedSegment from '../../framed-segment'
+import AppText from '../../common/app-text'
+import FramedSegment from '../../common/framed-segment'
 import TempSlider from './temp-slider'
 import UseCervixSetting from './use-cervix'
 import Icon from 'react-native-vector-icons/Entypo'
diff --git a/components/settings/nfp-settings/temp-slider.js b/components/settings/nfp-settings/temp-slider.js
index ecccaf4..2def5c4 100644
--- a/components/settings/nfp-settings/temp-slider.js
+++ b/components/settings/nfp-settings/temp-slider.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react'
 import { View } from 'react-native'
 import Slider from '@ptomasroos/react-native-multi-slider'
-import AppText from '../../app-text'
+import AppText from '../../common/app-text'
 import {
   scaleObservable,
   saveTempScale,
diff --git a/components/settings/nfp-settings/use-cervix.js b/components/settings/nfp-settings/use-cervix.js
index 2bb9ff9..1e38682 100644
--- a/components/settings/nfp-settings/use-cervix.js
+++ b/components/settings/nfp-settings/use-cervix.js
@@ -3,7 +3,7 @@ import {
   View,
   Switch
 } from 'react-native'
-import AppText from '../../app-text'
+import AppText from '../../common/app-text'
 import {
   useCervixObservable,
   saveUseCervix
diff --git a/components/settings/password/enter-new-password.js b/components/settings/password/enter-new-password.js
index cba3a11..cf884bb 100644
--- a/components/settings/password/enter-new-password.js
+++ b/components/settings/password/enter-new-password.js
@@ -3,7 +3,7 @@ import { View } from 'react-native'
 import nodejs from 'nodejs-mobile-react-native'
 
 import { requestHash, changeEncryptionAndRestartApp } from '../../../db'
-import AppText from '../../app-text'
+import AppText from '../../common/app-text'
 import PasswordField from '../shared/password-field'
 import SettingsButton from '../shared/settings-button'
 
diff --git a/components/settings/password/index.js b/components/settings/password/index.js
index 08406a4..0c874e2 100644
--- a/components/settings/password/index.js
+++ b/components/settings/password/index.js
@@ -3,8 +3,8 @@ import { ScrollView } from 'react-native'
 import CreatePassword from './create'
 import ChangePassword from './update'
 import DeletePassword from './delete'
-import FramedSegment from '../../framed-segment'
-import AppText from '../../app-text'
+import FramedSegment from '../../common/framed-segment'
+import AppText from '../../common/app-text'
 import {
   hasEncryptionObservable
 } from '../../../local-storage'
diff --git a/components/settings/reminders/index.js b/components/settings/reminders/index.js
index 93425af..10c844a 100644
--- a/components/settings/reminders/index.js
+++ b/components/settings/reminders/index.js
@@ -2,7 +2,7 @@ import React, { Component } from 'react'
 import {
   ScrollView,
 } from 'react-native'
-import FramedSegment from '../../framed-segment'
+import FramedSegment from '../../common/framed-segment'
 import TempReminderPicker from './temp-reminder-picker'
 import PeriodReminderPicker from './period-reminder'
 
diff --git a/components/settings/reminders/period-reminder.js b/components/settings/reminders/period-reminder.js
index f7e177c..6a07ffc 100644
--- a/components/settings/reminders/period-reminder.js
+++ b/components/settings/reminders/period-reminder.js
@@ -3,7 +3,7 @@ import {
   View,
   Switch
 } from 'react-native'
-import AppText from '../../app-text'
+import AppText from '../../common/app-text'
 import {
   periodReminderObservable,
   savePeriodReminder
diff --git a/components/settings/reminders/temp-reminder-picker.js b/components/settings/reminders/temp-reminder-picker.js
index a481d61..b35b0c1 100644
--- a/components/settings/reminders/temp-reminder-picker.js
+++ b/components/settings/reminders/temp-reminder-picker.js
@@ -5,7 +5,7 @@ import {
   Switch
 } from 'react-native'
 import DateTimePicker from 'react-native-modal-datetime-picker-nevo'
-import AppText from '../../app-text'
+import AppText from '../../common/app-text'
 import {
   tempReminderObservable,
   saveTempReminder
diff --git a/components/settings/settings-menu.js b/components/settings/settings-menu.js
index f6b6bc2..9f511cf 100644
--- a/components/settings/settings-menu.js
+++ b/components/settings/settings-menu.js
@@ -9,7 +9,7 @@ import styles from '../../styles/index'
 
 import settingsLabels from '../../i18n/en/settings'
 
-import AppText from '../app-text'
+import AppText from '../common/app-text'
 
 const labels = settingsLabels.menuTitles
 
diff --git a/components/settings/shared/password-field.js b/components/settings/shared/password-field.js
index 7937b66..d22fdd1 100644
--- a/components/settings/shared/password-field.js
+++ b/components/settings/shared/password-field.js
@@ -1,6 +1,6 @@
 import React from 'react'
 import PropTypes from 'prop-types'
-import AppTextInput from '../../app-text-input'
+import AppTextInput from '../../common/app-text-input'
 
 import styles from '../../../styles'
 
diff --git a/components/settings/shared/settings-button.js b/components/settings/shared/settings-button.js
index 94aa210..93af5f2 100644
--- a/components/settings/shared/settings-button.js
+++ b/components/settings/shared/settings-button.js
@@ -2,7 +2,7 @@ import React from 'react'
 import PropTypes from 'prop-types'
 
 import { TouchableOpacity } from 'react-native'
-import AppText from '../../app-text'
+import AppText from '../../common/app-text'
 import styles from '../../../styles'
 
 const SettingsButton = ({ children, style, secondary, ...props }) => {
diff --git a/components/stats.js b/components/stats.js
index 2488510..3cae29b 100644
--- a/components/stats.js
+++ b/components/stats.js
@@ -8,8 +8,8 @@ import styles from '../styles/index'
 import cycleModule from '../lib/cycle'
 import {getCycleLengthStats as getCycleInfo} from '../lib/cycle-length'
 import {stats as labels} from '../i18n/en/labels'
-import AppText from './app-text'
-import FramedSegment from './framed-segment'
+import AppText from './common/app-text'
+import FramedSegment from './common/framed-segment'
 
 export default class Stats extends Component {
   render() {