diff --git a/cmd/client/advanced.go b/cmd/advanced.go
similarity index 100%
rename from cmd/client/advanced.go
rename to cmd/advanced.go
diff --git a/cmd/client/location.go b/cmd/location.go
similarity index 100%
rename from cmd/client/location.go
rename to cmd/location.go
diff --git a/cmd/client/main.go b/cmd/main.go
similarity index 87%
rename from cmd/client/main.go
rename to cmd/main.go
index 5b32529..ce6e1c9 100644
--- a/cmd/client/main.go
+++ b/cmd/main.go
@@ -94,19 +94,18 @@ func main() {
 		}
 		option = strings.TrimSuffix(input, "\n")
 
-		// Check user input
-		if option == "1" || option == "" {
-			getLocation(&app)
-			getCurrent(&app)
-			printWeather(&app)
-		} else if option == "2" {
-			advancedMenu(&app)
-		} else if option == "0" {
-			return
-		} else {
-			fmt.Print("\nOops! An error occurred, please choose a valid option.\n\n")
-		}
-
+	}
+	// Check user input
+	if option == "1" || option == "" {
+		getLocation(&app)
+		getCurrent(&app)
+		printWeather(&app)
+	} else if option == "2" {
+		advancedMenu(&app)
+	} else if option == "0" {
+		return
+	} else {
+		fmt.Print("\nOops! An error occurred, please choose a valid option.\n\n")
 	}
 
 }
diff --git a/cmd/client/render.go b/cmd/render.go
similarity index 100%
rename from cmd/client/render.go
rename to cmd/render.go
diff --git a/cmd/client/weather.go b/cmd/weather.go
similarity index 100%
rename from cmd/client/weather.go
rename to cmd/weather.go