diff --git a/src/Card.js b/src/Card.js
index 21ea20e..ade987d 100644
--- a/src/Card.js
+++ b/src/Card.js
@@ -4,8 +4,8 @@ import { Image, StyleSheet } from 'react-native';
 import PropTypes from 'prop-types';
 // galio components
 import Block from './Block';
-import Text from './Text';
-import Icon from './Icon';
+import Text from './atomic/ions/Text';
+import Icon from './atomic/ions/Icon';
 import GalioTheme, { withGalio } from './theme';
 
 function Card({
diff --git a/src/Checkbox.js b/src/Checkbox.js
index db99967..57e4def 100644
--- a/src/Checkbox.js
+++ b/src/Checkbox.js
@@ -3,12 +3,12 @@ import React from 'react';
 import { View, TouchableOpacity, StyleSheet, Image } from 'react-native';
 import PropTypes from 'prop-types';
 // galio dependency
-import Icon from './Icon';
-import Text from './Text';
+import Icon from './atomic/ions/Icon';
+import Text from './atomic/ions/Text';
 import GalioTheme, { withGalio } from './theme';
 
 function Checkbox({
-  checkboxStyle, 
+  checkboxStyle,
   color,
   disabled,
   flexDirection,
@@ -62,7 +62,6 @@ function Checkbox({
 
   // adding the check icon
   function renderChecked() {
-
     if (checked) {
       return <Icon name={iconName} family={iconFamily} color={iconColor} size={iconSize} />;
     }
diff --git a/src/NavBar.js b/src/NavBar.js
index afcd2f0..154ea6a 100644
--- a/src/NavBar.js
+++ b/src/NavBar.js
@@ -4,8 +4,8 @@ import PropTypes from 'prop-types';
 
 // galio components
 import Block from './Block';
-import Text from './Text';
-import Icon from './Icon';
+import Text from './atomic/ions/Text';
+import Icon from './atomic/ions/Icon';
 import GalioTheme, { withGalio } from './theme';
 
 const { height } = Dimensions.get('screen');
@@ -47,12 +47,12 @@ function NavBar({
 
   function renderLeft() {
     if (!hideLeft) {
-      if (leftIconName || back && !left) {
+      if (leftIconName || (back && !left)) {
         return (
           <View style={[styles.left, leftStyle]}>
             <TouchableOpacity onPress={() => onLeftPress && onLeftPress()} hitSlop={leftHitSlop}>
               <Icon
-                family={leftIconFamily || "evilicons"}
+                family={leftIconFamily || 'evilicons'}
                 color={leftIconColor || theme.COLORS.ICON}
                 size={leftIconSize || theme.SIZES.BASE * 1.0625}
                 name={leftIconName || (back ? 'chevron-left' : 'navicon')}
diff --git a/src/Radio.js b/src/Radio.js
index 5a32d64..482a724 100644
--- a/src/Radio.js
+++ b/src/Radio.js
@@ -2,7 +2,7 @@ import React from 'react';
 import { View, TouchableOpacity, StyleSheet } from 'react-native';
 import PropTypes from 'prop-types';
 // G A L I O - D E P E N D E N C Y
-import Text from './Text';
+import Text from './atomic/ions/Text';
 import GalioTheme, { withGalio } from './theme';
 
 function Radio({
@@ -20,7 +20,7 @@ function Radio({
   theme,
 }) {
   const [checked, setChecked] = React.useState(initialValue);
-  
+
   // A D D I N G - R E Q U I R E D - S P A C E (S) - B A S E D - O N - F L E X - D I R E C T I O N
   function spaceAround(direction) {
     switch (direction) {
@@ -37,7 +37,6 @@ function Radio({
 
   // R E N D E R - L A B E L
   function renderLabel() {
-
     const labelStyles = [
       styles.textStyles,
       disabled && styles.disabledLabel,
@@ -58,7 +57,6 @@ function Radio({
     setChecked(current);
   }
 
-
   const containerStyles = [styles.container, flexDirection && { flexDirection }, containerStyle];
 
   const whichColor =
@@ -134,7 +132,7 @@ Radio.defaultProps = {
   initialValue: false,
   label: null,
   labelStyle: null,
-  onChange: () => { },
+  onChange: () => {},
   styles: {},
   theme: GalioTheme,
 };
diff --git a/src/Toast.js b/src/Toast.js
index 9358809..fc3b557 100644
--- a/src/Toast.js
+++ b/src/Toast.js
@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 import { Dimensions, StyleSheet, Animated, ViewPropTypes } from 'react-native';
 import PropTypes from 'prop-types';
 // galio components
-import Text from './Text';
+import Text from './atomic/ions/Text';
 import GalioTheme, { withGalio } from './theme';
 
 const { height } = Dimensions.get('screen');