diff --git a/.gitignore b/.gitignore
index 95436daf3..a18de53e4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1,11 @@
.DS_Store
.AppleDouble
-*.iml
._*
*~
/build/shared/reference.zip
*.x
-# temporary, until we complete the move to IntelliJ
#*.iml
#/.idea
diff --git a/app/processing4-app.iml b/app/processing4-app.iml
new file mode 100644
index 000000000..b0634b773
--- /dev/null
+++ b/app/processing4-app.iml
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/build/macosx/appbundler/processing4-appbundler.iml b/build/macosx/appbundler/processing4-appbundler.iml
new file mode 100644
index 000000000..c30dab7bf
--- /dev/null
+++ b/build/macosx/appbundler/processing4-appbundler.iml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/build/shared/tools/MovieMaker/processing4-tools-moviemaker.iml b/build/shared/tools/MovieMaker/processing4-tools-moviemaker.iml
new file mode 100644
index 000000000..608b28585
--- /dev/null
+++ b/build/shared/tools/MovieMaker/processing4-tools-moviemaker.iml
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/build/shared/tools/ThemeEngine/processing4-tools-theme.iml b/build/shared/tools/ThemeEngine/processing4-tools-theme.iml
new file mode 100644
index 000000000..2d35c6077
--- /dev/null
+++ b/build/shared/tools/ThemeEngine/processing4-tools-theme.iml
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/core/.gitignore b/core/.gitignore
index 541feadb3..d2cc0abf0 100644
--- a/core/.gitignore
+++ b/core/.gitignore
@@ -1,6 +1,5 @@
bin
bin-test
-.idea
/library/gluegen-rt*.jar
/library/jogl-all*.jar
diff --git a/core/.idea/.gitignore b/core/.idea/.gitignore
new file mode 100644
index 000000000..26d33521a
--- /dev/null
+++ b/core/.idea/.gitignore
@@ -0,0 +1,3 @@
+# Default ignored files
+/shelf/
+/workspace.xml
diff --git a/core/.idea/ant.xml b/core/.idea/ant.xml
new file mode 100644
index 000000000..a2a476982
--- /dev/null
+++ b/core/.idea/ant.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/core/.idea/misc.xml b/core/.idea/misc.xml
new file mode 100644
index 000000000..1763e153b
--- /dev/null
+++ b/core/.idea/misc.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/core/.idea/modules.xml b/core/.idea/modules.xml
new file mode 100644
index 000000000..d5b4e612a
--- /dev/null
+++ b/core/.idea/modules.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/core/.idea/vcs.xml b/core/.idea/vcs.xml
new file mode 100644
index 000000000..6c0b86358
--- /dev/null
+++ b/core/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/core/methods/processing4-core-preproc.iml b/core/methods/processing4-core-preproc.iml
new file mode 100644
index 000000000..bea76e7d8
--- /dev/null
+++ b/core/methods/processing4-core-preproc.iml
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/core/processing4-core.iml b/core/processing4-core.iml
new file mode 100644
index 000000000..129c87525
--- /dev/null
+++ b/core/processing4-core.iml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/java/libraries/dxf/processing4-dxf.iml b/java/libraries/dxf/processing4-dxf.iml
new file mode 100644
index 000000000..97b6e2863
--- /dev/null
+++ b/java/libraries/dxf/processing4-dxf.iml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/java/libraries/javafx/processing4-javafx.iml b/java/libraries/javafx/processing4-javafx.iml
new file mode 100644
index 000000000..e169dfb69
--- /dev/null
+++ b/java/libraries/javafx/processing4-javafx.iml
@@ -0,0 +1,35 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/java/libraries/net/processing4-net.iml b/java/libraries/net/processing4-net.iml
new file mode 100644
index 000000000..97b6e2863
--- /dev/null
+++ b/java/libraries/net/processing4-net.iml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/java/libraries/pdf/processing4-pdf.iml b/java/libraries/pdf/processing4-pdf.iml
new file mode 100644
index 000000000..5d6ac8011
--- /dev/null
+++ b/java/libraries/pdf/processing4-pdf.iml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/java/libraries/serial/processing4-serial.iml b/java/libraries/serial/processing4-serial.iml
new file mode 100644
index 000000000..0ca1d9326
--- /dev/null
+++ b/java/libraries/serial/processing4-serial.iml
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/java/libraries/svg/processing4-svg.iml b/java/libraries/svg/processing4-svg.iml
new file mode 100644
index 000000000..484404723
--- /dev/null
+++ b/java/libraries/svg/processing4-svg.iml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/java/processing4-java.iml b/java/processing4-java.iml
new file mode 100644
index 000000000..e0c6cdc50
--- /dev/null
+++ b/java/processing4-java.iml
@@ -0,0 +1,181 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file