diff --git a/lib/Locales/Africa.dart b/lib/Locales/africa.dart
similarity index 99%
rename from lib/Locales/Africa.dart
rename to lib/Locales/africa.dart
index 4fc0fb2..8ec7cb0 100644
--- a/lib/Locales/Africa.dart
+++ b/lib/Locales/africa.dart
@@ -1,4 +1,4 @@
-import '../classes/location.dart';
+import 'package:jade_gui/classes/location.dart';
 
 List<Location> africa = [
   Location(
diff --git a/lib/Locales/America.dart b/lib/Locales/america.dart
similarity index 100%
rename from lib/Locales/America.dart
rename to lib/Locales/america.dart
diff --git a/lib/Locales/Antarctica.dart b/lib/Locales/antarctica.dart
similarity index 96%
rename from lib/Locales/Antarctica.dart
rename to lib/Locales/antarctica.dart
index d845403..8d76013 100644
--- a/lib/Locales/Antarctica.dart
+++ b/lib/Locales/antarctica.dart
@@ -1,4 +1,4 @@
-import '../classes/location.dart';
+import 'package:jade_gui/classes/location.dart';
 
 List<Location> antarctica = [
   Location(
diff --git a/lib/Locales/Arctic.dart b/lib/Locales/arctic.dart
similarity index 72%
rename from lib/Locales/Arctic.dart
rename to lib/Locales/arctic.dart
index 570c065..79a8dce 100644
--- a/lib/Locales/Arctic.dart
+++ b/lib/Locales/arctic.dart
@@ -1,4 +1,4 @@
-import '../classes/location.dart';
+import 'package:jade_gui/classes/location.dart';
 
 List<Location> arctic = [
   Location(
diff --git a/lib/Locales/Asia.dart b/lib/Locales/asia.dart
similarity index 99%
rename from lib/Locales/Asia.dart
rename to lib/Locales/asia.dart
index 04590a8..732da73 100644
--- a/lib/Locales/Asia.dart
+++ b/lib/Locales/asia.dart
@@ -1,4 +1,4 @@
-import '../classes/location.dart';
+import 'package:jade_gui/classes/location.dart';
 
 List<Location> asia = [
   Location(
diff --git a/lib/Locales/Atlantic.dart b/lib/Locales/atlantic.dart
similarity index 96%
rename from lib/Locales/Atlantic.dart
rename to lib/Locales/atlantic.dart
index c25e150..fbce600 100644
--- a/lib/Locales/Atlantic.dart
+++ b/lib/Locales/atlantic.dart
@@ -1,4 +1,4 @@
-import '../classes/location.dart';
+import 'package:jade_gui/classes/location.dart';
 
 List<Location> atlantic = [
   Location(
diff --git a/lib/Locales/Australia.dart b/lib/Locales/australia.dart
similarity index 97%
rename from lib/Locales/Australia.dart
rename to lib/Locales/australia.dart
index 2b15453..eee0787 100644
--- a/lib/Locales/Australia.dart
+++ b/lib/Locales/australia.dart
@@ -1,4 +1,4 @@
-import '../classes/location.dart';
+import 'package:jade_gui/classes/location.dart';
 
 List<Location> australia = [
   Location(
diff --git a/lib/Locales/Brazil.dart b/lib/Locales/brazil.dart
similarity index 81%
rename from lib/Locales/Brazil.dart
rename to lib/Locales/brazil.dart
index 877a119..1fdf952 100644
--- a/lib/Locales/Brazil.dart
+++ b/lib/Locales/brazil.dart
@@ -1,4 +1,4 @@
-import '../classes/location.dart';
+import 'package:jade_gui/classes/location.dart';
 
 List<Location> brazil = [
   Location(
diff --git a/lib/Locales/Canada.dart b/lib/Locales/canada.dart
similarity index 93%
rename from lib/Locales/Canada.dart
rename to lib/Locales/canada.dart
index d8a2a16..da5bf98 100644
--- a/lib/Locales/Canada.dart
+++ b/lib/Locales/canada.dart
@@ -1,4 +1,4 @@
-import '../classes/location.dart';
+import 'package:jade_gui/classes/location.dart';
 
 List<Location> canada = [
   Location(
diff --git a/lib/Locales/Chile.dart b/lib/Locales/chile.dart
similarity index 82%
rename from lib/Locales/Chile.dart
rename to lib/Locales/chile.dart
index 796fca3..709e7f4 100644
--- a/lib/Locales/Chile.dart
+++ b/lib/Locales/chile.dart
@@ -1,4 +1,4 @@
-import '../classes/location.dart';
+import 'package:jade_gui/classes/location.dart';
 
 List<Location> chile = [
   Location(
diff --git a/lib/Locales/Europe.dart b/lib/Locales/europe.dart
similarity index 99%
rename from lib/Locales/Europe.dart
rename to lib/Locales/europe.dart
index 9ea6aca..d47b207 100644
--- a/lib/Locales/Europe.dart
+++ b/lib/Locales/europe.dart
@@ -1,4 +1,4 @@
-import '../classes/location.dart';
+import 'package:jade_gui/classes/location.dart';
 
 List<Location> europe = [
   Location(
diff --git a/lib/Locales/Indian.dart b/lib/Locales/indian.dart
similarity index 95%
rename from lib/Locales/Indian.dart
rename to lib/Locales/indian.dart
index 0ff62be..62d5a9c 100644
--- a/lib/Locales/Indian.dart
+++ b/lib/Locales/indian.dart
@@ -1,4 +1,4 @@
-import '../classes/location.dart';
+import 'package:jade_gui/classes/location.dart';
 
 List<Location> indian = [
   Location(
diff --git a/lib/Locales/locales.dart b/lib/Locales/locales.dart
index a50df51..0898ee4 100644
--- a/lib/Locales/locales.dart
+++ b/lib/Locales/locales.dart
@@ -12,7 +12,7 @@ import 'Indian.dart';
 import 'Mexico.dart';
 import 'Pacific.dart';
 import 'US.dart';
-import '../classes/location.dart';
+import 'package:jade_gui/classes/location.dart';
 
 class Local {
   List<Location> location = [Location()];
diff --git a/lib/Locales/Mexico.dart b/lib/Locales/mexico.dart
similarity index 86%
rename from lib/Locales/Mexico.dart
rename to lib/Locales/mexico.dart
index ae091dd..8af5f77 100644
--- a/lib/Locales/Mexico.dart
+++ b/lib/Locales/mexico.dart
@@ -1,4 +1,4 @@
-import '../classes/location.dart';
+import 'package:jade_gui/classes/location.dart';
 
 List<Location> mexico = [
   Location(
diff --git a/lib/Locales/Pacific.dart b/lib/Locales/pacific.dart
similarity index 98%
rename from lib/Locales/Pacific.dart
rename to lib/Locales/pacific.dart
index 01ab091..b255a12 100644
--- a/lib/Locales/Pacific.dart
+++ b/lib/Locales/pacific.dart
@@ -1,4 +1,4 @@
-import '../classes/location.dart';
+import 'package:jade_gui/classes/location.dart';
 
 List<Location> pacific = [
   Location(
diff --git a/lib/Locales/US.dart b/lib/Locales/us.dart
similarity index 95%
rename from lib/Locales/US.dart
rename to lib/Locales/us.dart
index 66d8156..662caf1 100644
--- a/lib/Locales/US.dart
+++ b/lib/Locales/us.dart
@@ -1,4 +1,4 @@
-import '../classes/location.dart';
+import 'package:jade_gui/classes/location.dart';
 
 List<Location> us = [
   Location(
diff --git a/lib/functions/locale.dart b/lib/functions/locale.dart
index 7ddf7f9..4c01aba 100644
--- a/lib/functions/locale.dart
+++ b/lib/functions/locale.dart
@@ -1,13 +1,12 @@
 import 'package:flutter/material.dart';
-import 'Region.dart';
-import 'location.dart';
+import 'package:jade_gui/functions/location/region.dart';
+import 'package:jade_gui/functions/location/location.dart';
 import 'package:jade_gui/Locales/locales.dart';
 
 Widget locale(next, nextPage, selectlocation, isnextpage) {
   Widget widget;
   selectlocation(getSelectedRegion());
   String selectedregion = getSelectedRegion();
-  print(selectedregion);
   if (isnextpage == false) {
     widget = region(nextPage, locations);
   } else {
diff --git a/lib/functions/location.dart b/lib/functions/location/location.dart
similarity index 98%
rename from lib/functions/location.dart
rename to lib/functions/location/location.dart
index f42dbfa..94f7632 100644
--- a/lib/functions/location.dart
+++ b/lib/functions/location/location.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
-import '../Locales/locales.dart';
-import '../classes/location.dart';
+import 'package:jade_gui/Locales/locales.dart';
+import 'package:jade_gui/classes/location.dart';
 
 Location choosenLocPack = Location();
 Widget locationTemplate(location, nextSlide) {
diff --git a/lib/functions/Region.dart b/lib/functions/location/region.dart
similarity index 100%
rename from lib/functions/Region.dart
rename to lib/functions/location/region.dart
diff --git a/lib/functions/welcome.dart b/lib/functions/welcome.dart
index f1602fd..7ac456e 100644
--- a/lib/functions/welcome.dart
+++ b/lib/functions/welcome.dart
@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:jade_gui/main.dart';
 
 Widget welcome(next) {
   return Container(
diff --git a/lib/main.dart b/lib/main.dart
index bb3d0ff..418d6f3 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -1,10 +1,7 @@
 import 'package:flutter/material.dart';
-import 'package:jade_gui/functions/Region.dart';
-import 'package:jade_gui/functions/location.dart';
+import 'package:jade_gui/functions/location/location.dart';
 import 'functions/welcome.dart';
 import 'functions/locale.dart';
-import 'classes/location.dart';
-//import 'Locales/locales.dart';
 
 void main() => runApp(
       const MaterialApp(