diff --git a/.gitignore b/.gitignore
index 552a74e2..e9557b6a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,6 @@
-.*
-
-.vscode/*
-!.vscode
-!.vscode/extensions.json
-!.vscode/launch.json
-!.vscode/settings.json
-!.vscode/tasks.json
-
+.gradle
+.idea
+.settings
 build
 
 /apps
@@ -21,8 +15,8 @@ build
 /static
 
 /*.properties
-!/gradle.properties
-
 /launcher.jar
 /passwd
 /start.*
+
+!/gradle.properties
diff --git a/.vscode/launch.json b/.vscode/launch.json
deleted file mode 100644
index b9116072..00000000
--- a/.vscode/launch.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  // Use IntelliSense to learn about possible attributes.
-  // Hover to view descriptions of existing attributes.
-  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-  "version": "0.2.0",
-  "configurations": [
-    {
-      "type": "java",
-      "name": "Current File",
-      "request": "launch",
-      "mainClass": "${file}"
-    },
-    {
-      "type": "java",
-      "name": "Debug",
-      "request": "launch",
-      "mainClass": "helma.main.Server",
-      "projectName": "helma_"
-    }
-  ]
-}
diff --git a/build.gradle b/build.gradle
index 2b6ac197..d5f86709 100644
--- a/build.gradle
+++ b/build.gradle
@@ -42,6 +42,15 @@ if (JavaVersion.current().isJava8Compatible()) {
   }
 }
 
+sourceSets {
+  main {
+    java {
+      // Sources in `src` will be available here after processing
+      srcDirs = ["$buildDir/src/main/java"]
+    }
+  }
+}
+
 configurations {
   // Wrapping implementation because it does not allow access to its files
   // (i.e. cannot be resolved)
diff --git a/settings.gradle b/settings.gradle
index 5fd2dc60..c6fe1184 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -16,6 +16,3 @@ project(':modules').projectDir = file('modules/helma')
 project(':jala').projectDir = file('modules/jala')
 project(':hopKit').projectDir = file('modules/jala/util/HopKit')
 project(':test').projectDir = file('modules/jala/util/Test')
-
-// Rename this project to prevent redundancy and renaming of main project (VSC does not care, though)
-project(':modules').name = 'modules'