diff --git a/main/build.gradle b/build.gradle
similarity index 79%
rename from main/build.gradle
rename to build.gradle
index 3b4e1c3..5663819 100644
--- a/main/build.gradle
+++ b/build.gradle
@@ -1,10 +1,10 @@
 group 'com.nafeezabrar'
-version '1.0-SNAPSHOT'
+version '0.0.0-Alpha-Testing'
 
 apply plugin: 'java'
 apply plugin: 'application'
 
-mainClassName = "com.nafeezabrar.mqtt.client.Main"
+mainClassName = "Main"
 
 repositories {
     mavenCentral()
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index ca78035..6ffa237 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/settings.gradle b/settings.gradle
index 955e56a..872015f 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,4 +1,4 @@
-include 'main'
+rootProject.name = 'mqtt-client'
 include 'ui'
 include 'core'
 include 'paho-mqtt'
diff --git a/main/src/main/java/com/nafeezabrar/mqtt/client/Main.java b/src/main/java/Main.java
similarity index 77%
rename from main/src/main/java/com/nafeezabrar/mqtt/client/Main.java
rename to src/main/java/Main.java
index 0ddf7aa..a457963 100644
--- a/main/src/main/java/com/nafeezabrar/mqtt/client/Main.java
+++ b/src/main/java/Main.java
@@ -1,5 +1,5 @@
-package com.nafeezabrar.mqtt.client;
-
+import com.nafeezabrar.mqtt.client.MqttClient;
+import com.nafeezabrar.mqtt.client.PahoMqttClientWrapper;
 import com.nafeezabrar.mqtt.client.conversion.AnySeparatorStringToBytesConverter;
 import com.nafeezabrar.mqtt.client.conversion.BytesToStringConverter;
 import com.nafeezabrar.mqtt.client.conversion.DecimalColonSeparatorBytesToStringConverter;
@@ -8,23 +8,24 @@
 import com.nafeezabrar.mqtt.client.ui.MqttClientWindow;
 import com.nafeezabrar.mqtt.client.ui.UiApplication;
 
+import java.io.IOException;
 import java.util.UUID;
 
 public class Main {
 
-    public static void main(String[] args) {
+    public static void main(String[] args) throws IOException {
         String serverURI = "tcp://iot.eclipse.org:1883";
         String clientId = UUID.randomUUID().toString();
+        MqttClient mqttClient = new PahoMqttClientWrapper(serverURI, clientId);
 
         UiApplication.viewActivatedListener = () -> {
             MqttClientWindow mqttClientWindow = UiApplication.ActualWindow;
             StringToBytesConverter stringToBytesConverter = new AnySeparatorStringToBytesConverter();
             BytesToStringConverter bytesToStringConverter = new DecimalColonSeparatorBytesToStringConverter();
-            MqttClient mqttClient = new PahoMqttClientWrapper(serverURI, clientId);
             MqttClientWindowPresenter mqttClientWindowPresenter = new MqttClientWindowPresenter(mqttClientWindow, stringToBytesConverter, bytesToStringConverter, mqttClient);
             mqttClientWindowPresenter.initialize();
         };
-
-        UiApplication.run(args);
+        UiApplication.run(args, (Class) Main.class);
+        mqttClient.close();
     }
 }
diff --git a/main/src/main/resources/main.fxml b/src/main/java/com/nafeezabrar/mqtt/client/main.fxml
similarity index 100%
rename from main/src/main/resources/main.fxml
rename to src/main/java/com/nafeezabrar/mqtt/client/main.fxml
diff --git a/src/main/resources/main.fxml b/src/main/resources/main.fxml
new file mode 100644
index 0000000..f02d5b2
--- /dev/null
+++ b/src/main/resources/main.fxml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.ListView?>
+<?import javafx.scene.control.TextArea?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.AnchorPane?>
+
+<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="631.0" xmlns="http://javafx.com/javafx/8.0.65" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.nafeezabrar.mqtt.client.ui.controllers.MainController">
+    <children>
+        <Label layoutX="23.0" layoutY="37.0" text="Topic" />
+        <TextField fx:id="topicTextField" layoutX="99.0" layoutY="32.0" prefHeight="27.0" prefWidth="286.0" promptText="Topic of sending message" />
+        <Label layoutX="23.0" layoutY="89.0" text="Message" />
+        <TextField fx:id="messageTextField" layoutX="99.0" layoutY="84.0" prefHeight="27.0" prefWidth="286.0" promptText="Message to send" />
+        <Button fx:id="sendButton" layoutX="335.0" layoutY="124.0" mnemonicParsing="false" onAction="#sendButtonAction" text="Send" />
+      <Label layoutX="23.0" layoutY="183.0" text="Topic Filters" />
+      <TextArea fx:id="topicFiltersTextArea" layoutX="23.0" layoutY="216.0" prefHeight="112.0" prefWidth="361.0" promptText="Topics to subscribed" />
+      <Button fx:id="subscribeButton" layoutX="305.0" layoutY="335.0" mnemonicParsing="false" onAction="#subscribedButtonAction" text="Subscribe" />
+      <ListView fx:id="receivedMessagesListView" layoutX="403.0" layoutY="17.0" prefHeight="366.0" prefWidth="208.0" />
+    </children>
+</AnchorPane>
diff --git a/ui/src/main/java/com/nafeezabrar/mqtt/client/ui/UiApplication.java b/ui/src/main/java/com/nafeezabrar/mqtt/client/ui/UiApplication.java
index 83e1996..9dca612 100644
--- a/ui/src/main/java/com/nafeezabrar/mqtt/client/ui/UiApplication.java
+++ b/ui/src/main/java/com/nafeezabrar/mqtt/client/ui/UiApplication.java
@@ -6,17 +6,17 @@
 import com.nafeezabrar.mqtt.client.ui.libs.ViewRenderer;
 import com.nafeezabrar.mqtt.client.ui.libs.ViewSwitcher;
 import javafx.application.Application;
-import javafx.application.Platform;
 import javafx.stage.Stage;
 
 public class UiApplication extends Application {
 
     public static MqttClientWindow ActualWindow;
     public static ViewActivatedListener viewActivatedListener;
+    private static Class loaderClass;
 
     @Override
     public void start(Stage primaryStage) throws Exception {
-        SceneLoader sceneLoader = new SceneLoader();
+        SceneLoader sceneLoader = new SceneLoader(loaderClass);
         SceneFactory sceneFactory = new SceneFactory();
         ViewRenderer viewRender = new ViewRenderer(primaryStage, sceneLoader, sceneFactory);
         ViewSwitcher viewSwitcher = new ViewSwitcher(viewRender);
@@ -25,7 +25,8 @@ public void start(Stage primaryStage) throws Exception {
         primaryStage.show();
     }
 
-    public static void run(String[] args) {
+    public static void run(String[] args, Class loaderClass) {
+        UiApplication.loaderClass = loaderClass;
         launch(args);
     }
 
diff --git a/ui/src/main/java/com/nafeezabrar/mqtt/client/ui/libs/SceneLoader.java b/ui/src/main/java/com/nafeezabrar/mqtt/client/ui/libs/SceneLoader.java
index 2389e77..a55214b 100755
--- a/ui/src/main/java/com/nafeezabrar/mqtt/client/ui/libs/SceneLoader.java
+++ b/ui/src/main/java/com/nafeezabrar/mqtt/client/ui/libs/SceneLoader.java
@@ -7,9 +7,15 @@
 
 
 public class SceneLoader {
+    private Class loaderClass;
+
+    public SceneLoader(Class loaderClass) {
+        this.loaderClass = loaderClass;
+    }
+
     public Parent loadView(String fxmlFileName) {
         try {
-            return FXMLLoader.load(getClass().getResource(fxmlFileName));
+            return FXMLLoader.load(loaderClass.getResource(fxmlFileName));
         } catch (IOException e) {
             e.printStackTrace();
             return null;
diff --git a/ui/src/main/java/com/nafeezabrar/mqtt/client/ui/libs/ViewSwitcher.java b/ui/src/main/java/com/nafeezabrar/mqtt/client/ui/libs/ViewSwitcher.java
index 24eaf49..a3bfe17 100755
--- a/ui/src/main/java/com/nafeezabrar/mqtt/client/ui/libs/ViewSwitcher.java
+++ b/ui/src/main/java/com/nafeezabrar/mqtt/client/ui/libs/ViewSwitcher.java
@@ -8,7 +8,7 @@ public ViewSwitcher(ViewRenderer renderer) {
     }
 
     public void switchToMainView() {
-        renderer.renderView("../../../../../../main.fxml", 950, 700);
+        renderer.renderView("main.fxml", 950, 700);
         renderer.setTitle("MQTT Client");
     }
 }