diff --git a/.gitignore b/.gitignore
index c7a5d3f..e3899e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,74 +1,87 @@
-# Created by https://www.gitignore.io/api/java,gradle,eclipse
-# Edit at https://www.gitignore.io/?templates=java,gradle,eclipse
 
-### Eclipse ###
-.metadata
-bin/
-tmp/
-*.tmp
-*.bak
-*.swp
-*~.nib
-local.properties
-.settings/
-.loadpath
-.recommenders
+# Created by https://www.gitignore.io/api/java,gradle,intellij
+# Edit at https://www.gitignore.io/?templates=java,gradle,intellij
 
-# External tool builders
-.externalToolBuilders/
+### Intellij ###
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
-# Locally stored "Eclipse launch configurations"
-*.launch
+# User-specific stuff
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/**/usage.statistics.xml
+.idea/**/dictionaries
+.idea/**/shelf
 
-# PyDev specific (Python IDE for Eclipse)
-*.pydevproject
+# Generated files
+.idea/**/contentModel.xml
 
-# CDT-specific (C/C++ Development Tooling)
-.cproject
+# Sensitive or high-churn files
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+.idea/**/dbnavigator.xml
 
-# CDT- autotools
-.autotools
+# Gradle
+.idea/**/gradle.xml
+.idea/**/libraries
 
-# Java annotation processor (APT)
-.factorypath
+# Gradle and Maven with auto-import
+# When using Gradle or Maven with auto-import, you should exclude module files,
+# since they will be recreated, and may cause churn.  Uncomment if using
+# auto-import.
+# .idea/modules.xml
+# .idea/*.iml
+# .idea/modules
+# *.iml
+# *.ipr
 
-# PDT-specific (PHP Development Tools)
-.buildpath
+# CMake
+cmake-build-*/
 
-# sbteclipse plugin
-.target
+# Mongo Explorer plugin
+.idea/**/mongoSettings.xml
 
-# Tern plugin
-.tern-project
+# File-based project format
+*.iws
 
-# TeXlipse plugin
-.texlipse
+# IntelliJ
+out/
 
-# STS (Spring Tool Suite)
-.springBeans
+# mpeltonen/sbt-idea plugin
+.idea_modules/
 
-# Code Recommenders
-.recommenders/
+# JIRA plugin
+atlassian-ide-plugin.xml
 
-# Annotation Processing
-.apt_generated/
+# Cursive Clojure plugin
+.idea/replstate.xml
 
-# Scala IDE specific (Scala & Java development for Eclipse)
-.cache-main
-.scala_dependencies
-.worksheet
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
 
-### Eclipse Patch ###
-# Eclipse Core
-.project
+# Editor-based Rest Client
+.idea/httpRequests
 
-# JDT-specific (Eclipse Java Development Tools)
-.classpath
+# Android studio 3.1+ serialized cache file
+.idea/caches/build_file_checksums.ser
 
-# Annotation Processing
-.apt_generated
+### Intellij Patch ###
+# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721
 
-.sts4-cache/
+# *.iml
+# modules.xml
+# .idea/misc.xml
+# *.ipr
+
+# Sonarlint plugin
+.idea/sonarlint
 
 ### Java ###
 # Compiled class file
@@ -114,4 +127,4 @@ gradle-app.setting
 ### Gradle Patch ###
 **/build/
 
-# End of https://www.gitignore.io/api/java,gradle,eclipse
\ No newline at end of file
+# End of https://www.gitignore.io/api/java,gradle,intellij
\ No newline at end of file
diff --git a/.idea/.gitignore b/.idea/.gitignore
deleted file mode 100644
index f06b425..0000000
--- a/.idea/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-# Default ignored files
-/workspace.xml
-
-/uiDesigner.xml
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
deleted file mode 100644
index 7e08e46..0000000
--- a/.idea/gradle.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GradleMigrationSettings" migrationVersion="1" />
-  <component name="GradleSettings">
-    <option name="linkedExternalProjectsSettings">
-      <GradleProjectSettings>
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="11" />
-        <option name="modules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-          </set>
-        </option>
-        <option name="useQualifiedModuleNames" value="true" />
-      </GradleProjectSettings>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
deleted file mode 100644
index da7c4f2..0000000
--- a/.vscode/settings.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"files.exclude": {
-		"**/.classpath": true,
-		"**/.project": true,
-		"**/.settings": true,
-		"**/.factorypath": true
-	},
-	"java.configuration.updateBuildConfiguration": "interactive"
-}
\ No newline at end of file