diff --git a/.gitignore b/.gitignore
index f162064..cb76fbe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,51 @@
+### Temporary files ###
+*.bak
+*.swp
+*.tmp
+*.*~
+
+### Java ###
+*.class
+hs_err_pid*
+derby.log
+
+### Python / Jython ###
+__pycache__/
+*.py[cod]
+jythonCache/
+cachedir/
+.jython_cache/
+
+### Build output ###
+.springBeans
+bin/
+classes/
+src/corba/
+
+### JUnit testing ###
+activemq-data/
+test-reports/
+test-scratch/
+
+### Security files ###
+*.ppk
+*ssh.key
+id_rsa
+password
+passwords
+
+### Various OS, etc. files ###
+*.lnk
+.DS_Store
+[Dd]esktop.ini
+.nfs[0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f]*
+.svn/
+Thumbs.db
+$RECYCLE.BIN/
+.Trash-*
+
+### Maven/Tycho ###
 target/
-.polyglot.build.properties
\ No newline at end of file
+.polyglot.*
+.META-INF_MANIFEST.MF
+
diff --git a/uk.ac.diamond.scisoft.diffraction.powder.application/.gitignore b/uk.ac.diamond.scisoft.diffraction.powder.application/.gitignore
deleted file mode 100644
index 8cd1fa2..0000000
--- a/uk.ac.diamond.scisoft.diffraction.powder.application/.gitignore
+++ /dev/null
@@ -1,45 +0,0 @@
-### Temporary files ###
-*.bak
-*.swp
-*.tmp
-*.*~
-
-### Java ###
-*.class
-hs_err_pid*
-derby.log
-
-### Python / Jython ###
-__pycache__/
-*.py[cod]
-jythonCache/
-cachedir/
-.jython_cache/
-
-### Build output ###
-.springBeans
-/bin/
-/classes/
-/src/corba/
-
-### JUnit testing ###
-/activemq-data
-/test-reports
-/test-scratch
-
-### Security files ###
-*.ppk
-*ssh.key
-id_rsa
-password
-passwords
-
-### Various OS, etc. files ###
-*.lnk
-.DS_Store
-[Dd]esktop.ini
-.nfs[0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f]*
-.svn/
-Thumbs.db
-$RECYCLE.BIN/
-.Trash-*
diff --git a/uk.ac.diamond.scisoft.diffraction.powder.rcp/.gitignore b/uk.ac.diamond.scisoft.diffraction.powder.rcp/.gitignore
deleted file mode 100644
index 8cd1fa2..0000000
--- a/uk.ac.diamond.scisoft.diffraction.powder.rcp/.gitignore
+++ /dev/null
@@ -1,45 +0,0 @@
-### Temporary files ###
-*.bak
-*.swp
-*.tmp
-*.*~
-
-### Java ###
-*.class
-hs_err_pid*
-derby.log
-
-### Python / Jython ###
-__pycache__/
-*.py[cod]
-jythonCache/
-cachedir/
-.jython_cache/
-
-### Build output ###
-.springBeans
-/bin/
-/classes/
-/src/corba/
-
-### JUnit testing ###
-/activemq-data
-/test-reports
-/test-scratch
-
-### Security files ###
-*.ppk
-*ssh.key
-id_rsa
-password
-passwords
-
-### Various OS, etc. files ###
-*.lnk
-.DS_Store
-[Dd]esktop.ini
-.nfs[0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f]*
-.svn/
-Thumbs.db
-$RECYCLE.BIN/
-.Trash-*
diff --git a/uk.ac.diamond.scisoft.diffraction.powder.test/.gitignore b/uk.ac.diamond.scisoft.diffraction.powder.test/.gitignore
deleted file mode 100644
index 8cd1fa2..0000000
--- a/uk.ac.diamond.scisoft.diffraction.powder.test/.gitignore
+++ /dev/null
@@ -1,45 +0,0 @@
-### Temporary files ###
-*.bak
-*.swp
-*.tmp
-*.*~
-
-### Java ###
-*.class
-hs_err_pid*
-derby.log
-
-### Python / Jython ###
-__pycache__/
-*.py[cod]
-jythonCache/
-cachedir/
-.jython_cache/
-
-### Build output ###
-.springBeans
-/bin/
-/classes/
-/src/corba/
-
-### JUnit testing ###
-/activemq-data
-/test-reports
-/test-scratch
-
-### Security files ###
-*.ppk
-*ssh.key
-id_rsa
-password
-passwords
-
-### Various OS, etc. files ###
-*.lnk
-.DS_Store
-[Dd]esktop.ini
-.nfs[0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f]*
-.svn/
-Thumbs.db
-$RECYCLE.BIN/
-.Trash-*
diff --git a/uk.ac.diamond.scisoft.diffraction.powder/.gitignore b/uk.ac.diamond.scisoft.diffraction.powder/.gitignore
deleted file mode 100644
index 8cd1fa2..0000000
--- a/uk.ac.diamond.scisoft.diffraction.powder/.gitignore
+++ /dev/null
@@ -1,45 +0,0 @@
-### Temporary files ###
-*.bak
-*.swp
-*.tmp
-*.*~
-
-### Java ###
-*.class
-hs_err_pid*
-derby.log
-
-### Python / Jython ###
-__pycache__/
-*.py[cod]
-jythonCache/
-cachedir/
-.jython_cache/
-
-### Build output ###
-.springBeans
-/bin/
-/classes/
-/src/corba/
-
-### JUnit testing ###
-/activemq-data
-/test-reports
-/test-scratch
-
-### Security files ###
-*.ppk
-*ssh.key
-id_rsa
-password
-passwords
-
-### Various OS, etc. files ###
-*.lnk
-.DS_Store
-[Dd]esktop.ini
-.nfs[0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f]*
-.svn/
-Thumbs.db
-$RECYCLE.BIN/
-.Trash-*