diff --git a/lib/bottom_menu_items.dart b/lib/bottom_menu_items.dart
index 3432a95..01f813c 100644
--- a/lib/bottom_menu_items.dart
+++ b/lib/bottom_menu_items.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'icons.dart';
+import 'package:stream_games/icons.dart';
 
 enum BottomMenu {
   games,
diff --git a/lib/item_description.dart b/lib/component/item_description.dart
similarity index 100%
rename from lib/item_description.dart
rename to lib/component/item_description.dart
diff --git a/lib/item_game_container.dart b/lib/component/item_game_container.dart
similarity index 91%
rename from lib/item_game_container.dart
rename to lib/component/item_game_container.dart
index fe43ec5..92b5d4d 100644
--- a/lib/item_game_container.dart
+++ b/lib/component/item_game_container.dart
@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 
-import 'model/game.dart';
-import "item_game_box.dart";
-import "page_game_details.dart";
+import 'package:stream_games/model/game.dart';
+import "package:stream_games/ui/item_game_box.dart";
+import "package:stream_games/page/page_game_details.dart";
 
 class GameContainerItem extends StatelessWidget {
   GameContainerItem(this.buildContext, this.game);
diff --git a/lib/item_header_game.dart b/lib/component/item_header_game.dart
similarity index 95%
rename from lib/item_header_game.dart
rename to lib/component/item_header_game.dart
index 9d7ffa8..5c81a91 100644
--- a/lib/item_header_game.dart
+++ b/lib/component/item_header_game.dart
@@ -1,10 +1,10 @@
 import 'package:flutter/material.dart';
 
-import 'icons.dart';
-import 'model/game.dart';
-import 'item_game_box.dart';
-import 'item_header_diagonal.dart';
-import 'item_rating.dart';
+import 'package:stream_games/icons.dart';
+import 'package:stream_games/model/game.dart';
+import 'package:stream_games/ui/item_game_box.dart';
+import 'package:stream_games/ui/item_header_diagonal.dart';
+import 'package:stream_games/ui/item_rating.dart';
 
 class GameDetailHeader extends StatelessWidget {
   GameDetailHeader(this.game);
diff --git a/lib/item_screenshot_container.dart b/lib/component/item_screenshot_container.dart
similarity index 92%
rename from lib/item_screenshot_container.dart
rename to lib/component/item_screenshot_container.dart
index 0f8ce11..0ad7491 100644
--- a/lib/item_screenshot_container.dart
+++ b/lib/component/item_screenshot_container.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 
-import 'item_image_height.dart';
+import 'package:stream_games/ui/item_image_height.dart';
 
 class ScreenshotContainerItem extends StatelessWidget {
   ScreenshotContainerItem(this.buildContext, this.screenshot, {this.height = 400.0});
diff --git a/lib/scroll_horizontal_game.dart b/lib/controller/scroll_horizontal_game.dart
similarity index 84%
rename from lib/scroll_horizontal_game.dart
rename to lib/controller/scroll_horizontal_game.dart
index 9f67ebb..ec1e44c 100644
--- a/lib/scroll_horizontal_game.dart
+++ b/lib/controller/scroll_horizontal_game.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 
-import 'item_game_container.dart';
-import 'model/game.dart';
+import 'package:stream_games/component/item_game_container.dart';
+import 'package:stream_games/model/game.dart';
 
 class HorizontalGameController extends StatelessWidget {
   HorizontalGameController(this.gameItems);
diff --git a/lib/scroll_horizontal_screenshots.dart b/lib/controller/scroll_horizontal_screenshots.dart
similarity index 90%
rename from lib/scroll_horizontal_screenshots.dart
rename to lib/controller/scroll_horizontal_screenshots.dart
index d800709..50c259c 100644
--- a/lib/scroll_horizontal_screenshots.dart
+++ b/lib/controller/scroll_horizontal_screenshots.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 
-import 'item_screenshot_container.dart';
+import 'package:stream_games/component/item_screenshot_container.dart';
 
 class HorizontalScreenshotController extends StatelessWidget {
   HorizontalScreenshotController(this.screenshots);
diff --git a/lib/main.dart b/lib/main.dart
index 8c30205..896c069 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 
-import 'page_main.dart';
-import 'themes.dart';
+import 'package:stream_games/page/page_main.dart';
+import 'package:stream_games/themes.dart';
 
 void main() => runApp(new FlutterGames());
 
diff --git a/lib/model/repository.dart b/lib/model/repository.dart
index 85a4a6e..0111685 100644
--- a/lib/model/repository.dart
+++ b/lib/model/repository.dart
@@ -189,7 +189,7 @@ final Game mgsurvive = new Game(
   screenshots: [
     'https://raw.githubusercontent.com/searchy2/FlutterGames/master/images/screenshot/mgsurvive_1.jpg',
     'https://raw.githubusercontent.com/searchy2/FlutterGames/master/images/screenshot/mgsurvive_2.jpg',
-    'https://raw.githubusercontent.com/searchy2/FlutterGames/master/images/screenshot/mgsurvive_2.jpg',
+    'https://raw.githubusercontent.com/searchy2/FlutterGames/master/images/screenshot/mgsurvive_3.jpg',
     'https://raw.githubusercontent.com/searchy2/FlutterGames/master/images/screenshot/mgsurvive_4.jpg',
   ],
 );
diff --git a/lib/page_coming_soon.dart b/lib/page/page_coming_soon.dart
similarity index 100%
rename from lib/page_coming_soon.dart
rename to lib/page/page_coming_soon.dart
diff --git a/lib/page_game_details.dart b/lib/page/page_game_details.dart
similarity index 94%
rename from lib/page_game_details.dart
rename to lib/page/page_game_details.dart
index 6898ed6..4003d1b 100644
--- a/lib/page_game_details.dart
+++ b/lib/page/page_game_details.dart
@@ -1,10 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/cupertino.dart';
 
-import 'model/game.dart';
-import 'item_header_game.dart';
-import 'item_description.dart';
-import 'scroll_horizontal_screenshots.dart';
+import 'package:stream_games/model/game.dart';
+import 'package:stream_games/component/item_header_game.dart';
+import 'package:stream_games/component/item_description.dart';
+import 'package:stream_games/controller/scroll_horizontal_screenshots.dart';
 
 class GameDetailsPage extends StatefulWidget {
   GameDetailsPage(this.game, {Key key}) : super(key: key);
diff --git a/lib/page_games.dart b/lib/page/page_games.dart
similarity index 94%
rename from lib/page_games.dart
rename to lib/page/page_games.dart
index 5e5b82d..1dd8be9 100644
--- a/lib/page_games.dart
+++ b/lib/page/page_games.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 
-import 'scroll_horizontal_game.dart';
-import 'model/repository.dart';
+import 'package:stream_games/controller/scroll_horizontal_game.dart';
+import 'package:stream_games/model/repository.dart';
 
 class GamesPage extends StatefulWidget {
   GamesPage({Key key}) : super(key: key);
diff --git a/lib/page_main.dart b/lib/page/page_main.dart
similarity index 96%
rename from lib/page_main.dart
rename to lib/page/page_main.dart
index d5c33a8..fac3714 100644
--- a/lib/page_main.dart
+++ b/lib/page/page_main.dart
@@ -1,10 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/cupertino.dart';
 
-import 'bottom_menu_items.dart';
-import 'icons.dart';
-import 'page_games.dart';
-import 'page_coming_soon.dart';
+import 'package:stream_games/bottom_menu_items.dart';
+import 'package:stream_games/icons.dart';
+import 'package:stream_games/page/page_games.dart';
+import 'package:stream_games/page/page_coming_soon.dart';
 
 class MainPage extends StatefulWidget {
   @override
diff --git a/lib/page_movies.dart b/lib/page/page_movies.dart
similarity index 100%
rename from lib/page_movies.dart
rename to lib/page/page_movies.dart
diff --git a/lib/item_game_box.dart b/lib/ui/item_game_box.dart
similarity index 93%
rename from lib/item_game_box.dart
rename to lib/ui/item_game_box.dart
index 64a9390..88f9704 100644
--- a/lib/item_game_box.dart
+++ b/lib/ui/item_game_box.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 
-import 'model/game.dart';
+import 'package:stream_games/model/game.dart';
 
 class GameBoxItem extends StatelessWidget {
   static const IMAGE_RATIO = 1.50;
diff --git a/lib/item_header_diagonal.dart b/lib/ui/item_header_diagonal.dart
similarity index 100%
rename from lib/item_header_diagonal.dart
rename to lib/ui/item_header_diagonal.dart
diff --git a/lib/item_image_height.dart b/lib/ui/item_image_height.dart
similarity index 100%
rename from lib/item_image_height.dart
rename to lib/ui/item_image_height.dart
diff --git a/lib/item_image_width.dart b/lib/ui/item_image_width.dart
similarity index 100%
rename from lib/item_image_width.dart
rename to lib/ui/item_image_width.dart
diff --git a/lib/item_rating.dart b/lib/ui/item_rating.dart
similarity index 97%
rename from lib/item_rating.dart
rename to lib/ui/item_rating.dart
index 2832156..5e01663 100644
--- a/lib/item_rating.dart
+++ b/lib/ui/item_rating.dart
@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
-import 'model/game.dart';
+
+import 'package:stream_games/model/game.dart';
 
 class RatingInformation extends StatelessWidget {
   RatingInformation(this.game);