diff --git a/pom.xml b/pom.xml
index f60ab18f23092ff047a83a90c234ef069675a73d..b8cadd608dd86dd814d8898c9cd14d0d5ec742d0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>ch.hepia.etu</groupId>
+    <groupId>ch.hepia</groupId>
     <artifactId>tp4</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <name>HepiaNet</name>
@@ -52,7 +52,7 @@
                     </execution>
                 </executions>
                 <configuration>
-                    <mainClass>ch.hepia.etu.socialnetwork.Main</mainClass>
+                    <mainClass>ch.hepia.Main</mainClass>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/src/main/java/ch/hepia/etu/socialnetwork/Main.java b/src/main/java/ch/hepia/Main.java
similarity index 94%
rename from src/main/java/ch/hepia/etu/socialnetwork/Main.java
rename to src/main/java/ch/hepia/Main.java
index d1924c0503e06092609475fc35be502770fec54a..e7dbfaacf533303364b3e784b94015b1a9475412 100644
--- a/src/main/java/ch/hepia/etu/socialnetwork/Main.java
+++ b/src/main/java/ch/hepia/Main.java
@@ -1,4 +1,4 @@
-package ch.hepia.etu.socialnetwork;
+package ch.hepia;
 
 import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
diff --git a/src/main/java/ch/hepia/etu/socialnetwork/ui/ConnectionController.java b/src/main/java/ch/hepia/ui/ConnectionController.java
similarity index 50%
rename from src/main/java/ch/hepia/etu/socialnetwork/ui/ConnectionController.java
rename to src/main/java/ch/hepia/ui/ConnectionController.java
index 6aaa1b94e3986c0e2f6cf06fd8d11fa32d9bc124..f7e1c7af86fe481c64d907268677ac370bc07112 100644
--- a/src/main/java/ch/hepia/etu/socialnetwork/ui/ConnectionController.java
+++ b/src/main/java/ch/hepia/ui/ConnectionController.java
@@ -1,4 +1,5 @@
-package ch.hepia.etu.socialnetwork.ui;
+package ch.hepia.ui;
 
 public class ConnectionController {
+
 }
diff --git a/src/main/resources/fxml/ConnectionWindow.fxml b/src/main/resources/fxml/ConnectionWindow.fxml
index 6201bd3a6f22ac8fa8076340868b728f2520c67b..c08acfafec892cc6294beaa4701a9d75259b3bc8 100644
--- a/src/main/resources/fxml/ConnectionWindow.fxml
+++ b/src/main/resources/fxml/ConnectionWindow.fxml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.geometry.*?>
-<?import javafx.scene.shape.*?>
-<?import javafx.scene.text.*?>
-<?import javafx.scene.control.*?>
 <?import java.lang.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.text.*?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.ProgressIndicator?>
 <?import javafx.scene.layout.*?>
+<?import javafx.scene.text.Font?>
 
-<BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="565.0" prefWidth="1000.0" style="-fx-background-color: #bababa;" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+<BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="565.0" prefWidth="1000.0" style="-fx-background-color: #bababa;" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.hepia.ui.ConnectionController">
    <top>
       <Label alignment="CENTER" contentDisplay="CENTER" prefHeight="80.0" prefWidth="1000.0" style="-fx-background-color: #35B1EE;" text="AppNameLabel" textAlignment="CENTER" textFill="WHITE" BorderPane.alignment="CENTER">
          <font>