diff --git a/plugins/org.eclipse.dltk.sh.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.dltk.sh.core/META-INF/MANIFEST.MF
index 3a7e7c1..e3dedf6 100644
--- a/plugins/org.eclipse.dltk.sh.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.dltk.sh.core/META-INF/MANIFEST.MF
@@ -9,5 +9,4 @@
  org.eclipse.dltk.core;bundle-version="[4.0.0,6.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.dltk.sh.core,
- org.eclipse.dltk.sh.core.parser
+Export-Package: org.eclipse.dltk.sh.core
diff --git a/plugins/org.eclipse.dltk.sh.core/plugin.xml b/plugins/org.eclipse.dltk.sh.core/plugin.xml
index 81189e7..059171c 100644
--- a/plugins/org.eclipse.dltk.sh.core/plugin.xml
+++ b/plugins/org.eclipse.dltk.sh.core/plugin.xml
@@ -26,7 +26,7 @@
    <extension
          point="org.eclipse.dltk.core.sourceElementParsers">
       <parser
-            class="org.eclipse.dltk.sh.core.parser.ShelledSourceElementParser"
+            class="org.eclipse.dltk.sh.internal.core.parser.ShelledSourceElementParser"
             nature="org.eclipse.dltk.sh.core.nature"
             priority="0">
       </parser>
@@ -35,7 +35,7 @@
       <parserContribution
             natureId="org.eclipse.dltk.sh.core.nature">
          <parser
-               class="org.eclipse.dltk.sh.core.parser.ShellScriptSourceParserFactory"
+               class="org.eclipse.dltk.sh.internal.core.parser.ShellScriptSourceParserFactory"
                description="Shell Script Source parser"
                id="org.eclipse.dltk.sh.core.sourceParser"
                name="sourceParser.name"
diff --git a/plugins/org.eclipse.dltk.sh.core/src/org/eclipse/dltk/sh/core/parser/FunctionInfo.java b/plugins/org.eclipse.dltk.sh.core/src/org/eclipse/dltk/sh/internal/core/parser/FunctionInfo.java
similarity index 92%
rename from plugins/org.eclipse.dltk.sh.core/src/org/eclipse/dltk/sh/core/parser/FunctionInfo.java
rename to plugins/org.eclipse.dltk.sh.core/src/org/eclipse/dltk/sh/internal/core/parser/FunctionInfo.java
index 6762c88..a93a4ea 100644
--- a/plugins/org.eclipse.dltk.sh.core/src/org/eclipse/dltk/sh/core/parser/FunctionInfo.java
+++ b/plugins/org.eclipse.dltk.sh.core/src/org/eclipse/dltk/sh/internal/core/parser/FunctionInfo.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Alexander Kurtakov - initial API and implementation
  *******************************************************************************/
-package org.eclipse.dltk.sh.core.parser;
+package org.eclipse.dltk.sh.internal.core.parser;
 
 import org.eclipse.dltk.compiler.IElementRequestor.MethodInfo;
 
diff --git a/plugins/org.eclipse.dltk.sh.core/src/org/eclipse/dltk/sh/core/parser/ShellModel.java b/plugins/org.eclipse.dltk.sh.core/src/org/eclipse/dltk/sh/internal/core/parser/ShellModel.java
similarity index 96%
rename from plugins/org.eclipse.dltk.sh.core/src/org/eclipse/dltk/sh/core/parser/ShellModel.java
rename to plugins/org.eclipse.dltk.sh.core/src/org/eclipse/dltk/sh/internal/core/parser/ShellModel.java
index 1603c93..c9281d1 100644
--- a/plugins/org.eclipse.dltk.sh.core/src/org/eclipse/dltk/sh/core/parser/ShellModel.java
+++ b/plugins/org.eclipse.dltk.sh.core/src/org/eclipse/dltk/sh/internal/core/parser/ShellModel.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Alexander Kurtakov - initial API and implementation
  *******************************************************************************/
-package org.eclipse.dltk.sh.core.parser;
+package org.eclipse.dltk.sh.internal.core.parser;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/plugins/org.eclipse.dltk.sh.core/src/org/eclipse/dltk/sh/core/parser/ShellModuleDeclaration.java b/plugins/org.eclipse.dltk.sh.core/src/org/eclipse/dltk/sh/internal/core/parser/ShellModuleDeclaration.java
similarity index 97%
rename from plugins/org.eclipse.dltk.sh.core/src/org/eclipse/dltk/sh/core/parser/ShellModuleDeclaration.java
rename to plugins/org.eclipse.dltk.sh.core/src/org/eclipse/dltk/sh/internal/core/parser/ShellModuleDeclaration.java
index 5494ea4..98324f7 100644
--- a/plugins/org.eclipse.dltk.sh.core/src/org/eclipse/dltk/sh/core/parser/ShellModuleDeclaration.java
+++ b/plugins/org.eclipse.dltk.sh.core/src/org/eclipse/dltk/sh/internal/core/parser/ShellModuleDeclaration.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Alexander Kurtakov - initial API and implementation
  *******************************************************************************/
