diff --git a/pmd/src/net/sourceforge/pmd/PMDDirectory.java b/pmd/src/net/sourceforge/pmd/PMDDirectory.java
index 00ce3f1fae..c6eab8f9a0 100644
--- a/pmd/src/net/sourceforge/pmd/PMDDirectory.java
+++ b/pmd/src/net/sourceforge/pmd/PMDDirectory.java
@@ -1,5 +1,12 @@
 package net.sourceforge.pmd;
 
+import net.sourceforge.pmd.swingui.event.ListenerList;
+import net.sourceforge.pmd.swingui.event.PMDDirectoryRequestEvent;
+import net.sourceforge.pmd.swingui.event.PMDDirectoryRequestEventListener;
+import net.sourceforge.pmd.swingui.event.PMDDirectoryReturnedEvent;
+import net.sourceforge.pmd.swingui.event.RuleSetEvent;
+import net.sourceforge.pmd.swingui.event.RuleSetEventListener;
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -12,13 +19,6 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Properties;
 
-import net.sourceforge.pmd.swingui.event.ListenerList;
-import net.sourceforge.pmd.swingui.event.PMDDirectoryRequestEvent;
-import net.sourceforge.pmd.swingui.event.PMDDirectoryRequestEventListener;
-import net.sourceforge.pmd.swingui.event.PMDDirectoryReturnedEvent;
-import net.sourceforge.pmd.swingui.event.RuleSetEvent;
-import net.sourceforge.pmd.swingui.event.RuleSetEventListener;
-
 
 /**
  * Defines and provides access to PMD's directory structure.  The user defines the location
diff --git a/pmd/src/net/sourceforge/pmd/rules/design/UseSingletonRule.java b/pmd/src/net/sourceforge/pmd/rules/design/UseSingletonRule.java
index d4d3c2b25f..8155649194 100644
--- a/pmd/src/net/sourceforge/pmd/rules/design/UseSingletonRule.java
+++ b/pmd/src/net/sourceforge/pmd/rules/design/UseSingletonRule.java
@@ -3,8 +3,8 @@ package net.sourceforge.pmd.rules.design;
 import net.sourceforge.pmd.AbstractRule;
 import net.sourceforge.pmd.RuleContext;
 import net.sourceforge.pmd.ast.ASTCompilationUnit;
-import net.sourceforge.pmd.ast.ASTMethodDeclaration;
 import net.sourceforge.pmd.ast.ASTConstructorDeclaration;
+import net.sourceforge.pmd.ast.ASTMethodDeclaration;
 
 public class UseSingletonRule extends AbstractRule
 {
diff --git a/pmd/src/net/sourceforge/pmd/swingui/event/PMDDirectoryRequestEvent.java b/pmd/src/net/sourceforge/pmd/swingui/event/PMDDirectoryRequestEvent.java
index aa48b869d4..935d35376d 100644
--- a/pmd/src/net/sourceforge/pmd/swingui/event/PMDDirectoryRequestEvent.java
+++ b/pmd/src/net/sourceforge/pmd/swingui/event/PMDDirectoryRequestEvent.java
@@ -1,14 +1,14 @@
 package net.sourceforge.pmd.swingui.event;
 
+import net.sourceforge.pmd.PMDException;
+import net.sourceforge.pmd.RuleSet;
+import net.sourceforge.pmd.swingui.MessageDialog;
+import net.sourceforge.pmd.swingui.PMDViewer;
+
 import java.util.EventObject;
 import java.util.Iterator;
 import java.util.List;
 
-import net.sourceforge.pmd.RuleSet;
-import net.sourceforge.pmd.PMDException;
-import net.sourceforge.pmd.swingui.MessageDialog;
-import net.sourceforge.pmd.swingui.PMDViewer;
-
 /**
  *
  * @author Donald A. Leckie
diff --git a/pmd/src/net/sourceforge/pmd/swingui/event/PMDDirectoryRequestEventListener.java b/pmd/src/net/sourceforge/pmd/swingui/event/PMDDirectoryRequestEventListener.java
index 003d66257f..c1a454d0e7 100644
--- a/pmd/src/net/sourceforge/pmd/swingui/event/PMDDirectoryRequestEventListener.java
+++ b/pmd/src/net/sourceforge/pmd/swingui/event/PMDDirectoryRequestEventListener.java
@@ -1,9 +1,9 @@
 package net.sourceforge.pmd.swingui.event;
 
-import java.util.EventListener;
-
 import net.sourceforge.pmd.PMDException;
 
+import java.util.EventListener;
+
 /**
  *
  * @author Donald A. Leckie