diff --git a/src/main/java/org/apache/nutch/analysis/lang/LanguageIdentifier.java b/src/main/java/org/apache/nutch/analysis/lang/LanguageIdentifier.java
index 92c1a9e2..2abe722b 100644
--- a/src/main/java/org/apache/nutch/analysis/lang/LanguageIdentifier.java
+++ b/src/main/java/org/apache/nutch/analysis/lang/LanguageIdentifier.java
@@ -43,7 +43,7 @@
 public class LanguageIdentifier {
 
 	private final static int DEFAULT_ANALYSIS_LENGTH = 0; // 0 means full
-															// content
+	// content
 
 	private final static float SCORE_THRESOLD = 0.00F;
 
@@ -96,9 +96,11 @@ public LanguageIdentifier() {
 		// Gets the value of the maximum size of data to analyze
 		analyzeLength = DEFAULT_ANALYSIS_LENGTH;
 
+		final ClassLoader classLoader = LanguageIdentifier.class.getClassLoader();
+
 		Properties p = new Properties();
 		try {
-			p.load(this.getClass().getResourceAsStream("langmappings.properties"));
+			p.load(classLoader.getResourceAsStream("nutch/langmappings.properties"));
 
 			Enumeration alllanguages = p.keys();
 
@@ -112,8 +114,7 @@ public LanguageIdentifier() {
 			while (alllanguages.hasMoreElements()) {
 				String lang = (String) (alllanguages.nextElement());
 
-				InputStream is = this.getClass().getClassLoader().getResourceAsStream(
-						"org/apache/nutch/analysis/lang/" + lang + "." + NGramProfile.FILE_EXTENSION);
+				InputStream is = classLoader.getResourceAsStream("nutch/" + lang + "." + NGramProfile.FILE_EXTENSION);
 
 				if (is != null) {
 					NGramProfile profile = new NGramProfile(lang, minLength, maxLength);
@@ -154,13 +155,12 @@ public LanguageIdentifier() {
 			if (LOG.isInfoEnabled()) {
 				LOG.info(list.toString());
 			}
-			// Create the suspect profile
-			suspect = new NGramProfile("suspect", minLength, maxLength);
 		} catch (Exception e) {
-			if (LOG.isFatalEnabled()) {
-				LOG.fatal(e.toString());
-			}
+			LOG.fatal(e.toString(), e);
 		}
+
+		// Create the suspect profile
+		suspect = new NGramProfile("suspect", minLength, maxLength);
 	}
 
 	/**
diff --git a/src/main/java/org/apache/nutch/analysis/lang/da.ngp b/src/main/resources/nutch/da.ngp
similarity index 100%
rename from src/main/java/org/apache/nutch/analysis/lang/da.ngp
rename to src/main/resources/nutch/da.ngp
diff --git a/src/main/java/org/apache/nutch/analysis/lang/de.ngp b/src/main/resources/nutch/de.ngp
similarity index 100%
rename from src/main/java/org/apache/nutch/analysis/lang/de.ngp
rename to src/main/resources/nutch/de.ngp
diff --git a/src/main/java/org/apache/nutch/analysis/lang/ee.ngp b/src/main/resources/nutch/ee.ngp
similarity index 100%
rename from src/main/java/org/apache/nutch/analysis/lang/ee.ngp
rename to src/main/resources/nutch/ee.ngp
diff --git a/src/main/java/org/apache/nutch/analysis/lang/el.ngp b/src/main/resources/nutch/el.ngp
similarity index 100%
rename from src/main/java/org/apache/nutch/analysis/lang/el.ngp
rename to src/main/resources/nutch/el.ngp
diff --git a/src/main/java/org/apache/nutch/analysis/lang/en.ngp b/src/main/resources/nutch/en.ngp
similarity index 100%
rename from src/main/java/org/apache/nutch/analysis/lang/en.ngp
rename to src/main/resources/nutch/en.ngp
diff --git a/src/main/java/org/apache/nutch/analysis/lang/es.ngp b/src/main/resources/nutch/es.ngp
similarity index 100%
rename from src/main/java/org/apache/nutch/analysis/lang/es.ngp
rename to src/main/resources/nutch/es.ngp
diff --git a/src/main/java/org/apache/nutch/analysis/lang/fi.ngp b/src/main/resources/nutch/fi.ngp
similarity index 100%
rename from src/main/java/org/apache/nutch/analysis/lang/fi.ngp
rename to src/main/resources/nutch/fi.ngp
diff --git a/src/main/java/org/apache/nutch/analysis/lang/fr.ngp b/src/main/resources/nutch/fr.ngp
similarity index 100%
rename from src/main/java/org/apache/nutch/analysis/lang/fr.ngp
rename to src/main/resources/nutch/fr.ngp
diff --git a/src/main/java/org/apache/nutch/analysis/lang/hu.ngp b/src/main/resources/nutch/hu.ngp
similarity index 100%
rename from src/main/java/org/apache/nutch/analysis/lang/hu.ngp
rename to src/main/resources/nutch/hu.ngp
diff --git a/src/main/java/org/apache/nutch/analysis/lang/is.ngp b/src/main/resources/nutch/is.ngp
similarity index 100%
rename from src/main/java/org/apache/nutch/analysis/lang/is.ngp
rename to src/main/resources/nutch/is.ngp
diff --git a/src/main/java/org/apache/nutch/analysis/lang/it.ngp b/src/main/resources/nutch/it.ngp
similarity index 100%
rename from src/main/java/org/apache/nutch/analysis/lang/it.ngp
rename to src/main/resources/nutch/it.ngp
diff --git a/src/main/java/org/apache/nutch/analysis/lang/langmappings.properties b/src/main/resources/nutch/langmappings.properties
similarity index 100%
rename from src/main/java/org/apache/nutch/analysis/lang/langmappings.properties
rename to src/main/resources/nutch/langmappings.properties
diff --git a/src/main/java/org/apache/nutch/analysis/lang/nl.ngp b/src/main/resources/nutch/nl.ngp
similarity index 100%
rename from src/main/java/org/apache/nutch/analysis/lang/nl.ngp
rename to src/main/resources/nutch/nl.ngp
diff --git a/src/main/java/org/apache/nutch/analysis/lang/no.ngp b/src/main/resources/nutch/no.ngp
similarity index 100%
rename from src/main/java/org/apache/nutch/analysis/lang/no.ngp
rename to src/main/resources/nutch/no.ngp
diff --git a/src/main/java/org/apache/nutch/analysis/lang/pl.ngp b/src/main/resources/nutch/pl.ngp
similarity index 100%
rename from src/main/java/org/apache/nutch/analysis/lang/pl.ngp
rename to src/main/resources/nutch/pl.ngp
diff --git a/src/main/java/org/apache/nutch/analysis/lang/pt.ngp b/src/main/resources/nutch/pt.ngp
similarity index 100%
rename from src/main/java/org/apache/nutch/analysis/lang/pt.ngp
rename to src/main/resources/nutch/pt.ngp
diff --git a/src/main/java/org/apache/nutch/analysis/lang/ru.ngp b/src/main/resources/nutch/ru.ngp
similarity index 100%
rename from src/main/java/org/apache/nutch/analysis/lang/ru.ngp
rename to src/main/resources/nutch/ru.ngp
diff --git a/src/main/java/org/apache/nutch/analysis/lang/sv.ngp b/src/main/resources/nutch/sv.ngp
similarity index 100%
rename from src/main/java/org/apache/nutch/analysis/lang/sv.ngp
rename to src/main/resources/nutch/sv.ngp
diff --git a/src/main/java/org/apache/nutch/analysis/lang/th.ngp b/src/main/resources/nutch/th.ngp
similarity index 100%
rename from src/main/java/org/apache/nutch/analysis/lang/th.ngp
rename to src/main/resources/nutch/th.ngp