-package org.eclipse.dltk.sh.core.parser;
+package org.eclipse.dltk.sh.internal.core.parser;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/plugins/org.eclipse.dltk.sh.core/src/org/eclipse/dltk/sh/core/parser/ShellScriptSourceParser.java b/plugins/org.eclipse.dltk.sh.core/src/org/eclipse/dltk/sh/internal/core/parser/ShellScriptSourceParser.java
similarity index 99%
rename from plugins/org.eclipse.dltk.sh.core/src/org/eclipse/dltk/sh/core/parser/ShellScriptSourceParser.java
rename to plugins/org.eclipse.dltk.sh.core/src/org/eclipse/dltk/sh/internal/core/parser/ShellScriptSourceParser.java
index e1d09fc..2a9da3f 100644
--- a/plugins/org.eclipse.dltk.sh.core/src/org/eclipse/dltk/sh/core/parser/ShellScriptSourceParser.java
+++ b/plugins/org.eclipse.dltk.sh.core/src/org/eclipse/dltk/sh/internal/core/parser/ShellScriptSourceParser.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Alexander Kurtakov - initial API and implementation
  *******************************************************************************/
-package org.eclipse.dltk.sh.core.parser;
+package org.eclipse.dltk.sh.internal.core.parser;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/plugins/org.eclipse.dltk.sh.core/src/org/eclipse/dltk/sh/core/parser/ShellScriptSourceParserFactory.java b/plugins/org.eclipse.dltk.sh.core/src/org/eclipse/dltk/sh/internal/core/parser/ShellScriptSourceParserFactory.java
similarity index 94%
rename from plugins/org.eclipse.dltk.sh.core/src/org/eclipse/dltk/sh/core/parser/ShellScriptSourceParserFactory.java
rename to plugins/org.eclipse.dltk.sh.core/src/org/eclipse/dltk/sh/internal/core/parser/ShellScriptSourceParserFactory.java
index af1699f..3b12d39 100644
--- a/plugins/org.eclipse.dltk.sh.core/src/org/eclipse/dltk/sh/core/parser/ShellScriptSourceParserFactory.java
+++ b/plugins/org.eclipse.dltk.sh.core/src/org/eclipse/dltk/sh/internal/core/parser/ShellScriptSourceParserFactory.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Alexander Kurtakov - initial API and implementation
  *******************************************************************************/
-package org.eclipse.dltk.sh.core.parser;
+package org.eclipse.dltk.sh.internal.core.parser;
 
 import org.eclipse.dltk.ast.parser.ISourceParser;
 import org.eclipse.dltk.ast.parser.ISourceParserFactory;
diff --git a/plugins/org.eclipse.dltk.sh.core/src/org/eclipse/dltk/sh/core/parser/ShelledSourceElementParser.java b/plugins/org.eclipse.dltk.sh.core/src/org/eclipse/dltk/sh/internal/core/parser/ShelledSourceElementParser.java
similarity index 97%
rename from plugins/org.eclipse.dltk.sh.core/src/org/eclipse/dltk/sh/core/parser/ShelledSourceElementParser.java
rename to plugins/org.eclipse.dltk.sh.core/src/org/eclipse/dltk/sh/internal/core/parser/ShelledSourceElementParser.java
index 4880f98..fa73f0f 100644
--- a/plugins/org.eclipse.dltk.sh.core/src/org/eclipse/dltk/sh/core/parser/ShelledSourceElementParser.java
+++ b/plugins/org.eclipse.dltk.sh.core/src/org/eclipse/dltk/sh/internal/core/parser/ShelledSourceElementParser.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Alexander Kurtakov - initial API and implementation
  *******************************************************************************/
-package org.eclipse.dltk.sh.core.parser;
+package org.eclipse.dltk.sh.internal.core.parser;
 
 import org.eclipse.dltk.compiler.IElementRequestor.FieldInfo;
 import org.eclipse.dltk.compiler.IElementRequestor.TypeInfo;
diff --git a/tests/org.eclipse.dltk.sh.core.tests/src/org/eclipse/dltk/sh/core/tests/AllTests.java b/tests/org.eclipse.dltk.sh.core.tests/src/org/eclipse/dltk/sh/core/tests/AllTests.java
index eebcffd..4aaa128 100644
--- a/tests/org.eclipse.dltk.sh.core.tests/src/org/eclipse/dltk/sh/core/tests/AllTests.java
+++ b/tests/org.eclipse.dltk.sh.core.tests/src/org/eclipse/dltk/sh/core/tests/AllTests.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.dltk.sh.core.tests;
 
-import org.eclipse.dltk.sh.core.parser.tests.ShellScriptSourceParserTest;
+import org.eclipse.dltk.sh.internal.core.parser.tests.ShellScriptSourceParserTest;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
diff --git a/tests/org.eclipse.dltk.sh.core.tests/src/org/eclipse/dltk/sh/core/parser/tests/ShellScriptSourceParserTest.java b/tests/org.eclipse.dltk.sh.core.tests/src/org/eclipse/dltk/sh/internal/core/parser/tests/ShellScriptSourceParserTest.java
similarity index 92%
rename from tests/org.eclipse.dltk.sh.core.tests/src/org/eclipse/dltk/sh/core/parser/tests/ShellScriptSourceParserTest.java
rename to tests/org.eclipse.dltk.sh.core.tests/src/org/eclipse/dltk/sh/internal/core/parser/tests/ShellScriptSourceParserTest.java
index 0354abb..1feade2 100644
--- a/tests/org.eclipse.dltk.sh.core.tests/src/org/eclipse/dltk/sh/core/parser/tests/ShellScriptSourceParserTest.java
+++ b/tests/org.eclipse.dltk.sh.core.tests/src/org/eclipse/dltk/sh/internal/core/parser/tests/ShellScriptSourceParserTest.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Alexander Kurtakov - initial API and implementation
  *******************************************************************************/
-package org.eclipse.dltk.sh.core.parser.tests;
+package org.eclipse.dltk.sh.internal.core.parser.tests;
 
 import static org.junit.Assert.*;