diff --git a/chatto/.gitignore b/.gitignore similarity index 94% rename from chatto/.gitignore rename to .gitignore index b49e130..d930b7d 100644 --- a/chatto/.gitignore +++ b/.gitignore @@ -29,7 +29,6 @@ build/ ### VS Code ### .vscode/ -../vscode/ node_modules config diff --git a/chatto/.mvn/wrapper/MavenWrapperDownloader.java b/chatto/.mvn/wrapper/MavenWrapperDownloader.java deleted file mode 100644 index 72308aa..0000000 --- a/chatto/.mvn/wrapper/MavenWrapperDownloader.java +++ /dev/null @@ -1,114 +0,0 @@ -/* -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - - https://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. -*/ - -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.net.URL; -import java.nio.channels.Channels; -import java.nio.channels.ReadableByteChannel; -import java.util.Properties; - -public class MavenWrapperDownloader { - - /** - * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided. - */ - private static final String DEFAULT_DOWNLOAD_URL = - "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar"; - - /** - * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to - * use instead of the default one. - */ - private static final String MAVEN_WRAPPER_PROPERTIES_PATH = - ".mvn/wrapper/maven-wrapper.properties"; - - /** - * Path where the maven-wrapper.jar will be saved to. - */ - private static final String MAVEN_WRAPPER_JAR_PATH = - ".mvn/wrapper/maven-wrapper.jar"; - - /** - * Name of the property which should be used to override the default download url for the wrapper. - */ - private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl"; - - public static void main(String args[]) { - System.out.println("- Downloader started"); - File baseDirectory = new File(args[0]); - System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath()); - - // If the maven-wrapper.properties exists, read it and check if it contains a custom - // wrapperUrl parameter. - File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH); - String url = DEFAULT_DOWNLOAD_URL; - if(mavenWrapperPropertyFile.exists()) { - FileInputStream mavenWrapperPropertyFileInputStream = null; - try { - mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile); - Properties mavenWrapperProperties = new Properties(); - mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream); - url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url); - } catch (IOException e) { - System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'"); - } finally { - try { - if(mavenWrapperPropertyFileInputStream != null) { - mavenWrapperPropertyFileInputStream.close(); - } - } catch (IOException e) { - // Ignore ... - } - } - } - System.out.println("- Downloading from: : " + url); - - File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH); - if(!outputFile.getParentFile().exists()) { - if(!outputFile.getParentFile().mkdirs()) { - System.out.println( - "- ERROR creating output direcrory '" + outputFile.getParentFile().getAbsolutePath() + "'"); - } - } - System.out.println("- Downloading to: " + outputFile.getAbsolutePath()); - try { - downloadFileFromURL(url, outputFile); - System.out.println("Done"); - System.exit(0); - } catch (Throwable e) { - System.out.println("- Error downloading"); - e.printStackTrace(); - System.exit(1); - } - } - - private static void downloadFileFromURL(String urlString, File destination) throws Exception { - URL website = new URL(urlString); - ReadableByteChannel rbc; - rbc = Channels.newChannel(website.openStream()); - FileOutputStream fos = new FileOutputStream(destination); - fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE); - fos.close(); - rbc.close(); - } - -} diff --git a/chatto/.mvn/wrapper/maven-wrapper.jar b/chatto/.mvn/wrapper/maven-wrapper.jar deleted file mode 100644 index 01e6799..0000000 Binary files a/chatto/.mvn/wrapper/maven-wrapper.jar and /dev/null differ diff --git a/chatto/.mvn/wrapper/maven-wrapper.properties b/chatto/.mvn/wrapper/maven-wrapper.properties deleted file mode 100644 index cd0d451..0000000 --- a/chatto/.mvn/wrapper/maven-wrapper.properties +++ /dev/null @@ -1 +0,0 @@ -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.0/apache-maven-3.6.0-bin.zip diff --git a/chatto/src/main/java/org/ros/chatto/config/CustomCacheEventLogger.java b/chatto/src/main/java/org/ros/chatto/config/CustomCacheEventLogger.java deleted file mode 100644 index 2062c7d..0000000 --- a/chatto/src/main/java/org/ros/chatto/config/CustomCacheEventLogger.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.ros.chatto.config; - -import org.ehcache.event.CacheEvent; -import org.ehcache.event.CacheEventListener; - -import lombok.extern.slf4j.Slf4j; - -@Slf4j -public class CustomCacheEventLogger implements CacheEventListener { - - @Override - public void onEvent(CacheEvent cacheEvent) { - log.debug("custom Caching event {} key = {} old {} new {} ", cacheEvent.getType(), cacheEvent.getKey(), - cacheEvent.getOldValue(), cacheEvent.getNewValue()); - } -} diff --git a/chatto/src/main/java/org/ros/chatto/config/DBInitializerConfig.java b/chatto/src/main/java/org/ros/chatto/config/DBInitializerConfig.java deleted file mode 100644 index 594684f..0000000 --- a/chatto/src/main/java/org/ros/chatto/config/DBInitializerConfig.java +++ /dev/null @@ -1,33 +0,0 @@ -package org.ros.chatto.config; - -import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.context.annotation.PropertySource; -import org.springframework.stereotype.Component; - -import lombok.Getter; - -@Component -@EnableConfigurationProperties -@PropertySource(value = "classpath:queries.properties") -@Getter -public class DBInitializerConfig { - - private final String dbName; - - private final String numTablesQuery; - - private final String resetSessionsQuery; - - private final String clearTokensQuery; - - public DBInitializerConfig(@Value("${chatto.datasource.database-name}") String dbName, - @Value("${num-tables}") String numTablesQuery, @Value("${reset-sessions}") String resetSessionsQuery, - @Value("${clear-tokens}") String clearTokensQuery) { - this.dbName = dbName; - this.numTablesQuery = numTablesQuery; - this.resetSessionsQuery = resetSessionsQuery; - this.clearTokensQuery = clearTokensQuery; - } - -} \ No newline at end of file diff --git a/chatto/src/main/java/org/ros/chatto/config/DataSourceConfig.java b/chatto/src/main/java/org/ros/chatto/config/DataSourceConfig.java deleted file mode 100644 index f37db6a..0000000 --- a/chatto/src/main/java/org/ros/chatto/config/DataSourceConfig.java +++ /dev/null @@ -1,46 +0,0 @@ -package org.ros.chatto.config; - -import javax.sql.DataSource; - -import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.jdbc.DataSourceBuilder; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.stereotype.Component; - -import lombok.Getter; -import lombok.extern.slf4j.Slf4j; - -@Configuration -@Component - -// @ConfigurationProperties(prefix = "chatto.datasource") -@Getter -// @Setter -@Slf4j -public class DataSourceConfig { - - // jdbc:mysql://localhost:3306/chatto_db?useSSL=false - private final String DATASOURCE_URL = "jdbc:mysql://localhost:3306/%s?useSSL=false"; - - private final String username; - private final String password; - private final String databaseName; - - public DataSourceConfig(@Value("${chatto.datasource.username}") String username, - @Value("${chatto.datasource.password}") String password, - @Value("${chatto.datasource.database-name}") String databaseName) { - this.username = username; - this.password = password; - this.databaseName = databaseName; - } - - @Bean - public DataSource getDataSource() { - final DataSourceBuilder dataSourceBuilder = DataSourceBuilder.create(); - dataSourceBuilder.url(String.format(DATASOURCE_URL, databaseName)); - dataSourceBuilder.username(username); - dataSourceBuilder.password(password); - return dataSourceBuilder.build(); - } -} \ No newline at end of file diff --git a/chatto/src/main/java/org/ros/chatto/config/EhCacheConfig.java b/chatto/src/main/java/org/ros/chatto/config/EhCacheConfig.java deleted file mode 100644 index 6e53976..0000000 --- a/chatto/src/main/java/org/ros/chatto/config/EhCacheConfig.java +++ /dev/null @@ -1,10 +0,0 @@ -package org.ros.chatto.config; - - -import org.springframework.cache.annotation.EnableCaching; -import org.springframework.context.annotation.Configuration; - -@EnableCaching -@Configuration -public class EhCacheConfig { -} \ No newline at end of file diff --git a/config/application.properties b/config/application.properties deleted file mode 100644 index a63b63b..0000000 --- a/config/application.properties +++ /dev/null @@ -1,7 +0,0 @@ -## chatto DATASOURCE (DataSourceAutoConfiguration & DataSourceProperties) -chatto.datasource.url = jdbc:mysql://localhost:3306/chatto_db2?useSSL=false -chatto.datasource.username = chatto_user -chatto.datasource.password = password -chatto.datasource.database-name = chatto_db2 -website-url = 192.168.1.13 -test.bindAddress=192.168.1.106 diff --git a/chatto/eclipse-formatter.xml b/eclipse-formatter.xml similarity index 100% rename from chatto/eclipse-formatter.xml rename to eclipse-formatter.xml diff --git a/chatto/mvnw b/mvnw similarity index 100% rename from chatto/mvnw rename to mvnw diff --git a/chatto/mvnw.cmd b/mvnw.cmd similarity index 100% rename from chatto/mvnw.cmd rename to mvnw.cmd diff --git a/chatto/pom.xml b/pom.xml similarity index 100% rename from chatto/pom.xml rename to pom.xml diff --git a/chatto/src/main/java/META-INF/additional-spring-configuration-metadata.json b/src/main/java/META-INF/additional-spring-configuration-metadata.json similarity index 100% rename from chatto/src/main/java/META-INF/additional-spring-configuration-metadata.json rename to src/main/java/META-INF/additional-spring-configuration-metadata.json diff --git a/chatto/src/main/java/org/ros/chatto/BeanConfigurations.java b/src/main/java/org/ros/chatto/BeanConfigurations.java similarity index 100% rename from chatto/src/main/java/org/ros/chatto/BeanConfigurations.java rename to src/main/java/org/ros/chatto/BeanConfigurations.java diff --git a/chatto/src/main/java/org/ros/chatto/ChattoApplication.java b/src/main/java/org/ros/chatto/ChattoApplication.java similarity index 100% rename from chatto/src/main/java/org/ros/chatto/ChattoApplication.java rename to src/main/java/org/ros/chatto/ChattoApplication.java diff --git a/chatto/src/main/java/org/ros/chatto/RESTAuthenticationEntryPoint.java b/src/main/java/org/ros/chatto/RESTAuthenticationEntryPoint.java similarity index 100% rename from chatto/src/main/java/org/ros/chatto/RESTAuthenticationEntryPoint.java rename to src/main/java/org/ros/chatto/RESTAuthenticationEntryPoint.java diff --git a/chatto/src/main/java/org/ros/chatto/ServletInitializer.java b/src/main/java/org/ros/chatto/ServletInitializer.java similarity index 100% rename from chatto/src/main/java/org/ros/chatto/ServletInitializer.java rename to src/main/java/org/ros/chatto/ServletInitializer.java diff --git a/chatto/src/main/java/org/ros/chatto/WebConfig.java b/src/main/java/org/ros/chatto/WebConfig.java similarity index 100% rename from chatto/src/main/java/org/ros/chatto/WebConfig.java rename to src/main/java/org/ros/chatto/WebConfig.java diff --git a/chatto/src/main/java/org/ros/chatto/WebSecurityConfiguration.java b/src/main/java/org/ros/chatto/WebSecurityConfiguration.java similarity index 100% rename from chatto/src/main/java/org/ros/chatto/WebSecurityConfiguration.java rename to src/main/java/org/ros/chatto/WebSecurityConfiguration.java diff --git a/chatto/src/main/java/org/ros/chatto/captcha/CaptchaBehaviour.java b/src/main/java/org/ros/chatto/captcha/CaptchaBehaviour.java similarity index 100% rename from chatto/src/main/java/org/ros/chatto/captcha/CaptchaBehaviour.java rename to src/main/java/org/ros/chatto/captcha/CaptchaBehaviour.java diff --git a/chatto/src/main/java/org/ros/chatto/captcha/ManualCaptchaBehaviour.java b/src/main/java/org/ros/chatto/captcha/ManualCaptchaBehaviour.java similarity index 100% rename from chatto/src/main/java/org/ros/chatto/captcha/ManualCaptchaBehaviour.java rename to src/main/java/org/ros/chatto/captcha/ManualCaptchaBehaviour.java diff --git a/chatto/src/main/java/org/ros/chatto/captcha/SimpleCaptcha.java b/src/main/java/org/ros/chatto/captcha/SimpleCaptcha.java similarity index 100% rename from chatto/src/main/java/org/ros/chatto/captcha/SimpleCaptcha.java rename to src/main/java/org/ros/chatto/captcha/SimpleCaptcha.java diff --git a/chatto/src/main/java/org/ros/chatto/captcha/SimpleCaptchaBehavior.java b/src/main/java/org/ros/chatto/captcha/SimpleCaptchaBehavior.java similarity index 100% rename from chatto/src/main/java/org/ros/chatto/captcha/SimpleCaptchaBehavior.java rename to src/main/java/org/ros/chatto/captcha/SimpleCaptchaBehavior.java diff --git a/chatto/src/main/java/org/ros/chatto/captcha/WebCaptcha.java b/src/main/java/org/ros/chatto/captcha/WebCaptcha.java similarity index 100% rename from chatto/src/main/java/org/ros/chatto/captcha/WebCaptcha.java rename to src/main/java/org/ros/chatto/captcha/WebCaptcha.java diff --git a/chatto/src/main/java/org/ros/chatto/controller/AdminController.java b/src/main/java/org/ros/chatto/controller/AdminController.java similarity index 100% rename from chatto/src/main/java/org/ros/chatto/controller/AdminController.java rename to src/main/java/org/ros/chatto/controller/AdminController.java diff --git a/chatto/src/main/java/org/ros/chatto/controller/AdminRESTController.java b/src/main/java/org/ros/chatto/controller/AdminRESTController.java similarity index 100% rename from chatto/src/main/java/org/ros/chatto/controller/AdminRESTController.java rename to src/main/java/org/ros/chatto/controller/AdminRESTController.java diff --git a/chatto/src/main/java/org/ros/chatto/controller/ChatMessageController.java b/src/main/java/org/ros/chatto/controller/ChatMessageController.java similarity index 100% rename from chatto/src/main/java/org/ros/chatto/controller/ChatMessageController.java rename to src/main/java/org/ros/chatto/controller/ChatMessageController.java diff --git a/chatto/src/main/java/org/ros/chatto/controller/DemoRestController.java b/src/main/java/org/ros/chatto/controller/DemoRestController.java similarity index 100% rename from chatto/src/main/java/org/ros/chatto/controller/DemoRestController.java rename to src/main/java/org/ros/chatto/controller/DemoRestController.java diff --git a/chatto/src/main/java/org/ros/chatto/controller/Home.java b/src/main/java/org/ros/chatto/controller/Home.java similarity index 100% rename from chatto/src/main/java/org/ros/chatto/controller/Home.java rename to src/main/java/org/ros/chatto/controller/Home.java diff --git a/chatto/src/main/java/org/ros/chatto/controller/Login.java b/src/main/java/org/ros/chatto/controller/Login.java similarity index 100% rename from chatto/src/main/java/org/ros/chatto/controller/Login.java rename to src/main/java/org/ros/chatto/controller/Login.java diff --git a/chatto/src/main/java/org/ros/chatto/controller/RegistrationController.java b/src/main/java/org/ros/chatto/controller/RegistrationController.java similarity index 100% rename from chatto/src/main/java/org/ros/chatto/controller/RegistrationController.java rename to src/main/java/org/ros/chatto/controller/RegistrationController.java diff --git a/chatto/src/main/java/org/ros/chatto/controller/UserController.java b/src/main/java/org/ros/chatto/controller/UserController.java similarity index 100% rename from chatto/src/main/java/org/ros/chatto/controller/UserController.java rename to src/main/java/org/ros/chatto/controller/UserController.java diff --git a/chatto/src/main/java/org/ros/chatto/dto/ActiveUserDTO.java b/src/main/java/org/ros/chatto/dto/ActiveUserDTO.java similarity index 100% rename from chatto/src/main/java/org/ros/chatto/dto/ActiveUserDTO.java rename to src/main/java/org/ros/chatto/dto/ActiveUserDTO.java diff --git a/chatto/src/main/java/org/ros/chatto/dto/ChatMessageDTO.java b/src/main/java/org/ros/chatto/dto/ChatMessageDTO.java similarity index 100% rename from chatto/src/main/java/org/ros/chatto/dto/ChatMessageDTO.java rename to src/main/java/org/ros/chatto/dto/ChatMessageDTO.java diff --git a/chatto/src/main/java/org/ros/chatto/dto/MessageCipherDTO.java b/src/main/java/org/ros/chatto/dto/MessageCipherDTO.java similarity index 100% rename from chatto/src/main/java/org/ros/chatto/dto/MessageCipherDTO.java rename to src/main/java/org/ros/chatto/dto/MessageCipherDTO.java diff --git a/chatto/src/main/java/org/ros/chatto/dto/ReencryptionDTO.java b/src/main/java/org/ros/chatto/dto/ReencryptionDTO.java similarity index 100% rename from chatto/src/main/java/org/ros/chatto/dto/ReencryptionDTO.java rename to src/main/java/org/ros/chatto/dto/ReencryptionDTO.java diff --git a/chatto/src/main/java/org/ros/chatto/dto/UserRegistrationDTO.java b/src/main/java/org/ros/chatto/dto/UserRegistrationDTO.java similarity index 100% rename from chatto/src/main/java/org/ros/chatto/dto/UserRegistrationDTO.java rename to src/main/java/org/ros/chatto/dto/UserRegistrationDTO.java diff --git a/chatto/src/main/java/org/ros/chatto/error/ErrorModel.java b/src/main/java/org/ros/chatto/error/ErrorModel.java similarity index 100% rename from chatto/src/main/java/org/ros/chatto/error/ErrorModel.java rename to src/main/java/org/ros/chatto/error/ErrorModel.java diff --git a/chatto/src/main/java/org/ros/chatto/error/ErrorResponse.java b/src/main/java/org/ros/chatto/error/ErrorResponse.java similarity index 100% rename from chatto/src/main/java/org/ros/chatto/error/ErrorResponse.java rename to src/main/java/org/ros/chatto/error/ErrorResponse.java diff --git a/chatto/src/main/java/org/ros/chatto/logged/BeanUtil.java b/src/main/java/org/ros/chatto/logged/BeanUtil.java similarity index 100% rename from chatto/src/main/java/org/ros/chatto/logged/BeanUtil.java rename to src/main/java/org/ros/chatto/logged/BeanUtil.java diff --git a/chatto/src/main/java/org/ros/chatto/logged/LoggedUser.java b/src/main/java/org/ros/chatto/logged/LoggedUser.java similarity index 100% rename from chatto/src/main/java/org/ros/chatto/logged/LoggedUser.java rename to src/main/java/org/ros/chatto/logged/LoggedUser.java diff --git a/chatto/src/main/java/org/ros/chatto/logged/MyLogoutSuccessHandler.java b/src/main/java/org/ros/chatto/logged/MyLogoutSuccessHandler.java similarity index 100% rename from chatto/src/main/java/org/ros/chatto/logged/MyLogoutSuccessHandler.java rename to src/main/java/org/ros/chatto/logged/MyLogoutSuccessHandler.java diff --git a/chatto/src/main/java/org/ros/chatto/logged/MySimpleUrlAuthenticationSuccessHandler.java b/src/main/java/org/ros/chatto/logged/MySimpleUrlAuthenticationSuccessHandler.java similarity index 100% rename from chatto/src/main/java/org/ros/chatto/logged/MySimpleUrlAuthenticationSuccessHandler.java rename to src/main/java/org/ros/chatto/logged/MySimpleUrlAuthenticationSuccessHandler.java diff --git a/chatto/src/main/java/org/ros/chatto/logged/TokenCacheUtil.java b/src/main/java/org/ros/chatto/logged/TokenCacheUtil.java similarity index 100% rename from chatto/src/main/java/org/ros/chatto/logged/TokenCacheUtil.java rename to src/main/java/org/ros/chatto/logged/TokenCacheUtil.java diff --git a/chatto/src/main/java/org/ros/chatto/model/ChatMessage.java b/src/main/java/org/ros/chatto/model/ChatMessage.java similarity index 100% rename from chatto/src/main/java/org/ros/chatto/model/ChatMessage.java rename to src/main/java/org/ros/chatto/model/ChatMessage.java diff --git a/chatto/src/main/java/org/ros/chatto/model/ChatUser.java b/src/main/java/org/ros/chatto/model/ChatUser.java similarity index 100% rename from chatto/src/main/java/org/ros/chatto/model/ChatUser.java rename to src/main/java/org/ros/chatto/model/ChatUser.java diff --git a/chatto/src/main/java/org/ros/chatto/model/MessageCipher.java b/src/main/java/org/ros/chatto/model/MessageCipher.java similarity index 100% rename from chatto/src/main/java/org/ros/chatto/model/MessageCipher.java rename to src/main/java/org/ros/chatto/model/MessageCipher.java diff --git a/chatto/src/main/java/org/ros/chatto/model/Role.java b/src/main/java/org/ros/chatto/model/Role.java similarity index 100% rename from chatto/src/main/java/org/ros/chatto/model/Role.java rename to src/main/java/org/ros/chatto/model/Role.java diff --git a/chatto/src/main/java/org/ros/chatto/model/UserRole.java b/src/main/java/org/ros/chatto/model/UserRole.java similarity index 100% rename from chatto/src/main/java/org/ros/chatto/model/UserRole.java rename to src/main/java/org/ros/chatto/model/UserRole.java diff --git a/chatto/src/main/java/org/ros/chatto/model/UserSession.java b/src/main/java/org/ros/chatto/model/UserSession.java similarity index 100% rename from chatto/src/main/java/org/ros/chatto/model/UserSession.java rename to src/main/java/org/ros/chatto/model/UserSession.java diff --git a/chatto/src/main/java/org/ros/chatto/model/UserToken.java b/src/main/java/org/ros/chatto/model/UserToken.java similarity index 100% rename from chatto/src/main/java/org/ros/chatto/model/UserToken.java rename to src/main/java/org/ros/chatto/model/UserToken.java diff --git a/chatto/src/main/java/org/ros/chatto/repository/ChatMessageRepository.java b/src/main/java/org/ros/chatto/repository/ChatMessageRepository.java similarity index 100% rename from chatto/src/main/java/org/ros/chatto/repository/ChatMessageRepository.java rename to src/main/java/org/ros/chatto/repository/ChatMessageRepository.java diff --git a/chatto/src/main/java/org/ros/chatto/repository/DBInitializerRepostory.java b/src/main/java/org/ros/chatto/repository/DBInitializerRepostory.java similarity index 100% rename from chatto/src/main/java/org/ros/chatto/repository/DBInitializerRepostory.java rename to src/main/java/org/ros/chatto/repository/DBInitializerRepostory.java diff --git a/chatto/src/main/java/org/ros/chatto/repository/MessageCipherRepository.java b/src/main/java/org/ros/chatto/repository/MessageCipherRepository.java similarity index 100% rename from chatto/src/main/java/org/ros/chatto/repository/MessageCipherRepository.java rename to src/main/java/org/ros/chatto/repository/MessageCipherRepository.java diff --git a/chatto/src/main/java/org/ros/chatto/repository/RoleRepository.java b/src/main/java/org/ros/chatto/repository/RoleRepository.java similarity index 100% rename from chatto/src/main/java/org/ros/chatto/repository/RoleRepository.java rename to src/main/java/org/ros/chatto/repository/RoleRepository.java diff --git a/chatto/src/main/java/org/ros/chatto/repository/TokenRepository.java b/src/main/java/org/ros/chatto/repository/TokenRepository.java similarity index 100% rename from chatto/src/main/java/org/ros/chatto/repository/TokenRepository.java rename to src/main/java/org/ros/chatto/repository/TokenRepository.java diff --git a/chatto/src/main/java/org/ros/chatto/repository/UserRepository.java b/src/main/java/org/ros/chatto/repository/UserRepository.java similarity index 100% rename from chatto/src/main/java/org/ros/chatto/repository/UserRepository.java rename to src/main/java/org/ros/chatto/repository/UserRepository.java diff --git a/chatto/src/main/java/org/ros/chatto/repository/UserRepositoryCustom.java b/src/main/java/org/ros/chatto/repository/UserRepositoryCustom.java similarity index 100% rename from chatto/src/main/java/org/ros/chatto/repository/UserRepositoryCustom.java rename to src/main/java/org/ros/chatto/repository/UserRepositoryCustom.java diff --git a/chatto/src/main/java/org/ros/chatto/repository/UserRepositoryCustomImpl.java b/src/main/java/org/ros/chatto/repository/UserRepositoryCustomImpl.java similarity index 100% rename from chatto/src/main/java/org/ros/chatto/repository/UserRepositoryCustomImpl.java rename to src/main/java/org/ros/chatto/repository/UserRepositoryCustomImpl.java diff --git a/chatto/src/main/java/org/ros/chatto/repository/UserRoleRepository.java b/src/main/java/org/ros/chatto/repository/UserRoleRepository.java similarity index 100% rename from chatto/src/main/java/org/ros/chatto/repository/UserRoleRepository.java rename to src/main/java/org/ros/chatto/repository/UserRoleRepository.java diff --git a/chatto/src/main/java/org/ros/chatto/repository/UserSessionRepository.java b/src/main/java/org/ros/chatto/repository/UserSessionRepository.java similarity index 100% rename from chatto/src/main/java/org/ros/chatto/repository/UserSessionRepository.java rename to src/main/java/org/ros/chatto/repository/UserSessionRepository.java diff --git a/chatto/src/main/java/org/ros/chatto/security/AuthenticationSuccessHandlerImpl.java b/src/main/java/org/ros/chatto/security/AuthenticationSuccessHandlerImpl.java similarity index 100% rename from chatto/src/main/java/org/ros/chatto/security/AuthenticationSuccessHandlerImpl.java rename to src/main/java/org/ros/chatto/security/AuthenticationSuccessHandlerImpl.java diff --git a/chatto/src/main/java/org/ros/chatto/security/CustomBasicAuthenticationFilter.java b/src/main/java/org/ros/chatto/security/CustomBasicAuthenticationFilter.java similarity index 100% rename from chatto/src/main/java/org/ros/chatto/security/CustomBasicAuthenticationFilter.java rename to src/main/java/org/ros/chatto/security/CustomBasicAuthenticationFilter.java diff --git a/chatto/src/main/java/org/ros/chatto/security/MyUserDetailsService.java b/src/main/java/org/ros/chatto/security/MyUserDetailsService.java similarity index 100% rename from chatto/src/main/java/org/ros/chatto/security/MyUserDetailsService.java rename to src/main/java/org/ros/chatto/security/MyUserDetailsService.java diff --git a/chatto/src/main/java/org/ros/chatto/security/TokenAuthenticationFilter.java b/src/main/java/org/ros/chatto/security/TokenAuthenticationFilter.java similarity index 100% rename from chatto/src/main/java/org/ros/chatto/security/TokenAuthenticationFilter.java rename to src/main/java/org/ros/chatto/security/TokenAuthenticationFilter.java diff --git a/chatto/src/main/java/org/ros/chatto/service/CaptchaService.java b/src/main/java/org/ros/chatto/service/CaptchaService.java similarity index 100% rename from chatto/src/main/java/org/ros/chatto/service/CaptchaService.java rename to src/main/java/org/ros/chatto/service/CaptchaService.java diff --git a/chatto/src/main/java/org/ros/chatto/service/ChatService.java b/src/main/java/org/ros/chatto/service/ChatService.java similarity index 100% rename from chatto/src/main/java/org/ros/chatto/service/ChatService.java rename to src/main/java/org/ros/chatto/service/ChatService.java diff --git a/chatto/src/main/java/org/ros/chatto/service/ChatServiceImpl.java b/src/main/java/org/ros/chatto/service/ChatServiceImpl.java similarity index 100% rename from chatto/src/main/java/org/ros/chatto/service/ChatServiceImpl.java rename to src/main/java/org/ros/chatto/service/ChatServiceImpl.java diff --git a/chatto/src/main/java/org/ros/chatto/service/DBInitializerService.java b/src/main/java/org/ros/chatto/service/DBInitializerService.java similarity index 100% rename from chatto/src/main/java/org/ros/chatto/service/DBInitializerService.java rename to src/main/java/org/ros/chatto/service/DBInitializerService.java diff --git a/chatto/src/main/java/org/ros/chatto/service/MyConversionService.java b/src/main/java/org/ros/chatto/service/MyConversionService.java similarity index 100% rename from chatto/src/main/java/org/ros/chatto/service/MyConversionService.java rename to src/main/java/org/ros/chatto/service/MyConversionService.java diff --git a/chatto/src/main/java/org/ros/chatto/service/RoleService.java b/src/main/java/org/ros/chatto/service/RoleService.java similarity index 100% rename from chatto/src/main/java/org/ros/chatto/service/RoleService.java rename to src/main/java/org/ros/chatto/service/RoleService.java diff --git a/chatto/src/main/java/org/ros/chatto/service/RoleServiceImpl.java b/src/main/java/org/ros/chatto/service/RoleServiceImpl.java similarity index 100% rename from chatto/src/main/java/org/ros/chatto/service/RoleServiceImpl.java rename to src/main/java/org/ros/chatto/service/RoleServiceImpl.java diff --git a/chatto/src/main/java/org/ros/chatto/service/UserService.java b/src/main/java/org/ros/chatto/service/UserService.java similarity index 100% rename from chatto/src/main/java/org/ros/chatto/service/UserService.java rename to src/main/java/org/ros/chatto/service/UserService.java diff --git a/chatto/src/main/java/org/ros/chatto/service/UserServiceImpl.java b/src/main/java/org/ros/chatto/service/UserServiceImpl.java similarity index 100% rename from chatto/src/main/java/org/ros/chatto/service/UserServiceImpl.java rename to src/main/java/org/ros/chatto/service/UserServiceImpl.java diff --git a/chatto/src/main/java/org/ros/chatto/service/UserTokenService.java b/src/main/java/org/ros/chatto/service/UserTokenService.java similarity index 100% rename from chatto/src/main/java/org/ros/chatto/service/UserTokenService.java rename to src/main/java/org/ros/chatto/service/UserTokenService.java diff --git a/chatto/src/main/javascript/Gruntfile.js b/src/main/javascript/Gruntfile.js similarity index 100% rename from chatto/src/main/javascript/Gruntfile.js rename to src/main/javascript/Gruntfile.js diff --git a/chatto/src/main/javascript/package.json b/src/main/javascript/package.json similarity index 100% rename from chatto/src/main/javascript/package.json rename to src/main/javascript/package.json diff --git a/chatto/src/main/javascript/ts/src/SprintfTest.d.ts b/src/main/javascript/ts/src/SprintfTest.d.ts similarity index 100% rename from chatto/src/main/javascript/ts/src/SprintfTest.d.ts rename to src/main/javascript/ts/src/SprintfTest.d.ts diff --git a/chatto/src/main/javascript/ts/src/controller/AbstractController.ts b/src/main/javascript/ts/src/controller/AbstractController.ts similarity index 100% rename from chatto/src/main/javascript/ts/src/controller/AbstractController.ts rename to src/main/javascript/ts/src/controller/AbstractController.ts diff --git a/chatto/src/main/javascript/ts/src/controller/ChatController.ts b/src/main/javascript/ts/src/controller/ChatController.ts similarity index 100% rename from chatto/src/main/javascript/ts/src/controller/ChatController.ts rename to src/main/javascript/ts/src/controller/ChatController.ts diff --git a/chatto/src/main/javascript/ts/src/controller/UserController.ts b/src/main/javascript/ts/src/controller/UserController.ts similarity index 100% rename from chatto/src/main/javascript/ts/src/controller/UserController.ts rename to src/main/javascript/ts/src/controller/UserController.ts diff --git a/chatto/src/main/javascript/ts/src/dto/ChatMessageDTO.ts b/src/main/javascript/ts/src/dto/ChatMessageDTO.ts similarity index 100% rename from chatto/src/main/javascript/ts/src/dto/ChatMessageDTO.ts rename to src/main/javascript/ts/src/dto/ChatMessageDTO.ts diff --git a/chatto/src/main/javascript/ts/src/dto/MessageCipherDTO.ts b/src/main/javascript/ts/src/dto/MessageCipherDTO.ts similarity index 100% rename from chatto/src/main/javascript/ts/src/dto/MessageCipherDTO.ts rename to src/main/javascript/ts/src/dto/MessageCipherDTO.ts diff --git a/chatto/src/main/javascript/ts/src/main.ts b/src/main/javascript/ts/src/main.ts similarity index 100% rename from chatto/src/main/javascript/ts/src/main.ts rename to src/main/javascript/ts/src/main.ts diff --git a/chatto/src/main/javascript/ts/src/model/AbstractModel.ts b/src/main/javascript/ts/src/model/AbstractModel.ts similarity index 100% rename from chatto/src/main/javascript/ts/src/model/AbstractModel.ts rename to src/main/javascript/ts/src/model/AbstractModel.ts diff --git a/chatto/src/main/javascript/ts/src/model/ChatModel.ts b/src/main/javascript/ts/src/model/ChatModel.ts similarity index 100% rename from chatto/src/main/javascript/ts/src/model/ChatModel.ts rename to src/main/javascript/ts/src/model/ChatModel.ts diff --git a/chatto/src/main/javascript/ts/src/model/ChatModelHelper.ts b/src/main/javascript/ts/src/model/ChatModelHelper.ts similarity index 100% rename from chatto/src/main/javascript/ts/src/model/ChatModelHelper.ts rename to src/main/javascript/ts/src/model/ChatModelHelper.ts diff --git a/chatto/src/main/javascript/ts/src/model/FetchErrorHandler.ts b/src/main/javascript/ts/src/model/FetchErrorHandler.ts similarity index 100% rename from chatto/src/main/javascript/ts/src/model/FetchErrorHandler.ts rename to src/main/javascript/ts/src/model/FetchErrorHandler.ts diff --git a/chatto/src/main/javascript/ts/src/model/ModelFactory.ts b/src/main/javascript/ts/src/model/ModelFactory.ts similarity index 100% rename from chatto/src/main/javascript/ts/src/model/ModelFactory.ts rename to src/main/javascript/ts/src/model/ModelFactory.ts diff --git a/chatto/src/main/javascript/ts/src/model/UserModel.ts b/src/main/javascript/ts/src/model/UserModel.ts similarity index 100% rename from chatto/src/main/javascript/ts/src/model/UserModel.ts rename to src/main/javascript/ts/src/model/UserModel.ts diff --git a/chatto/src/main/javascript/ts/src/observe/Observable.ts b/src/main/javascript/ts/src/observe/Observable.ts similarity index 100% rename from chatto/src/main/javascript/ts/src/observe/Observable.ts rename to src/main/javascript/ts/src/observe/Observable.ts diff --git a/chatto/src/main/javascript/ts/src/observe/Observer.ts b/src/main/javascript/ts/src/observe/Observer.ts similarity index 100% rename from chatto/src/main/javascript/ts/src/observe/Observer.ts rename to src/main/javascript/ts/src/observe/Observer.ts diff --git a/chatto/src/main/javascript/ts/src/observe/ObserverData.ts b/src/main/javascript/ts/src/observe/ObserverData.ts similarity index 100% rename from chatto/src/main/javascript/ts/src/observe/ObserverData.ts rename to src/main/javascript/ts/src/observe/ObserverData.ts diff --git a/chatto/src/main/javascript/ts/src/service/AlertifyNotificationService.ts b/src/main/javascript/ts/src/service/AlertifyNotificationService.ts similarity index 100% rename from chatto/src/main/javascript/ts/src/service/AlertifyNotificationService.ts rename to src/main/javascript/ts/src/service/AlertifyNotificationService.ts diff --git a/chatto/src/main/javascript/ts/src/service/EncryptionService.ts b/src/main/javascript/ts/src/service/EncryptionService.ts similarity index 100% rename from chatto/src/main/javascript/ts/src/service/EncryptionService.ts rename to src/main/javascript/ts/src/service/EncryptionService.ts diff --git a/chatto/src/main/javascript/ts/src/service/EncryptionServiceFactory.ts b/src/main/javascript/ts/src/service/EncryptionServiceFactory.ts similarity index 100% rename from chatto/src/main/javascript/ts/src/service/EncryptionServiceFactory.ts rename to src/main/javascript/ts/src/service/EncryptionServiceFactory.ts diff --git a/chatto/src/main/javascript/ts/src/service/FuseSearchService.ts b/src/main/javascript/ts/src/service/FuseSearchService.ts similarity index 100% rename from chatto/src/main/javascript/ts/src/service/FuseSearchService.ts rename to src/main/javascript/ts/src/service/FuseSearchService.ts diff --git a/chatto/src/main/javascript/ts/src/service/MarkDownItMarkDownService.ts b/src/main/javascript/ts/src/service/MarkDownItMarkDownService.ts similarity index 100% rename from chatto/src/main/javascript/ts/src/service/MarkDownItMarkDownService.ts rename to src/main/javascript/ts/src/service/MarkDownItMarkDownService.ts diff --git a/chatto/src/main/javascript/ts/src/service/MarkDownService.ts b/src/main/javascript/ts/src/service/MarkDownService.ts similarity index 100% rename from chatto/src/main/javascript/ts/src/service/MarkDownService.ts rename to src/main/javascript/ts/src/service/MarkDownService.ts diff --git a/chatto/src/main/javascript/ts/src/service/NotificationService.ts b/src/main/javascript/ts/src/service/NotificationService.ts similarity index 100% rename from chatto/src/main/javascript/ts/src/service/NotificationService.ts rename to src/main/javascript/ts/src/service/NotificationService.ts diff --git a/chatto/src/main/javascript/ts/src/service/SJCLEncryptionService.ts b/src/main/javascript/ts/src/service/SJCLEncryptionService.ts similarity index 100% rename from chatto/src/main/javascript/ts/src/service/SJCLEncryptionService.ts rename to src/main/javascript/ts/src/service/SJCLEncryptionService.ts diff --git a/chatto/src/main/javascript/ts/src/service/SearchService.ts b/src/main/javascript/ts/src/service/SearchService.ts similarity index 100% rename from chatto/src/main/javascript/ts/src/service/SearchService.ts rename to src/main/javascript/ts/src/service/SearchService.ts diff --git a/chatto/src/main/javascript/ts/src/singleton/JsonAPI.ts b/src/main/javascript/ts/src/singleton/JsonAPI.ts similarity index 100% rename from chatto/src/main/javascript/ts/src/singleton/JsonAPI.ts rename to src/main/javascript/ts/src/singleton/JsonAPI.ts diff --git a/chatto/src/main/javascript/ts/src/singleton/Sprintf.ts b/src/main/javascript/ts/src/singleton/Sprintf.ts similarity index 100% rename from chatto/src/main/javascript/ts/src/singleton/Sprintf.ts rename to src/main/javascript/ts/src/singleton/Sprintf.ts diff --git a/chatto/src/main/javascript/ts/src/template/TemplateFactory.ts b/src/main/javascript/ts/src/template/TemplateFactory.ts similarity index 100% rename from chatto/src/main/javascript/ts/src/template/TemplateFactory.ts rename to src/main/javascript/ts/src/template/TemplateFactory.ts diff --git a/chatto/src/main/javascript/ts/src/view/AbstractView.ts b/src/main/javascript/ts/src/view/AbstractView.ts similarity index 100% rename from chatto/src/main/javascript/ts/src/view/AbstractView.ts rename to src/main/javascript/ts/src/view/AbstractView.ts diff --git a/chatto/src/main/javascript/ts/src/view/ChatView.ts b/src/main/javascript/ts/src/view/ChatView.ts similarity index 100% rename from chatto/src/main/javascript/ts/src/view/ChatView.ts rename to src/main/javascript/ts/src/view/ChatView.ts diff --git a/chatto/src/main/javascript/ts/src/view/ChatViewDeps.ts b/src/main/javascript/ts/src/view/ChatViewDeps.ts similarity index 100% rename from chatto/src/main/javascript/ts/src/view/ChatViewDeps.ts rename to src/main/javascript/ts/src/view/ChatViewDeps.ts diff --git a/chatto/src/main/javascript/ts/src/view/FetchHandler.ts b/src/main/javascript/ts/src/view/FetchHandler.ts similarity index 100% rename from chatto/src/main/javascript/ts/src/view/FetchHandler.ts rename to src/main/javascript/ts/src/view/FetchHandler.ts diff --git a/chatto/src/main/javascript/ts/src/view/UserView.ts b/src/main/javascript/ts/src/view/UserView.ts similarity index 100% rename from chatto/src/main/javascript/ts/src/view/UserView.ts rename to src/main/javascript/ts/src/view/UserView.ts diff --git a/chatto/src/main/javascript/ts/src/view/UserViewDeps.ts b/src/main/javascript/ts/src/view/UserViewDeps.ts similarity index 100% rename from chatto/src/main/javascript/ts/src/view/UserViewDeps.ts rename to src/main/javascript/ts/src/view/UserViewDeps.ts diff --git a/chatto/src/main/javascript/ts/src/viewmodel/ActiveUserViewModel.ts b/src/main/javascript/ts/src/viewmodel/ActiveUserViewModel.ts similarity index 100% rename from chatto/src/main/javascript/ts/src/viewmodel/ActiveUserViewModel.ts rename to src/main/javascript/ts/src/viewmodel/ActiveUserViewModel.ts diff --git a/chatto/src/main/javascript/ts/src/viewmodel/ChatMessageViewModel.ts b/src/main/javascript/ts/src/viewmodel/ChatMessageViewModel.ts similarity index 100% rename from chatto/src/main/javascript/ts/src/viewmodel/ChatMessageViewModel.ts rename to src/main/javascript/ts/src/viewmodel/ChatMessageViewModel.ts diff --git a/chatto/src/main/javascript/ts/tsconfig.json b/src/main/javascript/ts/tsconfig.json similarity index 100% rename from chatto/src/main/javascript/ts/tsconfig.json rename to src/main/javascript/ts/tsconfig.json diff --git a/chatto/src/main/javascript/workers/encryption-worker/main.ts b/src/main/javascript/workers/encryption-worker/main.ts similarity index 100% rename from chatto/src/main/javascript/workers/encryption-worker/main.ts rename to src/main/javascript/workers/encryption-worker/main.ts diff --git a/chatto/src/main/javascript/workers/encryption-worker/tsconfig.json b/src/main/javascript/workers/encryption-worker/tsconfig.json similarity index 100% rename from chatto/src/main/javascript/workers/encryption-worker/tsconfig.json rename to src/main/javascript/workers/encryption-worker/tsconfig.json diff --git a/chatto/src/main/javascript/yarn.lock b/src/main/javascript/yarn.lock similarity index 100% rename from chatto/src/main/javascript/yarn.lock rename to src/main/javascript/yarn.lock diff --git a/chatto/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties similarity index 100% rename from chatto/src/main/resources/application-prod.properties rename to src/main/resources/application-prod.properties diff --git a/chatto/src/main/resources/application-stats.properties b/src/main/resources/application-stats.properties similarity index 100% rename from chatto/src/main/resources/application-stats.properties rename to src/main/resources/application-stats.properties diff --git a/chatto/src/main/resources/application.properties b/src/main/resources/application.properties similarity index 100% rename from chatto/src/main/resources/application.properties rename to src/main/resources/application.properties diff --git a/chatto/src/main/resources/db/migration/V1__ddl.sql b/src/main/resources/db/migration/V1__ddl.sql similarity index 100% rename from chatto/src/main/resources/db/migration/V1__ddl.sql rename to src/main/resources/db/migration/V1__ddl.sql diff --git a/chatto/src/main/resources/db/migration/V2__data.sql b/src/main/resources/db/migration/V2__data.sql similarity index 100% rename from chatto/src/main/resources/db/migration/V2__data.sql rename to src/main/resources/db/migration/V2__data.sql diff --git a/chatto/src/main/resources/ehcache.xml b/src/main/resources/ehcache.xml similarity index 100% rename from chatto/src/main/resources/ehcache.xml rename to src/main/resources/ehcache.xml diff --git a/chatto/src/main/resources/pictures/A.png b/src/main/resources/pictures/A.png similarity index 100% rename from chatto/src/main/resources/pictures/A.png rename to src/main/resources/pictures/A.png diff --git a/chatto/src/main/resources/pictures/B.png b/src/main/resources/pictures/B.png similarity index 100% rename from chatto/src/main/resources/pictures/B.png rename to src/main/resources/pictures/B.png diff --git a/chatto/src/main/resources/pictures/C.png b/src/main/resources/pictures/C.png similarity index 100% rename from chatto/src/main/resources/pictures/C.png rename to src/main/resources/pictures/C.png diff --git a/chatto/src/main/resources/pictures/D.png b/src/main/resources/pictures/D.png similarity index 100% rename from chatto/src/main/resources/pictures/D.png rename to src/main/resources/pictures/D.png diff --git a/chatto/src/main/resources/pictures/E.png b/src/main/resources/pictures/E.png similarity index 100% rename from chatto/src/main/resources/pictures/E.png rename to src/main/resources/pictures/E.png diff --git a/chatto/src/main/resources/pictures/F.png b/src/main/resources/pictures/F.png similarity index 100% rename from chatto/src/main/resources/pictures/F.png rename to src/main/resources/pictures/F.png diff --git a/chatto/src/main/resources/pictures/G.png b/src/main/resources/pictures/G.png similarity index 100% rename from chatto/src/main/resources/pictures/G.png rename to src/main/resources/pictures/G.png diff --git a/chatto/src/main/resources/pictures/H.png b/src/main/resources/pictures/H.png similarity index 100% rename from chatto/src/main/resources/pictures/H.png rename to src/main/resources/pictures/H.png diff --git a/chatto/src/main/resources/pictures/I.png b/src/main/resources/pictures/I.png similarity index 100% rename from chatto/src/main/resources/pictures/I.png rename to src/main/resources/pictures/I.png diff --git a/chatto/src/main/resources/pictures/J.png b/src/main/resources/pictures/J.png similarity index 100% rename from chatto/src/main/resources/pictures/J.png rename to src/main/resources/pictures/J.png diff --git a/chatto/src/main/resources/pictures/K.png b/src/main/resources/pictures/K.png similarity index 100% rename from chatto/src/main/resources/pictures/K.png rename to src/main/resources/pictures/K.png diff --git a/chatto/src/main/resources/pictures/L.png b/src/main/resources/pictures/L.png similarity index 100% rename from chatto/src/main/resources/pictures/L.png rename to src/main/resources/pictures/L.png diff --git a/chatto/src/main/resources/pictures/M.png b/src/main/resources/pictures/M.png similarity index 100% rename from chatto/src/main/resources/pictures/M.png rename to src/main/resources/pictures/M.png diff --git a/chatto/src/main/resources/pictures/N.png b/src/main/resources/pictures/N.png similarity index 100% rename from chatto/src/main/resources/pictures/N.png rename to src/main/resources/pictures/N.png diff --git a/chatto/src/main/resources/pictures/O.png b/src/main/resources/pictures/O.png similarity index 100% rename from chatto/src/main/resources/pictures/O.png rename to src/main/resources/pictures/O.png diff --git a/chatto/src/main/resources/pictures/P.png b/src/main/resources/pictures/P.png similarity index 100% rename from chatto/src/main/resources/pictures/P.png rename to src/main/resources/pictures/P.png diff --git a/chatto/src/main/resources/pictures/Q.png b/src/main/resources/pictures/Q.png similarity index 100% rename from chatto/src/main/resources/pictures/Q.png rename to src/main/resources/pictures/Q.png diff --git a/chatto/src/main/resources/pictures/R.png b/src/main/resources/pictures/R.png similarity index 100% rename from chatto/src/main/resources/pictures/R.png rename to src/main/resources/pictures/R.png diff --git a/chatto/src/main/resources/pictures/S.png b/src/main/resources/pictures/S.png similarity index 100% rename from chatto/src/main/resources/pictures/S.png rename to src/main/resources/pictures/S.png diff --git a/chatto/src/main/resources/pictures/T.png b/src/main/resources/pictures/T.png similarity index 100% rename from chatto/src/main/resources/pictures/T.png rename to src/main/resources/pictures/T.png diff --git a/chatto/src/main/resources/pictures/U.png b/src/main/resources/pictures/U.png similarity index 100% rename from chatto/src/main/resources/pictures/U.png rename to src/main/resources/pictures/U.png diff --git a/chatto/src/main/resources/pictures/V.png b/src/main/resources/pictures/V.png similarity index 100% rename from chatto/src/main/resources/pictures/V.png rename to src/main/resources/pictures/V.png diff --git a/chatto/src/main/resources/pictures/W.png b/src/main/resources/pictures/W.png similarity index 100% rename from chatto/src/main/resources/pictures/W.png rename to src/main/resources/pictures/W.png diff --git a/chatto/src/main/resources/pictures/X.png b/src/main/resources/pictures/X.png similarity index 100% rename from chatto/src/main/resources/pictures/X.png rename to src/main/resources/pictures/X.png diff --git a/chatto/src/main/resources/pictures/Y.png b/src/main/resources/pictures/Y.png similarity index 100% rename from chatto/src/main/resources/pictures/Y.png rename to src/main/resources/pictures/Y.png diff --git a/chatto/src/main/resources/pictures/Z.png b/src/main/resources/pictures/Z.png similarity index 100% rename from chatto/src/main/resources/pictures/Z.png rename to src/main/resources/pictures/Z.png diff --git a/chatto/src/main/resources/queries.properties b/src/main/resources/queries.properties similarity index 100% rename from chatto/src/main/resources/queries.properties rename to src/main/resources/queries.properties diff --git a/chatto/src/main/resources/static/css/admin-custom.css b/src/main/resources/static/css/admin-custom.css similarity index 100% rename from chatto/src/main/resources/static/css/admin-custom.css rename to src/main/resources/static/css/admin-custom.css diff --git a/chatto/src/main/resources/static/css/chat.css b/src/main/resources/static/css/chat.css similarity index 100% rename from chatto/src/main/resources/static/css/chat.css rename to src/main/resources/static/css/chat.css diff --git a/chatto/src/main/resources/static/css/colors.css b/src/main/resources/static/css/colors.css similarity index 100% rename from chatto/src/main/resources/static/css/colors.css rename to src/main/resources/static/css/colors.css diff --git a/chatto/src/main/resources/static/css/master.css b/src/main/resources/static/css/master.css similarity index 100% rename from chatto/src/main/resources/static/css/master.css rename to src/main/resources/static/css/master.css diff --git a/chatto/src/main/resources/static/css/sb-admin-2-old.css b/src/main/resources/static/css/sb-admin-2-old.css similarity index 100% rename from chatto/src/main/resources/static/css/sb-admin-2-old.css rename to src/main/resources/static/css/sb-admin-2-old.css diff --git a/chatto/src/main/resources/static/css/sb-admin-2.css b/src/main/resources/static/css/sb-admin-2.css similarity index 100% rename from chatto/src/main/resources/static/css/sb-admin-2.css rename to src/main/resources/static/css/sb-admin-2.css diff --git a/chatto/src/main/resources/static/img/default_avatar.jpg b/src/main/resources/static/img/default_avatar.jpg similarity index 100% rename from chatto/src/main/resources/static/img/default_avatar.jpg rename to src/main/resources/static/img/default_avatar.jpg diff --git a/chatto/src/main/resources/static/img/home.jpg b/src/main/resources/static/img/home.jpg similarity index 100% rename from chatto/src/main/resources/static/img/home.jpg rename to src/main/resources/static/img/home.jpg diff --git a/chatto/src/main/resources/static/img/undraw_posting_photo.svg b/src/main/resources/static/img/undraw_posting_photo.svg similarity index 100% rename from chatto/src/main/resources/static/img/undraw_posting_photo.svg rename to src/main/resources/static/img/undraw_posting_photo.svg diff --git a/chatto/src/main/resources/static/js/admin.js b/src/main/resources/static/js/admin.js similarity index 100% rename from chatto/src/main/resources/static/js/admin.js rename to src/main/resources/static/js/admin.js diff --git a/chatto/src/main/resources/static/js/chatStatic.js b/src/main/resources/static/js/chatStatic.js similarity index 100% rename from chatto/src/main/resources/static/js/chatStatic.js rename to src/main/resources/static/js/chatStatic.js diff --git a/chatto/src/main/resources/static/js/demo/chart-area-demo.js b/src/main/resources/static/js/demo/chart-area-demo.js similarity index 100% rename from chatto/src/main/resources/static/js/demo/chart-area-demo.js rename to src/main/resources/static/js/demo/chart-area-demo.js diff --git a/chatto/src/main/resources/static/js/demo/chart-bar-demo.js b/src/main/resources/static/js/demo/chart-bar-demo.js similarity index 100% rename from chatto/src/main/resources/static/js/demo/chart-bar-demo.js rename to src/main/resources/static/js/demo/chart-bar-demo.js diff --git a/chatto/src/main/resources/static/js/demo/chart-pie-demo.js b/src/main/resources/static/js/demo/chart-pie-demo.js similarity index 100% rename from chatto/src/main/resources/static/js/demo/chart-pie-demo.js rename to src/main/resources/static/js/demo/chart-pie-demo.js diff --git a/chatto/src/main/resources/static/js/demo/datatables-demo.js b/src/main/resources/static/js/demo/datatables-demo.js similarity index 100% rename from chatto/src/main/resources/static/js/demo/datatables-demo.js rename to src/main/resources/static/js/demo/datatables-demo.js diff --git a/chatto/src/main/resources/static/js/index.html b/src/main/resources/static/js/index.html similarity index 100% rename from chatto/src/main/resources/static/js/index.html rename to src/main/resources/static/js/index.html diff --git a/chatto/src/main/resources/static/js/login.js b/src/main/resources/static/js/login.js similarity index 100% rename from chatto/src/main/resources/static/js/login.js rename to src/main/resources/static/js/login.js diff --git a/chatto/src/main/resources/static/js/logout.js b/src/main/resources/static/js/logout.js similarity index 100% rename from chatto/src/main/resources/static/js/logout.js rename to src/main/resources/static/js/logout.js diff --git a/chatto/src/main/resources/static/js/sb-admin-2.js b/src/main/resources/static/js/sb-admin-2.js similarity index 100% rename from chatto/src/main/resources/static/js/sb-admin-2.js rename to src/main/resources/static/js/sb-admin-2.js diff --git a/chatto/src/main/resources/templates/NewFile.html b/src/main/resources/templates/NewFile.html similarity index 100% rename from chatto/src/main/resources/templates/NewFile.html rename to src/main/resources/templates/NewFile.html diff --git a/chatto/src/main/resources/templates/admin/change-passphrase.html b/src/main/resources/templates/admin/change-passphrase.html similarity index 100% rename from chatto/src/main/resources/templates/admin/change-passphrase.html rename to src/main/resources/templates/admin/change-passphrase.html diff --git a/chatto/src/main/resources/templates/admin/home.html b/src/main/resources/templates/admin/home.html similarity index 100% rename from chatto/src/main/resources/templates/admin/home.html rename to src/main/resources/templates/admin/home.html diff --git a/chatto/src/main/resources/templates/admin/home_old.html b/src/main/resources/templates/admin/home_old.html similarity index 100% rename from chatto/src/main/resources/templates/admin/home_old.html rename to src/main/resources/templates/admin/home_old.html diff --git a/chatto/src/main/resources/templates/chat.html b/src/main/resources/templates/chat.html similarity index 100% rename from chatto/src/main/resources/templates/chat.html rename to src/main/resources/templates/chat.html diff --git a/chatto/src/main/resources/templates/crypto.html b/src/main/resources/templates/crypto.html similarity index 100% rename from chatto/src/main/resources/templates/crypto.html rename to src/main/resources/templates/crypto.html diff --git a/chatto/src/main/resources/templates/fragments/admin.html b/src/main/resources/templates/fragments/admin.html similarity index 100% rename from chatto/src/main/resources/templates/fragments/admin.html rename to src/main/resources/templates/fragments/admin.html diff --git a/chatto/src/main/resources/templates/fragments/head.html b/src/main/resources/templates/fragments/head.html similarity index 100% rename from chatto/src/main/resources/templates/fragments/head.html rename to src/main/resources/templates/fragments/head.html diff --git a/chatto/src/main/resources/templates/fragments/navbar.html b/src/main/resources/templates/fragments/navbar.html similarity index 100% rename from chatto/src/main/resources/templates/fragments/navbar.html rename to src/main/resources/templates/fragments/navbar.html diff --git a/chatto/src/main/resources/templates/home.html b/src/main/resources/templates/home.html similarity index 100% rename from chatto/src/main/resources/templates/home.html rename to src/main/resources/templates/home.html diff --git a/chatto/src/main/resources/templates/login.html b/src/main/resources/templates/login.html similarity index 100% rename from chatto/src/main/resources/templates/login.html rename to src/main/resources/templates/login.html diff --git a/chatto/src/main/resources/templates/logout.html b/src/main/resources/templates/logout.html similarity index 100% rename from chatto/src/main/resources/templates/logout.html rename to src/main/resources/templates/logout.html diff --git a/chatto/src/main/resources/templates/registration.html b/src/main/resources/templates/registration.html similarity index 100% rename from chatto/src/main/resources/templates/registration.html rename to src/main/resources/templates/registration.html diff --git a/chatto/src/main/resources/templates/user/home.html b/src/main/resources/templates/user/home.html similarity index 100% rename from chatto/src/main/resources/templates/user/home.html rename to src/main/resources/templates/user/home.html diff --git a/chatto/src/test/java/org/ros/chatto/ChattoApplicationTests.java b/src/test/java/org/ros/chatto/ChattoApplicationTests.java similarity index 100% rename from chatto/src/test/java/org/ros/chatto/ChattoApplicationTests.java rename to src/test/java/org/ros/chatto/ChattoApplicationTests.java diff --git a/chatto/src/test/java/org/ros/chatto/UnitTest.java b/src/test/java/org/ros/chatto/UnitTest.java similarity index 100% rename from chatto/src/test/java/org/ros/chatto/UnitTest.java rename to src/test/java/org/ros/chatto/UnitTest.java