diff --git a/using_bottom_nav_bar/lib/main.dart b/using_bottom_nav_bar/lib/main.dart
index ff9835d..d4ebb31 100644
--- a/using_bottom_nav_bar/lib/main.dart
+++ b/using_bottom_nav_bar/lib/main.dart
@@ -1,8 +1,7 @@
 import 'package:flutter/material.dart';
-
-import './FirstTab.dart' as first_tab;
-import './SecondTab.dart' as second_tab;
-import './ThirdTab.dart' as third_tab;
+import 'package:using_bottom_nav_bar/tabs/first.dart';
+import 'package:using_bottom_nav_bar/tabs/second.dart';
+import 'package:using_bottom_nav_bar/tabs/third.dart';
 
 void main() {
   runApp(new MaterialApp(
@@ -50,11 +49,7 @@ class MyHomeState extends State<MyHome> with SingleTickerProviderStateMixin {
       // Set the TabBar view as the body of the Scaffold
       body: new TabBarView(
         // Add tabs as widgets
-        children: <Widget>[
-          new first_tab.First(),
-          new second_tab.Second(),
-          new third_tab.Third()
-        ],
+        children: <Widget>[new FirstTab(), new SecondTab(), new ThirdTab()],
         // set the controller
         controller: controller,
       ),
diff --git a/using_bottom_nav_bar/lib/FirstTab.dart b/using_bottom_nav_bar/lib/tabs/first.dart
similarity index 94%
rename from using_bottom_nav_bar/lib/FirstTab.dart
rename to using_bottom_nav_bar/lib/tabs/first.dart
index f99a0d4..e6fa53b 100644
--- a/using_bottom_nav_bar/lib/FirstTab.dart
+++ b/using_bottom_nav_bar/lib/tabs/first.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 
-class First extends StatelessWidget {
+class FirstTab extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return new Scaffold(
diff --git a/using_bottom_nav_bar/lib/SecondTab.dart b/using_bottom_nav_bar/lib/tabs/second.dart
similarity index 94%
rename from using_bottom_nav_bar/lib/SecondTab.dart
rename to using_bottom_nav_bar/lib/tabs/second.dart
index fd606a1..1c468c1 100644
--- a/using_bottom_nav_bar/lib/SecondTab.dart
+++ b/using_bottom_nav_bar/lib/tabs/second.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 
-class Second extends StatelessWidget {
+class SecondTab extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return new Scaffold(
diff --git a/using_bottom_nav_bar/lib/ThirdTab.dart b/using_bottom_nav_bar/lib/tabs/third.dart
similarity index 94%
rename from using_bottom_nav_bar/lib/ThirdTab.dart
rename to using_bottom_nav_bar/lib/tabs/third.dart
index 0c4af3c..76fd7c8 100644
--- a/using_bottom_nav_bar/lib/ThirdTab.dart
+++ b/using_bottom_nav_bar/lib/tabs/third.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 
-class Third extends StatelessWidget {
+class ThirdTab extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return new Scaffold(