Moved plugins to separate repo.  Cleaned up for JDK 6