Make most of the sass compiler API internal, fixes #10339

Change-Id: Ia783142aa96665a26491b659a387490883875d37

87 files changed, 281 insertions, 274 deletions

diff --git a/theme-compiler/src/com/vaadin/buildhelpers/CompileTheme.java b/theme-compiler/src/com/vaadin/buildhelpers/CompileTheme.java
index afef575a7f..1b95125777 100644
--- a/theme-compiler/src/com/vaadin/buildhelpers/CompileTheme.java
+++ b/theme-compiler/src/com/vaadin/buildhelpers/CompileTheme.java
@@ -13,7 +13,7 @@ import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
 import org.apache.commons.cli.PosixParser;
 
-import com.vaadin.sass.ScssStylesheet;
+import com.vaadin.sass.internal.ScssStylesheet;
 
 /**
  * Helper to combine css divided into separate per component dirs into one to
diff --git a/theme-compiler/src/com/vaadin/sass/SassCompiler.java b/theme-compiler/src/com/vaadin/sass/SassCompiler.java
index 07d6eb01f1..74394636b0 100644
--- a/theme-compiler/src/com/vaadin/sass/SassCompiler.java
+++ b/theme-compiler/src/com/vaadin/sass/SassCompiler.java
@@ -20,6 +20,8 @@ import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
 
+import com.vaadin.sass.internal.ScssStylesheet;
+
 public class SassCompiler {
 
     public static void main(String[] args) throws Exception {
diff --git a/theme-compiler/src/com/vaadin/sass/ScssStylesheet.java b/theme-compiler/src/com/vaadin/sass/internal/ScssStylesheet.java
index a557187ab4..af061d8e95 100644
--- a/theme-compiler/src/com/vaadin/sass/ScssStylesheet.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/ScssStylesheet.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.sass;
+package com.vaadin.sass.internal;
 
 import java.io.File;
 import java.io.IOException;
@@ -28,18 +28,18 @@ import java.util.logging.Logger;
 import org.w3c.css.sac.CSSException;
 import org.w3c.css.sac.InputSource;
 
-import com.vaadin.sass.handler.SCSSDocumentHandler;
-import com.vaadin.sass.handler.SCSSDocumentHandlerImpl;
-import com.vaadin.sass.handler.SCSSErrorHandler;
-import com.vaadin.sass.parser.Parser;
-import com.vaadin.sass.resolver.ScssStylesheetResolver;
-import com.vaadin.sass.resolver.VaadinResolver;
-import com.vaadin.sass.tree.BlockNode;
-import com.vaadin.sass.tree.MixinDefNode;
-import com.vaadin.sass.tree.Node;
-import com.vaadin.sass.tree.VariableNode;
-import com.vaadin.sass.tree.controldirective.IfElseDefNode;
-import com.vaadin.sass.visitor.ImportNodeHandler;
+import com.vaadin.sass.internal.handler.SCSSDocumentHandler;
+import com.vaadin.sass.internal.handler.SCSSDocumentHandlerImpl;
+import com.vaadin.sass.internal.handler.SCSSErrorHandler;
+import com.vaadin.sass.internal.parser.Parser;
+import com.vaadin.sass.internal.resolver.ScssStylesheetResolver;
+import com.vaadin.sass.internal.resolver.VaadinResolver;
+import com.vaadin.sass.internal.tree.BlockNode;
+import com.vaadin.sass.internal.tree.MixinDefNode;
+import com.vaadin.sass.internal.tree.Node;
+import com.vaadin.sass.internal.tree.VariableNode;
+import com.vaadin.sass.internal.tree.controldirective.IfElseDefNode;
+import com.vaadin.sass.internal.visitor.ImportNodeHandler;
 
 public class ScssStylesheet extends Node {
 
diff --git a/theme-compiler/src/com/vaadin/sass/handler/SCSSDocumentHandler.java b/theme-compiler/src/com/vaadin/sass/internal/handler/SCSSDocumentHandler.java
index 215abaa38b..c5472b10dd 100644
--- a/theme-compiler/src/com/vaadin/sass/handler/SCSSDocumentHandler.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/handler/SCSSDocumentHandler.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.sass.handler;
+package com.vaadin.sass.internal.handler;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -23,12 +23,12 @@ import org.w3c.css.sac.CSSException;
 import org.w3c.css.sac.DocumentHandler;
 import org.w3c.css.sac.SACMediaList;
 
-import com.vaadin.sass.ScssStylesheet;
-import com.vaadin.sass.parser.LexicalUnitImpl;
-import com.vaadin.sass.tree.ForNode;
-import com.vaadin.sass.tree.VariableNode;
-import com.vaadin.sass.tree.WhileNode;
-import com.vaadin.sass.tree.controldirective.EachDefNode;
+import com.vaadin.sass.internal.ScssStylesheet;
+import com.vaadin.sass.internal.parser.LexicalUnitImpl;
+import com.vaadin.sass.internal.tree.ForNode;
+import com.vaadin.sass.internal.tree.VariableNode;
+import com.vaadin.sass.internal.tree.WhileNode;
+import com.vaadin.sass.internal.tree.controldirective.EachDefNode;
 
 public interface SCSSDocumentHandler extends DocumentHandler {
     ScssStylesheet getStyleSheet();
diff --git a/theme-compiler/src/com/vaadin/sass/handler/SCSSDocumentHandlerImpl.java b/theme-compiler/src/com/vaadin/sass/internal/handler/SCSSDocumentHandlerImpl.java
index 333ca0319b..4b98815a4b 100644
--- a/theme-compiler/src/com/vaadin/sass/handler/SCSSDocumentHandlerImpl.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/handler/SCSSDocumentHandlerImpl.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.sass.handler;
+package com.vaadin.sass.internal.handler;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -26,30 +26,30 @@ import org.w3c.css.sac.LexicalUnit;
 import org.w3c.css.sac.SACMediaList;
 import org.w3c.css.sac.SelectorList;
 
-import com.vaadin.sass.ScssStylesheet;
-import com.vaadin.sass.parser.LexicalUnitImpl;
-import com.vaadin.sass.tree.BlockNode;
-import com.vaadin.sass.tree.CommentNode;
-import com.vaadin.sass.tree.ExtendNode;
-import com.vaadin.sass.tree.FontFaceNode;
-import com.vaadin.sass.tree.ForNode;
-import com.vaadin.sass.tree.ImportNode;
-import com.vaadin.sass.tree.ListAppendNode;
-import com.vaadin.sass.tree.ListContainsNode;
-import com.vaadin.sass.tree.ListRemoveNode;
-import com.vaadin.sass.tree.MediaNode;
-import com.vaadin.sass.tree.MicrosoftRuleNode;
-import com.vaadin.sass.tree.MixinDefNode;
-import com.vaadin.sass.tree.MixinNode;
-import com.vaadin.sass.tree.NestPropertiesNode;
-import com.vaadin.sass.tree.Node;
-import com.vaadin.sass.tree.RuleNode;
-import com.vaadin.sass.tree.VariableNode;
-import com.vaadin.sass.tree.WhileNode;
-import com.vaadin.sass.tree.controldirective.EachDefNode;
-import com.vaadin.sass.tree.controldirective.ElseNode;
-import com.vaadin.sass.tree.controldirective.IfElseDefNode;
-import com.vaadin.sass.tree.controldirective.IfNode;
+import com.vaadin.sass.internal.ScssStylesheet;
+import com.vaadin.sass.internal.parser.LexicalUnitImpl;
+import com.vaadin.sass.internal.tree.BlockNode;
+import com.vaadin.sass.internal.tree.CommentNode;
+import com.vaadin.sass.internal.tree.ExtendNode;
+import com.vaadin.sass.internal.tree.FontFaceNode;
+import com.vaadin.sass.internal.tree.ForNode;
+import com.vaadin.sass.internal.tree.ImportNode;
+import com.vaadin.sass.internal.tree.ListAppendNode;
+import com.vaadin.sass.internal.tree.ListContainsNode;
+import com.vaadin.sass.internal.tree.ListRemoveNode;
+import com.vaadin.sass.internal.tree.MediaNode;
+import com.vaadin.sass.internal.tree.MicrosoftRuleNode;
+import com.vaadin.sass.internal.tree.MixinDefNode;
+import com.vaadin.sass.internal.tree.MixinNode;
+import com.vaadin.sass.internal.tree.NestPropertiesNode;
+import com.vaadin.sass.internal.tree.Node;
+import com.vaadin.sass.internal.tree.RuleNode;
+import com.vaadin.sass.internal.tree.VariableNode;
+import com.vaadin.sass.internal.tree.WhileNode;
+import com.vaadin.sass.internal.tree.controldirective.EachDefNode;
+import com.vaadin.sass.internal.tree.controldirective.ElseNode;
+import com.vaadin.sass.internal.tree.controldirective.IfElseDefNode;
+import com.vaadin.sass.internal.tree.controldirective.IfNode;
 
 public class SCSSDocumentHandlerImpl implements SCSSDocumentHandler {
 
diff --git a/theme-compiler/src/com/vaadin/sass/handler/SCSSErrorHandler.java b/theme-compiler/src/com/vaadin/sass/internal/handler/SCSSErrorHandler.java
index 9aac12d707..22bc846b46 100644
--- a/theme-compiler/src/com/vaadin/sass/handler/SCSSErrorHandler.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/handler/SCSSErrorHandler.java
@@ -1,4 +1,4 @@
-package com.vaadin.sass.handler;
+package com.vaadin.sass.internal.handler;
 
 import org.w3c.css.sac.CSSException;
 import org.w3c.css.sac.CSSParseException;
diff --git a/theme-compiler/src/com/vaadin/sass/parser/CharStream.java b/theme-compiler/src/com/vaadin/sass/internal/parser/CharStream.java
index 004e3eb8fd..bb0b4d9318 100644
--- a/theme-compiler/src/com/vaadin/sass/parser/CharStream.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/parser/CharStream.java
@@ -1,6 +1,6 @@
 /* Generated By:JavaCC: Do not edit this line. CharStream.java Version 5.0 */
 /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
-package com.vaadin.sass.parser;
+package com.vaadin.sass.internal.parser;
 
 /**
  * This interface describes a character stream that maintains line and
diff --git a/theme-compiler/src/com/vaadin/sass/parser/Generic_CharStream.java b/theme-compiler/src/com/vaadin/sass/internal/parser/Generic_CharStream.java
index fd9c8a7c03..88002d28a3 100644
--- a/theme-compiler/src/com/vaadin/sass/parser/Generic_CharStream.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/parser/Generic_CharStream.java
@@ -1,5 +1,5 @@
 /* Generated By:JavaCC: Do not edit this line. Generic_CharStream.java Version 0.7pre6 */
-package com.vaadin.sass.parser;
+package com.vaadin.sass.internal.parser;
 
 /**
  * An implementation of interface CharStream, where the stream is assumed to
diff --git a/theme-compiler/src/com/vaadin/sass/parser/JumpException.java b/theme-compiler/src/com/vaadin/sass/internal/parser/JumpException.java
index 4d0f5923e9..624ab94fed 100644
--- a/theme-compiler/src/com/vaadin/sass/parser/JumpException.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/parser/JumpException.java
@@ -6,7 +6,7 @@
  *
  * $Id: JumpException.java,v 1.1 1999/06/09 15:21:33 plehegar Exp $
  */
-package com.vaadin.sass.parser;
+package com.vaadin.sass.internal.parser;
 
 /**
  * @version $Revision: 1.1 $
diff --git a/theme-compiler/src/com/vaadin/sass/parser/LexicalUnitImpl.java b/theme-compiler/src/com/vaadin/sass/internal/parser/LexicalUnitImpl.java
index 1548538a88..f3c0f95287 100644
--- a/theme-compiler/src/com/vaadin/sass/parser/LexicalUnitImpl.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/parser/LexicalUnitImpl.java
@@ -6,13 +6,13 @@
  *
  * $Id: LexicalUnitImpl.java,v 1.3 2000/02/15 02:08:19 plehegar Exp $
  */
-package com.vaadin.sass.parser;
+package com.vaadin.sass.internal.parser;
 
 import java.io.Serializable;
 
 import org.w3c.css.sac.LexicalUnit;
 
-import com.vaadin.sass.util.ColorUtil;
+import com.vaadin.sass.internal.util.ColorUtil;
 
 /**
  * @version $Revision: 1.3 $
diff --git a/theme-compiler/src/com/vaadin/sass/parser/LocatorImpl.java b/theme-compiler/src/com/vaadin/sass/internal/parser/LocatorImpl.java
index d481459f17..dd94d7b92b 100644
--- a/theme-compiler/src/com/vaadin/sass/parser/LocatorImpl.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/parser/LocatorImpl.java
@@ -6,7 +6,7 @@
  *
  * $Id: LocatorImpl.java,v 1.2 2000/02/14 16:59:06 plehegar Exp $
  */
-package com.vaadin.sass.parser;
+package com.vaadin.sass.internal.parser;
 
 import org.w3c.css.sac.Locator;
 
diff --git a/theme-compiler/src/com/vaadin/sass/parser/MediaListImpl.java b/theme-compiler/src/com/vaadin/sass/internal/parser/MediaListImpl.java
index bb321ea3cd..2c8aeb81af 100644
--- a/theme-compiler/src/com/vaadin/sass/parser/MediaListImpl.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/parser/MediaListImpl.java
@@ -6,7 +6,7 @@
  *
  * $Id: MediaListImpl.java,v 1.4 2000/04/26 13:40:19 plehegar Exp $
  */
-package com.vaadin.sass.parser;
+package com.vaadin.sass.internal.parser;
 
 import java.io.Serializable;
 
diff --git a/theme-compiler/src/com/vaadin/sass/parser/ParseException.java b/theme-compiler/src/com/vaadin/sass/internal/parser/ParseException.java
index 482e5d3b3f..b470fd1b5e 100644
--- a/theme-compiler/src/com/vaadin/sass/parser/ParseException.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/parser/ParseException.java
@@ -1,5 +1,5 @@
 /* Generated By:JavaCC: Do not edit this line. ParseException.java Version 0.7pre6 */
-package com.vaadin.sass.parser;
+package com.vaadin.sass.internal.parser;
 
 import org.w3c.css.sac.CSSException;
 
diff --git a/theme-compiler/src/com/vaadin/sass/parser/Parser.java b/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java
index 996a15d9c8..c13ab31def 100644
--- a/theme-compiler/src/com/vaadin/sass/parser/Parser.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java
@@ -1,5 +1,5 @@
 /* Generated By:JavaCC: Do not edit this line. Parser.java */
-package com.vaadin.sass.parser;
+package com.vaadin.sass.internal.parser;
 
 import java.io.*;
 import java.net.*;
@@ -26,9 +26,9 @@ import org.w3c.flute.parser.selectors.ConditionFactoryImpl;
 
 import org.w3c.flute.util.Encoding;
 
-import com.vaadin.sass.handler.*;
+import com.vaadin.sass.internal.handler.*;
 
-import com.vaadin.sass.tree.*;
+import com.vaadin.sass.internal.tree.*;
 
 /**
  * A CSS2 parser
diff --git a/theme-compiler/src/com/vaadin/sass/parser/Parser.jj b/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.jj
index af53edb482..2a8dde2ef6 100644
--- a/theme-compiler/src/com/vaadin/sass/parser/Parser.jj
+++ b/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.jj
@@ -17,7 +17,7 @@ options {
 
 PARSER_BEGIN(Parser)
 
-package com.vaadin.sass.parser;
+package com.vaadin.sass.internal.parser;
 
 import java.io.*;
 import java.net.*;
@@ -44,9 +44,9 @@ import org.w3c.flute.parser.selectors.ConditionFactoryImpl;
 
 import org.w3c.flute.util.Encoding;
 
-import com.vaadin.sass.handler.*;
+import com.vaadin.sass.internal.handler.*;
 
-import com.vaadin.sass.tree.*;
+import com.vaadin.sass.internal.tree.*;
 
 /**
  * A CSS2 parser
diff --git a/theme-compiler/src/com/vaadin/sass/parser/ParserConstants.java b/theme-compiler/src/com/vaadin/sass/internal/parser/ParserConstants.java
index f8d5a96722..22b7dbbb0f 100644
--- a/theme-compiler/src/com/vaadin/sass/parser/ParserConstants.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/parser/ParserConstants.java
@@ -1,5 +1,5 @@
 /* Generated By:JavaCC: Do not edit this line. ParserConstants.java */
-package com.vaadin.sass.parser;
+package com.vaadin.sass.internal.parser;
 
 
 /**
diff --git a/theme-compiler/src/com/vaadin/sass/parser/ParserTokenManager.java b/theme-compiler/src/com/vaadin/sass/internal/parser/ParserTokenManager.java
index 39b74b9a7f..6715e3beda 100644
--- a/theme-compiler/src/com/vaadin/sass/parser/ParserTokenManager.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/parser/ParserTokenManager.java
@@ -1,5 +1,5 @@
 /* Generated By:JavaCC: Do not edit this line. ParserTokenManager.java */
-package com.vaadin.sass.parser;
+package com.vaadin.sass.internal.parser;
 import java.io.*;
 import java.net.*;
 import java.util.ArrayList;
@@ -21,8 +21,8 @@ import org.w3c.css.sac.LexicalUnit;
 import org.w3c.flute.parser.selectors.SelectorFactoryImpl;
 import org.w3c.flute.parser.selectors.ConditionFactoryImpl;
 import org.w3c.flute.util.Encoding;
-import com.vaadin.sass.handler.*;
-import com.vaadin.sass.tree.*;
+import com.vaadin.sass.internal.handler.*;
+import com.vaadin.sass.internal.tree.*;
 
 /** Token Manager. */
 public class ParserTokenManager implements ParserConstants
diff --git a/theme-compiler/src/com/vaadin/sass/parser/SCSSLexicalUnit.java b/theme-compiler/src/com/vaadin/sass/internal/parser/SCSSLexicalUnit.java
index 8c2fa4018d..a50e2210d7 100644
--- a/theme-compiler/src/com/vaadin/sass/parser/SCSSLexicalUnit.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/parser/SCSSLexicalUnit.java
@@ -1,4 +1,4 @@
-package com.vaadin.sass.parser;
+package com.vaadin.sass.internal.parser;
 
 import org.w3c.css.sac.LexicalUnit;
 
diff --git a/theme-compiler/src/com/vaadin/sass/parser/SelectorListImpl.java b/theme-compiler/src/com/vaadin/sass/internal/parser/SelectorListImpl.java
index 634fe57647..2cfe7dab9e 100644
--- a/theme-compiler/src/com/vaadin/sass/parser/SelectorListImpl.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/parser/SelectorListImpl.java
@@ -11,7 +11,7 @@
  *
  * $Id: SelectorListImpl.java,v 1.1 2000/08/07 01:16:21 plehegar Exp $
  */
-package com.vaadin.sass.parser;
+package com.vaadin.sass.internal.parser;
 
 import org.w3c.css.sac.Selector;
 import org.w3c.css.sac.SelectorList;
diff --git a/theme-compiler/src/com/vaadin/sass/parser/Selectors.java b/theme-compiler/src/com/vaadin/sass/internal/parser/Selectors.java
index bec8d66294..07e37b3914 100644
--- a/theme-compiler/src/com/vaadin/sass/parser/Selectors.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/parser/Selectors.java
@@ -11,7 +11,7 @@
  *
  * $Id: Selectors.java,v 1.1 2000/02/14 16:58:31 plehegar Exp $
  */
-package com.vaadin.sass.parser;
+package com.vaadin.sass.internal.parser;
 
 import org.w3c.css.sac.SelectorList;
 import org.w3c.css.sac.Selector;
diff --git a/theme-compiler/src/com/vaadin/sass/parser/ThrowedParseException.java b/theme-compiler/src/com/vaadin/sass/internal/parser/ThrowedParseException.java
index 5c1a9e8f33..b016265cc2 100644
--- a/theme-compiler/src/com/vaadin/sass/parser/ThrowedParseException.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/parser/ThrowedParseException.java
@@ -6,7 +6,7 @@
  *
  * $Id: ThrowedParseException.java,v 1.1 1999/06/09 15:21:33 plehegar Exp $
  */
-package com.vaadin.sass.parser;
+package com.vaadin.sass.internal.parser;
 
 /**
  * @version $Revision: 1.1 $
diff --git a/theme-compiler/src/com/vaadin/sass/parser/Token.java b/theme-compiler/src/com/vaadin/sass/internal/parser/Token.java
index 554b97896e..a625c13668 100644
--- a/theme-compiler/src/com/vaadin/sass/parser/Token.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/parser/Token.java
@@ -1,6 +1,6 @@
 /* Generated By:JavaCC: Do not edit this line. Token.java Version 5.0 */
 /* JavaCCOptions:TOKEN_EXTENDS=,KEEP_LINE_COL=null,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
-package com.vaadin.sass.parser;
+package com.vaadin.sass.internal.parser;
 
 /**
  * Describes the input token stream.
diff --git a/theme-compiler/src/com/vaadin/sass/parser/TokenMgrError.java b/theme-compiler/src/com/vaadin/sass/internal/parser/TokenMgrError.java
index 311bf0d9b3..806efa4051 100644
--- a/theme-compiler/src/com/vaadin/sass/parser/TokenMgrError.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/parser/TokenMgrError.java
@@ -1,6 +1,6 @@
 /* Generated By:JavaCC: Do not edit this line. TokenMgrError.java Version 5.0 */
 /* JavaCCOptions: */
-package com.vaadin.sass.parser;
+package com.vaadin.sass.internal.parser;
 
 /** Token Manager Error. */
 public class TokenMgrError extends Error
diff --git a/theme-compiler/src/com/vaadin/sass/resolver/ClassloaderResolver.java b/theme-compiler/src/com/vaadin/sass/internal/resolver/ClassloaderResolver.java
index 28ab086be5..c5d7f87b68 100644
--- a/theme-compiler/src/com/vaadin/sass/resolver/ClassloaderResolver.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/resolver/ClassloaderResolver.java
@@ -1,4 +1,4 @@
-package com.vaadin.sass.resolver;
+package com.vaadin.sass.internal.resolver;
 
 import java.io.File;
 import java.io.InputStream;
diff --git a/theme-compiler/src/com/vaadin/sass/resolver/FilesystemResolver.java b/theme-compiler/src/com/vaadin/sass/internal/resolver/FilesystemResolver.java
index 2c6b92430f..58913279fc 100644
--- a/theme-compiler/src/com/vaadin/sass/resolver/FilesystemResolver.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/resolver/FilesystemResolver.java
@@ -1,4 +1,4 @@
-package com.vaadin.sass.resolver;
+package com.vaadin.sass.internal.resolver;
 
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
diff --git a/theme-compiler/src/com/vaadin/sass/resolver/ScssStylesheetResolver.java b/theme-compiler/src/com/vaadin/sass/internal/resolver/ScssStylesheetResolver.java
index c3b0e75979..dd0e2b6565 100644
--- a/theme-compiler/src/com/vaadin/sass/resolver/ScssStylesheetResolver.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/resolver/ScssStylesheetResolver.java
@@ -1,4 +1,4 @@
-package com.vaadin.sass.resolver;
+package com.vaadin.sass.internal.resolver;
 
 import org.w3c.css.sac.InputSource;
 
diff --git a/theme-compiler/src/com/vaadin/sass/resolver/VaadinResolver.java b/theme-compiler/src/com/vaadin/sass/internal/resolver/VaadinResolver.java
index 1caf5dcac8..35ef8f7a78 100644
--- a/theme-compiler/src/com/vaadin/sass/resolver/VaadinResolver.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/resolver/VaadinResolver.java
@@ -1,4 +1,4 @@
-package com.vaadin.sass.resolver;
+package com.vaadin.sass.internal.resolver;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
diff --git a/theme-compiler/src/com/vaadin/sass/selector/CompositeSelector.java b/theme-compiler/src/com/vaadin/sass/internal/selector/CompositeSelector.java
index f187cf8f6b..77d5bc38de 100644
--- a/theme-compiler/src/com/vaadin/sass/selector/CompositeSelector.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/selector/CompositeSelector.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.sass.selector;
+package com.vaadin.sass.internal.selector;
 
 import org.w3c.css.sac.Selector;
 
diff --git a/theme-compiler/src/com/vaadin/sass/selector/SelectorUtil.java b/theme-compiler/src/com/vaadin/sass/internal/selector/SelectorUtil.java
index 788f297cac..2d10f4253d 100644
--- a/theme-compiler/src/com/vaadin/sass/selector/SelectorUtil.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/selector/SelectorUtil.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.sass.selector;
+package com.vaadin.sass.internal.selector;
 
 import org.w3c.css.sac.CombinatorCondition;
 import org.w3c.css.sac.Condition;
@@ -39,7 +39,7 @@ import org.w3c.flute.parser.selectors.PseudoClassConditionImpl;
 import org.w3c.flute.parser.selectors.PseudoElementSelectorImpl;
 import org.w3c.flute.parser.selectors.SelectorFactoryImpl;
 
-import com.vaadin.sass.parser.SelectorListImpl;
+import com.vaadin.sass.internal.parser.SelectorListImpl;
 
 public class SelectorUtil {
 
diff --git a/theme-compiler/src/com/vaadin/sass/tree/BlockNode.java b/theme-compiler/src/com/vaadin/sass/internal/tree/BlockNode.java
index 292a948320..5ccac1c2da 100644
--- a/theme-compiler/src/com/vaadin/sass/tree/BlockNode.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/tree/BlockNode.java
@@ -14,12 +14,12 @@
  * the License.
  */
 
-package com.vaadin.sass.tree;
+package com.vaadin.sass.internal.tree;
 
 import java.util.ArrayList;
 
-import com.vaadin.sass.ScssStylesheet;
-import com.vaadin.sass.visitor.BlockNodeHandler;
+import com.vaadin.sass.internal.ScssStylesheet;
+import com.vaadin.sass.internal.visitor.BlockNodeHandler;
 
 public class BlockNode extends Node implements IVariableNode {
 
diff --git a/theme-compiler/src/com/vaadin/sass/tree/CommentNode.java b/theme-compiler/src/com/vaadin/sass/internal/tree/CommentNode.java
index b867c5384b..b86645da69 100644
--- a/theme-compiler/src/com/vaadin/sass/tree/CommentNode.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/tree/CommentNode.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.sass.tree;
+package com.vaadin.sass.internal.tree;
 
 public class CommentNode extends Node {
     private String comment;
diff --git a/theme-compiler/src/com/vaadin/sass/tree/ExtendNode.java b/theme-compiler/src/com/vaadin/sass/internal/tree/ExtendNode.java
index b9bf5869d1..a4a8f6b617 100644
--- a/theme-compiler/src/com/vaadin/sass/tree/ExtendNode.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/tree/ExtendNode.java
@@ -14,11 +14,11 @@
  * the License.
  */
 
-package com.vaadin.sass.tree;
+package com.vaadin.sass.internal.tree;
 
 import java.util.ArrayList;
 
-import com.vaadin.sass.visitor.ExtendNodeHandler;
+import com.vaadin.sass.internal.visitor.ExtendNodeHandler;
 
 public class ExtendNode extends Node implements IVariableNode {
     private static final long serialVersionUID = 3301805078983796878L;
diff --git a/theme-compiler/src/com/vaadin/sass/tree/FontFaceNode.java b/theme-compiler/src/com/vaadin/sass/internal/tree/FontFaceNode.java
index 9e3b24f8de..4475f9b18a 100644
--- a/theme-compiler/src/com/vaadin/sass/tree/FontFaceNode.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/tree/FontFaceNode.java
@@ -1,4 +1,4 @@
-package com.vaadin.sass.tree;
+package com.vaadin.sass.internal.tree;
 
 public class FontFaceNode extends Node {
 
diff --git a/theme-compiler/src/com/vaadin/sass/tree/ForNode.java b/theme-compiler/src/com/vaadin/sass/internal/tree/ForNode.java
index da0d784229..1fcc9b3240 100644
--- a/theme-compiler/src/com/vaadin/sass/tree/ForNode.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/tree/ForNode.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.sass.tree;
+package com.vaadin.sass.internal.tree;
 
 public class ForNode extends Node {
     private static final long serialVersionUID = -1159180539216623335L;
diff --git a/theme-compiler/src/com/vaadin/sass/tree/FunctionNode.java b/theme-compiler/src/com/vaadin/sass/internal/tree/FunctionNode.java
index d81e4976e5..124995c3d7 100644
--- a/theme-compiler/src/com/vaadin/sass/tree/FunctionNode.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/tree/FunctionNode.java
@@ -14,11 +14,11 @@
  * the License.
  */
 
-package com.vaadin.sass.tree;
+package com.vaadin.sass.internal.tree;
 
 import java.util.ArrayList;
 
-import com.vaadin.sass.ScssStylesheet;
+import com.vaadin.sass.internal.ScssStylesheet;
 
 public class FunctionNode extends Node implements IVariableNode {
     private static final long serialVersionUID = -5383104165955523923L;
diff --git a/theme-compiler/src/com/vaadin/sass/tree/IVariableNode.java b/theme-compiler/src/com/vaadin/sass/internal/tree/IVariableNode.java
index 2c3e1c95d2..37bea0f91e 100644
--- a/theme-compiler/src/com/vaadin/sass/tree/IVariableNode.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/tree/IVariableNode.java
@@ -1,4 +1,4 @@
-package com.vaadin.sass.tree;
+package com.vaadin.sass.internal.tree;
 
 import java.util.ArrayList;
 
diff --git a/theme-compiler/src/com/vaadin/sass/tree/ImportNode.java b/theme-compiler/src/com/vaadin/sass/internal/tree/ImportNode.java
index 9dd9c1b0d8..01fa5008f3 100644
--- a/theme-compiler/src/com/vaadin/sass/tree/ImportNode.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/tree/ImportNode.java
@@ -14,12 +14,12 @@
  * the License.
  */
 
-package com.vaadin.sass.tree;
+package com.vaadin.sass.internal.tree;
 
 import org.w3c.css.sac.SACMediaList;
 
-import com.vaadin.sass.ScssStylesheet;
-import com.vaadin.sass.visitor.ImportNodeHandler;
+import com.vaadin.sass.internal.ScssStylesheet;
+import com.vaadin.sass.internal.visitor.ImportNodeHandler;
 
 public class ImportNode extends Node {
     private static final long serialVersionUID = 5671255892282668438L;
diff --git a/theme-compiler/src/com/vaadin/sass/tree/ListAppendNode.java b/theme-compiler/src/com/vaadin/sass/internal/tree/ListAppendNode.java
index ef85594744..384daf1927 100644
--- a/theme-compiler/src/com/vaadin/sass/tree/ListAppendNode.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/tree/ListAppendNode.java
@@ -1,4 +1,4 @@
-package com.vaadin.sass.tree;
+package com.vaadin.sass.internal.tree;
 
 import java.util.ArrayList;
 
diff --git a/theme-compiler/src/com/vaadin/sass/tree/ListContainsNode.java b/theme-compiler/src/com/vaadin/sass/internal/tree/ListContainsNode.java
index 1a9ace88a5..3167cbd100 100644
--- a/theme-compiler/src/com/vaadin/sass/tree/ListContainsNode.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/tree/ListContainsNode.java
@@ -1,8 +1,8 @@
-package com.vaadin.sass.tree;
+package com.vaadin.sass.internal.tree;
 
 import java.util.ArrayList;
 
-import com.vaadin.sass.parser.LexicalUnitImpl;
+import com.vaadin.sass.internal.parser.LexicalUnitImpl;
 
 public class ListContainsNode extends ListModifyNode {
 
diff --git a/theme-compiler/src/com/vaadin/sass/tree/ListModifyNode.java b/theme-compiler/src/com/vaadin/sass/internal/tree/ListModifyNode.java
index c571fde08e..29392114c9 100644
--- a/theme-compiler/src/com/vaadin/sass/tree/ListModifyNode.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/tree/ListModifyNode.java
@@ -1,10 +1,10 @@
-package com.vaadin.sass.tree;
+package com.vaadin.sass.internal.tree;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 
-import com.vaadin.sass.ScssStylesheet;
-import com.vaadin.sass.parser.LexicalUnitImpl;
+import com.vaadin.sass.internal.ScssStylesheet;
+import com.vaadin.sass.internal.parser.LexicalUnitImpl;
 
 public abstract class ListModifyNode extends Node implements IVariableNode {
 
diff --git a/theme-compiler/src/com/vaadin/sass/tree/ListRemoveNode.java b/theme-compiler/src/com/vaadin/sass/internal/tree/ListRemoveNode.java
index a72be7bc02..25bea06ac5 100644
--- a/theme-compiler/src/com/vaadin/sass/tree/ListRemoveNode.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/tree/ListRemoveNode.java
@@ -1,4 +1,4 @@
-package com.vaadin.sass.tree;
+package com.vaadin.sass.internal.tree;
 
 import java.util.ArrayList;
 
diff --git a/theme-compiler/src/com/vaadin/sass/tree/MediaNode.java b/theme-compiler/src/com/vaadin/sass/internal/tree/MediaNode.java
index e410e93e53..da8014e270 100644
--- a/theme-compiler/src/com/vaadin/sass/tree/MediaNode.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/tree/MediaNode.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.sass.tree;
+package com.vaadin.sass.internal.tree;
 
 import org.w3c.css.sac.SACMediaList;
 
diff --git a/theme-compiler/src/com/vaadin/sass/tree/MicrosoftRuleNode.java b/theme-compiler/src/com/vaadin/sass/internal/tree/MicrosoftRuleNode.java
index ce2bdc8395..501cd7c822 100644
--- a/theme-compiler/src/com/vaadin/sass/tree/MicrosoftRuleNode.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/tree/MicrosoftRuleNode.java
@@ -1,8 +1,8 @@
-package com.vaadin.sass.tree;
+package com.vaadin.sass.internal.tree;
 
 import java.util.ArrayList;
 
-import com.vaadin.sass.ScssStylesheet;
+import com.vaadin.sass.internal.ScssStylesheet;
 
 public class MicrosoftRuleNode extends Node implements IVariableNode {
 
diff --git a/theme-compiler/src/com/vaadin/sass/tree/MixinDefNode.java b/theme-compiler/src/com/vaadin/sass/internal/tree/MixinDefNode.java
index 9f51a959b8..f493421917 100644
--- a/theme-compiler/src/com/vaadin/sass/tree/MixinDefNode.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/tree/MixinDefNode.java
@@ -14,13 +14,13 @@
  * the License.
  */
 
-package com.vaadin.sass.tree;
+package com.vaadin.sass.internal.tree;
 
 import java.util.ArrayList;
 import java.util.Collection;
 
-import com.vaadin.sass.ScssStylesheet;
-import com.vaadin.sass.util.DeepCopy;
+import com.vaadin.sass.internal.ScssStylesheet;
+import com.vaadin.sass.internal.util.DeepCopy;
 
 public class MixinDefNode extends Node implements IVariableNode {
     private static final long serialVersionUID = 5469294053247343948L;
diff --git a/theme-compiler/src/com/vaadin/sass/tree/MixinNode.java b/theme-compiler/src/com/vaadin/sass/internal/tree/MixinNode.java
index e43be0488a..d92e3ebe9d 100644
--- a/theme-compiler/src/com/vaadin/sass/tree/MixinNode.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/tree/MixinNode.java
@@ -14,14 +14,14 @@
  * the License.
  */
 
-package com.vaadin.sass.tree;
+package com.vaadin.sass.internal.tree;
 
 import java.util.ArrayList;
 import java.util.Collection;
 
-import com.vaadin.sass.ScssStylesheet;
-import com.vaadin.sass.parser.LexicalUnitImpl;
-import com.vaadin.sass.visitor.MixinNodeHandler;
+import com.vaadin.sass.internal.ScssStylesheet;
+import com.vaadin.sass.internal.parser.LexicalUnitImpl;
+import com.vaadin.sass.internal.visitor.MixinNodeHandler;
 
 public class MixinNode extends Node implements IVariableNode {
     private static final long serialVersionUID = 4725008226813110658L;
diff --git a/theme-compiler/src/com/vaadin/sass/tree/NestPropertiesNode.java b/theme-compiler/src/com/vaadin/sass/internal/tree/NestPropertiesNode.java
index 0b0dd90334..79141b2da2 100644
--- a/theme-compiler/src/com/vaadin/sass/tree/NestPropertiesNode.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/tree/NestPropertiesNode.java
@@ -14,13 +14,13 @@
  * the License.
  */
 
-package com.vaadin.sass.tree;
+package com.vaadin.sass.internal.tree;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
-import com.vaadin.sass.visitor.NestedNodeHandler;
+import com.vaadin.sass.internal.visitor.NestedNodeHandler;
 
 public class NestPropertiesNode extends Node implements IVariableNode {
     private static final long serialVersionUID = 3671253315690598308L;
diff --git a/theme-compiler/src/com/vaadin/sass/tree/Node.java b/theme-compiler/src/com/vaadin/sass/internal/tree/Node.java
index aaf887b76b..b5e784dbe6 100644
--- a/theme-compiler/src/com/vaadin/sass/tree/Node.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/tree/Node.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.sass.tree;
+package com.vaadin.sass.internal.tree;
 
 import java.io.Serializable;
 import java.util.ArrayList;
diff --git a/theme-compiler/src/com/vaadin/sass/tree/RuleNode.java b/theme-compiler/src/com/vaadin/sass/internal/tree/RuleNode.java
index 217f6423a7..08fbdea3f1 100644
--- a/theme-compiler/src/com/vaadin/sass/tree/RuleNode.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/tree/RuleNode.java
@@ -14,13 +14,13 @@
  * the License.
  */
 
-package com.vaadin.sass.tree;
+package com.vaadin.sass.internal.tree;
 
 import java.util.ArrayList;
 import java.util.regex.Pattern;
 
-import com.vaadin.sass.ScssStylesheet;
-import com.vaadin.sass.parser.LexicalUnitImpl;
+import com.vaadin.sass.internal.ScssStylesheet;
+import com.vaadin.sass.internal.parser.LexicalUnitImpl;
 
 public class RuleNode extends Node implements IVariableNode {
     private static final long serialVersionUID = 6653493127869037022L;
diff --git a/theme-compiler/src/com/vaadin/sass/tree/SimpleNode.java b/theme-compiler/src/com/vaadin/sass/internal/tree/SimpleNode.java
index adf1a3d15d..8f3e105c37 100644
--- a/theme-compiler/src/com/vaadin/sass/tree/SimpleNode.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/tree/SimpleNode.java
@@ -1,8 +1,8 @@
-package com.vaadin.sass.tree;
+package com.vaadin.sass.internal.tree;
 
 import java.util.ArrayList;
 
-import com.vaadin.sass.ScssStylesheet;
+import com.vaadin.sass.internal.ScssStylesheet;
 
 /**
  * A simple BlockNode where input text equals output. <b>Note : </b> ignores any
diff --git a/theme-compiler/src/com/vaadin/sass/tree/VariableNode.java b/theme-compiler/src/com/vaadin/sass/internal/tree/VariableNode.java
index 89cab33129..a7ae76a482 100644
--- a/theme-compiler/src/com/vaadin/sass/tree/VariableNode.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/tree/VariableNode.java
@@ -14,13 +14,13 @@
  * the License.
  */
 
-package com.vaadin.sass.tree;
+package com.vaadin.sass.internal.tree;
 
 import java.util.ArrayList;
 
-import com.vaadin.sass.ScssStylesheet;
-import com.vaadin.sass.parser.LexicalUnitImpl;
-import com.vaadin.sass.visitor.VariableNodeHandler;
+import com.vaadin.sass.internal.ScssStylesheet;
+import com.vaadin.sass.internal.parser.LexicalUnitImpl;
+import com.vaadin.sass.internal.visitor.VariableNodeHandler;
 
 public class VariableNode extends Node implements IVariableNode {
     private static final long serialVersionUID = 7003372557547748734L;
diff --git a/theme-compiler/src/com/vaadin/sass/tree/WhileNode.java b/theme-compiler/src/com/vaadin/sass/internal/tree/WhileNode.java
index 4cd85a97a4..cbd797cbde 100644
--- a/theme-compiler/src/com/vaadin/sass/tree/WhileNode.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/tree/WhileNode.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.sass.tree;
+package com.vaadin.sass.internal.tree;
 
 public class WhileNode extends Node {
     private static final long serialVersionUID = 7593896018196027279L;
diff --git a/theme-compiler/src/com/vaadin/sass/tree/controldirective/EachDefNode.java b/theme-compiler/src/com/vaadin/sass/internal/tree/controldirective/EachDefNode.java
index 9c58a8c0f1..58cbc285ea 100644
--- a/theme-compiler/src/com/vaadin/sass/tree/controldirective/EachDefNode.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/tree/controldirective/EachDefNode.java
@@ -14,17 +14,17 @@
  * the License.
  */
 
-package com.vaadin.sass.tree.controldirective;
+package com.vaadin.sass.internal.tree.controldirective;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import com.vaadin.sass.ScssStylesheet;
-import com.vaadin.sass.parser.LexicalUnitImpl;
-import com.vaadin.sass.tree.IVariableNode;
-import com.vaadin.sass.tree.Node;
-import com.vaadin.sass.tree.VariableNode;
-import com.vaadin.sass.visitor.EachNodeHandler;
+import com.vaadin.sass.internal.ScssStylesheet;
+import com.vaadin.sass.internal.parser.LexicalUnitImpl;
+import com.vaadin.sass.internal.tree.IVariableNode;
+import com.vaadin.sass.internal.tree.Node;
+import com.vaadin.sass.internal.tree.VariableNode;
+import com.vaadin.sass.internal.visitor.EachNodeHandler;
 
 public class EachDefNode extends Node implements IVariableNode {
     private static final long serialVersionUID = 7943948981204906221L;
diff --git a/theme-compiler/src/com/vaadin/sass/tree/controldirective/ElseNode.java b/theme-compiler/src/com/vaadin/sass/internal/tree/controldirective/ElseNode.java
index ecda69d601..567c534e1b 100644
--- a/theme-compiler/src/com/vaadin/sass/tree/controldirective/ElseNode.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/tree/controldirective/ElseNode.java
@@ -1,6 +1,6 @@
-package com.vaadin.sass.tree.controldirective;
+package com.vaadin.sass.internal.tree.controldirective;
 
-import com.vaadin.sass.tree.Node;
+import com.vaadin.sass.internal.tree.Node;
 
 public class ElseNode extends Node implements IfElseNode {
 
diff --git a/theme-compiler/src/com/vaadin/sass/tree/controldirective/IfElseDefNode.java b/theme-compiler/src/com/vaadin/sass/internal/tree/controldirective/IfElseDefNode.java
index 7cf07c4b0d..3fd1510c31 100644
--- a/theme-compiler/src/com/vaadin/sass/tree/controldirective/IfElseDefNode.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/tree/controldirective/IfElseDefNode.java
@@ -1,7 +1,7 @@
-package com.vaadin.sass.tree.controldirective;
+package com.vaadin.sass.internal.tree.controldirective;
 
-import com.vaadin.sass.tree.Node;
-import com.vaadin.sass.visitor.IfElseNodeHandler;
+import com.vaadin.sass.internal.tree.Node;
+import com.vaadin.sass.internal.visitor.IfElseNodeHandler;
 
 public class IfElseDefNode extends Node {
 
diff --git a/theme-compiler/src/com/vaadin/sass/tree/controldirective/IfElseNode.java b/theme-compiler/src/com/vaadin/sass/internal/tree/controldirective/IfElseNode.java
index 8f6c09addc..239b24614b 100644
--- a/theme-compiler/src/com/vaadin/sass/tree/controldirective/IfElseNode.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/tree/controldirective/IfElseNode.java
@@ -1,4 +1,4 @@
-package com.vaadin.sass.tree.controldirective;
+package com.vaadin.sass.internal.tree.controldirective;
 
 public interface IfElseNode {
 
diff --git a/theme-compiler/src/com/vaadin/sass/tree/controldirective/IfNode.java b/theme-compiler/src/com/vaadin/sass/internal/tree/controldirective/IfNode.java
index cdaf1b0552..570024e72c 100644
--- a/theme-compiler/src/com/vaadin/sass/tree/controldirective/IfNode.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/tree/controldirective/IfNode.java
@@ -13,15 +13,15 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.sass.tree.controldirective;
+package com.vaadin.sass.internal.tree.controldirective;
 
 import java.util.ArrayList;
 import java.util.regex.Pattern;
 
-import com.vaadin.sass.ScssStylesheet;
-import com.vaadin.sass.tree.IVariableNode;
-import com.vaadin.sass.tree.Node;
-import com.vaadin.sass.tree.VariableNode;
+import com.vaadin.sass.internal.ScssStylesheet;
+import com.vaadin.sass.internal.tree.IVariableNode;
+import com.vaadin.sass.internal.tree.Node;
+import com.vaadin.sass.internal.tree.VariableNode;
 
 public class IfNode extends Node implements IfElseNode, IVariableNode {
     private String expression;
diff --git a/theme-compiler/src/com/vaadin/sass/util/Clonable.java b/theme-compiler/src/com/vaadin/sass/internal/util/Clonable.java
index 639f158fb0..8c6dcaba34 100644
--- a/theme-compiler/src/com/vaadin/sass/util/Clonable.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/util/Clonable.java
@@ -1,4 +1,4 @@
-package com.vaadin.sass.util;
+package com.vaadin.sass.internal.util;
 
 public interface Clonable {
 
diff --git a/theme-compiler/src/com/vaadin/sass/util/ColorUtil.java b/theme-compiler/src/com/vaadin/sass/internal/util/ColorUtil.java
index 7377b202ab..163d65ecb9 100644
--- a/theme-compiler/src/com/vaadin/sass/util/ColorUtil.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/util/ColorUtil.java
@@ -14,11 +14,11 @@
  * the License.
  */
 
-package com.vaadin.sass.util;
+package com.vaadin.sass.internal.util;
 
 import org.w3c.css.sac.LexicalUnit;
 
-import com.vaadin.sass.parser.LexicalUnitImpl;
+import com.vaadin.sass.internal.parser.LexicalUnitImpl;
 
 public class ColorUtil {
     public static LexicalUnitImpl hexColorToHsl(LexicalUnitImpl hexColor) {
diff --git a/theme-compiler/src/com/vaadin/sass/util/DeepCopy.java b/theme-compiler/src/com/vaadin/sass/internal/util/DeepCopy.java
index 5d4e43c477..130a3bbdce 100644
--- a/theme-compiler/src/com/vaadin/sass/util/DeepCopy.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/util/DeepCopy.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.sass.util;
+package com.vaadin.sass.internal.util;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
diff --git a/theme-compiler/src/com/vaadin/sass/util/FastByteArrayInputStream.java b/theme-compiler/src/com/vaadin/sass/internal/util/FastByteArrayInputStream.java
index 1b3d0ea0f7..e1fd6b13a1 100644
--- a/theme-compiler/src/com/vaadin/sass/util/FastByteArrayInputStream.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/util/FastByteArrayInputStream.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.sass.util;
+package com.vaadin.sass.internal.util;
 
 import java.io.InputStream;
 
diff --git a/theme-compiler/src/com/vaadin/sass/util/FastByteArrayOutputStream.java b/theme-compiler/src/com/vaadin/sass/internal/util/FastByteArrayOutputStream.java
index 24b386686f..d5456f2258 100644
--- a/theme-compiler/src/com/vaadin/sass/util/FastByteArrayOutputStream.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/util/FastByteArrayOutputStream.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.sass.util;
+package com.vaadin.sass.internal.util;
 
 import java.io.InputStream;
 import java.io.OutputStream;
diff --git a/theme-compiler/src/com/vaadin/sass/util/StringUtil.java b/theme-compiler/src/com/vaadin/sass/internal/util/StringUtil.java
index bd39f1d41a..7bc5ae5e26 100644
--- a/theme-compiler/src/com/vaadin/sass/util/StringUtil.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/util/StringUtil.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.sass.util;
+package com.vaadin.sass.internal.util;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/theme-compiler/src/com/vaadin/sass/visitor/BlockNodeHandler.java b/theme-compiler/src/com/vaadin/sass/internal/visitor/BlockNodeHandler.java
index a131208ece..cb736ba558 100644
--- a/theme-compiler/src/com/vaadin/sass/visitor/BlockNodeHandler.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/visitor/BlockNodeHandler.java
@@ -14,14 +14,14 @@
  * the License.
  */
 
-package com.vaadin.sass.visitor;
+package com.vaadin.sass.internal.visitor;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 
-import com.vaadin.sass.ScssStylesheet;
-import com.vaadin.sass.tree.BlockNode;
-import com.vaadin.sass.tree.Node;
+import com.vaadin.sass.internal.ScssStylesheet;
+import com.vaadin.sass.internal.tree.BlockNode;
+import com.vaadin.sass.internal.tree.Node;
 
 /**
  * Handle nesting of blocks by moving child blocks to their parent, updating
diff --git a/theme-compiler/src/com/vaadin/sass/visitor/EachNodeHandler.java b/theme-compiler/src/com/vaadin/sass/internal/visitor/EachNodeHandler.java
index 0eb86f3a80..a99a700d42 100644
--- a/theme-compiler/src/com/vaadin/sass/visitor/EachNodeHandler.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/visitor/EachNodeHandler.java
@@ -1,14 +1,14 @@
-package com.vaadin.sass.visitor;
+package com.vaadin.sass.internal.visitor;
 
 import java.util.ArrayList;
 
-import com.vaadin.sass.ScssStylesheet;
-import com.vaadin.sass.parser.LexicalUnitImpl;
-import com.vaadin.sass.tree.IVariableNode;
-import com.vaadin.sass.tree.Node;
-import com.vaadin.sass.tree.VariableNode;
-import com.vaadin.sass.tree.controldirective.EachDefNode;
-import com.vaadin.sass.util.DeepCopy;
+import com.vaadin.sass.internal.ScssStylesheet;
+import com.vaadin.sass.internal.parser.LexicalUnitImpl;
+import com.vaadin.sass.internal.tree.IVariableNode;
+import com.vaadin.sass.internal.tree.Node;
+import com.vaadin.sass.internal.tree.VariableNode;
+import com.vaadin.sass.internal.tree.controldirective.EachDefNode;
+import com.vaadin.sass.internal.util.DeepCopy;
 
 public class EachNodeHandler {
 
diff --git a/theme-compiler/src/com/vaadin/sass/visitor/ExtendNodeHandler.java b/theme-compiler/src/com/vaadin/sass/internal/visitor/ExtendNodeHandler.java
index 0e05781072..c05f8f6d38 100644
--- a/theme-compiler/src/com/vaadin/sass/visitor/ExtendNodeHandler.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/visitor/ExtendNodeHandler.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.sass.visitor;
+package com.vaadin.sass.internal.visitor;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -22,10 +22,10 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import com.vaadin.sass.ScssStylesheet;
-import com.vaadin.sass.tree.BlockNode;
-import com.vaadin.sass.tree.ExtendNode;
-import com.vaadin.sass.tree.Node;
+import com.vaadin.sass.internal.ScssStylesheet;
+import com.vaadin.sass.internal.tree.BlockNode;
+import com.vaadin.sass.internal.tree.ExtendNode;
+import com.vaadin.sass.internal.tree.Node;
 
 public class ExtendNodeHandler {
     private static Map<String, List<ArrayList<String>>> extendsMap = new HashMap<String, List<ArrayList<String>>>();
diff --git a/theme-compiler/src/com/vaadin/sass/visitor/IfElseNodeHandler.java b/theme-compiler/src/com/vaadin/sass/internal/visitor/IfElseNodeHandler.java
index 593f22a631..9e73273c57 100644
--- a/theme-compiler/src/com/vaadin/sass/visitor/IfElseNodeHandler.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/visitor/IfElseNodeHandler.java
@@ -1,4 +1,4 @@
-package com.vaadin.sass.visitor;
+package com.vaadin.sass.internal.visitor;
 
 import java.util.ArrayList;
 import java.util.regex.Matcher;
@@ -9,11 +9,11 @@ import org.apache.commons.jexl2.JexlEngine;
 import org.apache.commons.jexl2.JexlException;
 import org.w3c.flute.parser.ParseException;
 
-import com.vaadin.sass.tree.Node;
-import com.vaadin.sass.tree.controldirective.ElseNode;
-import com.vaadin.sass.tree.controldirective.IfElseDefNode;
-import com.vaadin.sass.tree.controldirective.IfElseNode;
-import com.vaadin.sass.tree.controldirective.IfNode;
+import com.vaadin.sass.internal.tree.Node;
+import com.vaadin.sass.internal.tree.controldirective.ElseNode;
+import com.vaadin.sass.internal.tree.controldirective.IfElseDefNode;
+import com.vaadin.sass.internal.tree.controldirective.IfElseNode;
+import com.vaadin.sass.internal.tree.controldirective.IfNode;
 
 public class IfElseNodeHandler {
 
diff --git a/theme-compiler/src/com/vaadin/sass/visitor/ImportNodeHandler.java b/theme-compiler/src/com/vaadin/sass/internal/visitor/ImportNodeHandler.java
index f2fb128128..1ba1072767 100644
--- a/theme-compiler/src/com/vaadin/sass/visitor/ImportNodeHandler.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/visitor/ImportNodeHandler.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.sass.visitor;
+package com.vaadin.sass.internal.visitor;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -24,12 +24,12 @@ import java.util.ArrayList;
 import org.w3c.css.sac.CSSException;
 import org.w3c.css.sac.LexicalUnit;
 
-import com.vaadin.sass.ScssStylesheet;
-import com.vaadin.sass.parser.LexicalUnitImpl;
-import com.vaadin.sass.tree.ImportNode;
-import com.vaadin.sass.tree.Node;
-import com.vaadin.sass.tree.RuleNode;
-import com.vaadin.sass.util.StringUtil;
+import com.vaadin.sass.internal.ScssStylesheet;
+import com.vaadin.sass.internal.parser.LexicalUnitImpl;
+import com.vaadin.sass.internal.tree.ImportNode;
+import com.vaadin.sass.internal.tree.Node;
+import com.vaadin.sass.internal.tree.RuleNode;
+import com.vaadin.sass.internal.util.StringUtil;
 
 public class ImportNodeHandler {
 
diff --git a/theme-compiler/src/com/vaadin/sass/visitor/MixinNodeHandler.java b/theme-compiler/src/com/vaadin/sass/internal/visitor/MixinNodeHandler.java
index 4875a39b1d..1fd7adf0c5 100644
--- a/theme-compiler/src/com/vaadin/sass/visitor/MixinNodeHandler.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/visitor/MixinNodeHandler.java
@@ -14,18 +14,18 @@
  * the License.
  */
 
-package com.vaadin.sass.visitor;
+package com.vaadin.sass.internal.visitor;
 
 import java.util.ArrayList;
 
-import com.vaadin.sass.ScssStylesheet;
-import com.vaadin.sass.parser.LexicalUnitImpl;
-import com.vaadin.sass.tree.IVariableNode;
-import com.vaadin.sass.tree.MixinDefNode;
-import com.vaadin.sass.tree.MixinNode;
-import com.vaadin.sass.tree.Node;
-import com.vaadin.sass.tree.VariableNode;
-import com.vaadin.sass.util.DeepCopy;
+import com.vaadin.sass.internal.ScssStylesheet;
+import com.vaadin.sass.internal.parser.LexicalUnitImpl;
+import com.vaadin.sass.internal.tree.IVariableNode;
+import com.vaadin.sass.internal.tree.MixinDefNode;
+import com.vaadin.sass.internal.tree.MixinNode;
+import com.vaadin.sass.internal.tree.Node;
+import com.vaadin.sass.internal.tree.VariableNode;
+import com.vaadin.sass.internal.util.DeepCopy;
 
 public class MixinNodeHandler {
 
diff --git a/theme-compiler/src/com/vaadin/sass/visitor/NestedNodeHandler.java b/theme-compiler/src/com/vaadin/sass/internal/visitor/NestedNodeHandler.java
index bf75b3f728..a6da7b37d3 100644
--- a/theme-compiler/src/com/vaadin/sass/visitor/NestedNodeHandler.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/visitor/NestedNodeHandler.java
@@ -14,11 +14,11 @@
  * the License.
  */
 
-package com.vaadin.sass.visitor;
+package com.vaadin.sass.internal.visitor;
 
-import com.vaadin.sass.tree.NestPropertiesNode;
-import com.vaadin.sass.tree.Node;
-import com.vaadin.sass.tree.RuleNode;
+import com.vaadin.sass.internal.tree.NestPropertiesNode;
+import com.vaadin.sass.internal.tree.Node;
+import com.vaadin.sass.internal.tree.RuleNode;
 
 /**
  * Handle nested properties nodes (e.g. "font: { family: serif; }" to
diff --git a/theme-compiler/src/com/vaadin/sass/visitor/VariableNodeHandler.java b/theme-compiler/src/com/vaadin/sass/internal/visitor/VariableNodeHandler.java
index 3ea26433e2..2f6e6f65f8 100644
--- a/theme-compiler/src/com/vaadin/sass/visitor/VariableNodeHandler.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/visitor/VariableNodeHandler.java
@@ -14,10 +14,10 @@
  * the License.
  */
 
-package com.vaadin.sass.visitor;
+package com.vaadin.sass.internal.visitor;
 
-import com.vaadin.sass.ScssStylesheet;
-import com.vaadin.sass.tree.VariableNode;
+import com.vaadin.sass.internal.ScssStylesheet;
+import com.vaadin.sass.internal.tree.VariableNode;
 
 public class VariableNodeHandler {
 
diff --git a/theme-compiler/src/com/vaadin/sass/visitor/Visitor.java b/theme-compiler/src/com/vaadin/sass/internal/visitor/Visitor.java
index 046cb7c0d1..6b1f9edcbc 100644
--- a/theme-compiler/src/com/vaadin/sass/visitor/Visitor.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/visitor/Visitor.java
@@ -14,9 +14,9 @@
  * the License.
  */
 
-package com.vaadin.sass.visitor;
+package com.vaadin.sass.internal.visitor;
 
-import com.vaadin.sass.tree.Node;
+import com.vaadin.sass.internal.tree.Node;
 
 public interface Visitor {
 
diff --git a/theme-compiler/tests/src/com/vaadin/sass/AbstractTestBase.java b/theme-compiler/tests/src/com/vaadin/sass/AbstractTestBase.java
index a6b03fefb0..ca68b18858 100644
--- a/theme-compiler/tests/src/com/vaadin/sass/AbstractTestBase.java
+++ b/theme-compiler/tests/src/com/vaadin/sass/AbstractTestBase.java
@@ -26,6 +26,8 @@ import junit.framework.Assert;
 import org.apache.commons.io.IOUtils;
 import org.w3c.css.sac.CSSException;
 
+import com.vaadin.sass.internal.ScssStylesheet;
+
 public abstract class AbstractTestBase {
 
     protected ScssStylesheet stylesheet;
diff --git a/theme-compiler/tests/src/com/vaadin/sass/parser/ParserTest.java b/theme-compiler/tests/src/com/vaadin/sass/parser/ParserTest.java
index 34c365ea13..51095c06a8 100644
--- a/theme-compiler/tests/src/com/vaadin/sass/parser/ParserTest.java
+++ b/theme-compiler/tests/src/com/vaadin/sass/parser/ParserTest.java
@@ -25,8 +25,10 @@ import org.w3c.css.sac.CSSException;
 import org.w3c.css.sac.InputSource;
 import org.w3c.css.sac.LexicalUnit;
 
-import com.vaadin.sass.handler.SCSSDocumentHandler;
-import com.vaadin.sass.handler.SCSSDocumentHandlerImpl;
+import com.vaadin.sass.internal.handler.SCSSDocumentHandler;
+import com.vaadin.sass.internal.handler.SCSSDocumentHandlerImpl;
+import com.vaadin.sass.internal.parser.Parser;
+import com.vaadin.sass.internal.parser.SCSSLexicalUnit;
 
 public class ParserTest {
 
diff --git a/theme-compiler/tests/src/com/vaadin/sass/testcases/css/Interpolation.java b/theme-compiler/tests/src/com/vaadin/sass/testcases/css/Interpolation.java
index 01d593db78..34310cd0a9 100644
--- a/theme-compiler/tests/src/com/vaadin/sass/testcases/css/Interpolation.java
+++ b/theme-compiler/tests/src/com/vaadin/sass/testcases/css/Interpolation.java
@@ -24,11 +24,11 @@ import org.junit.Test;
 import org.w3c.css.sac.CSSException;
 
 import com.vaadin.sass.AbstractTestBase;
-import com.vaadin.sass.ScssStylesheet;
-import com.vaadin.sass.handler.SCSSDocumentHandler;
-import com.vaadin.sass.handler.SCSSDocumentHandlerImpl;
-import com.vaadin.sass.parser.Parser;
-import com.vaadin.sass.tree.BlockNode;
+import com.vaadin.sass.internal.ScssStylesheet;
+import com.vaadin.sass.internal.handler.SCSSDocumentHandler;
+import com.vaadin.sass.internal.handler.SCSSDocumentHandlerImpl;
+import com.vaadin.sass.internal.parser.Parser;
+import com.vaadin.sass.internal.tree.BlockNode;
 
 public class Interpolation extends AbstractTestBase {
     String scss = "/scss/interpolation.scss";
diff --git a/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Comments.java b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Comments.java
index a07292fa83..dc1c064192 100644
--- a/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Comments.java
+++ b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Comments.java
@@ -25,11 +25,11 @@ import org.junit.Test;
 import org.w3c.css.sac.CSSException;
 
 import com.vaadin.sass.AbstractTestBase;
-import com.vaadin.sass.ScssStylesheet;
-import com.vaadin.sass.handler.SCSSDocumentHandler;
-import com.vaadin.sass.handler.SCSSDocumentHandlerImpl;
-import com.vaadin.sass.parser.Parser;
-import com.vaadin.sass.tree.CommentNode;
+import com.vaadin.sass.internal.ScssStylesheet;
+import com.vaadin.sass.internal.handler.SCSSDocumentHandler;
+import com.vaadin.sass.internal.handler.SCSSDocumentHandlerImpl;
+import com.vaadin.sass.internal.parser.Parser;
+import com.vaadin.sass.internal.tree.CommentNode;
 
 public class Comments extends AbstractTestBase {
     String scss = "/scss/comments.scss";
diff --git a/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/ControlDirectives.java b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/ControlDirectives.java
index 7a0f1f1a25..f28c2a1ddb 100644
--- a/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/ControlDirectives.java
+++ b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/ControlDirectives.java
@@ -25,16 +25,16 @@ import org.junit.Test;
 import org.w3c.css.sac.CSSException;
 
 import com.vaadin.sass.AbstractTestBase;
-import com.vaadin.sass.ScssStylesheet;
-import com.vaadin.sass.handler.SCSSDocumentHandler;
-import com.vaadin.sass.handler.SCSSDocumentHandlerImpl;
-import com.vaadin.sass.parser.Parser;
-import com.vaadin.sass.tree.BlockNode;
-import com.vaadin.sass.tree.MixinDefNode;
-import com.vaadin.sass.tree.MixinNode;
-import com.vaadin.sass.tree.Node;
-import com.vaadin.sass.tree.controldirective.EachDefNode;
-import com.vaadin.sass.tree.controldirective.IfElseDefNode;
+import com.vaadin.sass.internal.ScssStylesheet;
+import com.vaadin.sass.internal.handler.SCSSDocumentHandler;
+import com.vaadin.sass.internal.handler.SCSSDocumentHandlerImpl;
+import com.vaadin.sass.internal.parser.Parser;
+import com.vaadin.sass.internal.tree.BlockNode;
+import com.vaadin.sass.internal.tree.MixinDefNode;
+import com.vaadin.sass.internal.tree.MixinNode;
+import com.vaadin.sass.internal.tree.Node;
+import com.vaadin.sass.internal.tree.controldirective.EachDefNode;
+import com.vaadin.sass.internal.tree.controldirective.IfElseDefNode;
 
 public class ControlDirectives extends AbstractTestBase {
 
diff --git a/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Extends.java b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Extends.java
index f52a1d2f8b..7b19e2bb4c 100644
--- a/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Extends.java
+++ b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Extends.java
@@ -24,11 +24,11 @@ import org.junit.Test;
 import org.w3c.css.sac.CSSException;
 
 import com.vaadin.sass.AbstractTestBase;
-import com.vaadin.sass.ScssStylesheet;
-import com.vaadin.sass.handler.SCSSDocumentHandler;
-import com.vaadin.sass.handler.SCSSDocumentHandlerImpl;
-import com.vaadin.sass.parser.Parser;
-import com.vaadin.sass.tree.ExtendNode;
+import com.vaadin.sass.internal.ScssStylesheet;
+import com.vaadin.sass.internal.handler.SCSSDocumentHandler;
+import com.vaadin.sass.internal.handler.SCSSDocumentHandlerImpl;
+import com.vaadin.sass.internal.parser.Parser;
+import com.vaadin.sass.internal.tree.ExtendNode;
 
 public class Extends extends AbstractTestBase {
     String scss = "/scss/extends.scss";
diff --git a/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Functions.java b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Functions.java
index cc6d67795c..3b9e6bd743 100644
--- a/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Functions.java
+++ b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Functions.java
@@ -23,11 +23,11 @@ import org.junit.Test;
 import org.w3c.css.sac.CSSException;
 
 import com.vaadin.sass.AbstractTestBase;
-import com.vaadin.sass.ScssStylesheet;
-import com.vaadin.sass.handler.SCSSDocumentHandler;
-import com.vaadin.sass.handler.SCSSDocumentHandlerImpl;
-import com.vaadin.sass.parser.Parser;
-import com.vaadin.sass.tree.BlockNode;
+import com.vaadin.sass.internal.ScssStylesheet;
+import com.vaadin.sass.internal.handler.SCSSDocumentHandler;
+import com.vaadin.sass.internal.handler.SCSSDocumentHandlerImpl;
+import com.vaadin.sass.internal.parser.Parser;
+import com.vaadin.sass.internal.tree.BlockNode;
 
 public class Functions extends AbstractTestBase {
 
diff --git a/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Imports.java b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Imports.java
index 8c609273a1..3de1acee45 100644
--- a/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Imports.java
+++ b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Imports.java
@@ -24,11 +24,11 @@ import org.junit.Test;
 import org.w3c.css.sac.CSSException;
 
 import com.vaadin.sass.AbstractTestBase;
-import com.vaadin.sass.ScssStylesheet;
-import com.vaadin.sass.handler.SCSSDocumentHandler;
-import com.vaadin.sass.handler.SCSSDocumentHandlerImpl;
-import com.vaadin.sass.parser.Parser;
-import com.vaadin.sass.tree.ImportNode;
+import com.vaadin.sass.internal.ScssStylesheet;
+import com.vaadin.sass.internal.handler.SCSSDocumentHandler;
+import com.vaadin.sass.internal.handler.SCSSDocumentHandlerImpl;
+import com.vaadin.sass.internal.parser.Parser;
+import com.vaadin.sass.internal.tree.ImportNode;
 
 public class Imports extends AbstractTestBase {
 
diff --git a/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Mixins.java b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Mixins.java
index cce67f89c8..444b597e62 100644
--- a/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Mixins.java
+++ b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Mixins.java
@@ -25,14 +25,14 @@ import org.w3c.css.sac.CSSException;
 import org.w3c.css.sac.LexicalUnit;
 
 import com.vaadin.sass.AbstractTestBase;
-import com.vaadin.sass.ScssStylesheet;
-import com.vaadin.sass.handler.SCSSDocumentHandler;
-import com.vaadin.sass.handler.SCSSDocumentHandlerImpl;
-import com.vaadin.sass.parser.LexicalUnitImpl;
-import com.vaadin.sass.parser.Parser;
-import com.vaadin.sass.tree.BlockNode;
-import com.vaadin.sass.tree.MixinDefNode;
-import com.vaadin.sass.tree.MixinNode;
+import com.vaadin.sass.internal.ScssStylesheet;
+import com.vaadin.sass.internal.handler.SCSSDocumentHandler;
+import com.vaadin.sass.internal.handler.SCSSDocumentHandlerImpl;
+import com.vaadin.sass.internal.parser.LexicalUnitImpl;
+import com.vaadin.sass.internal.parser.Parser;
+import com.vaadin.sass.internal.tree.BlockNode;
+import com.vaadin.sass.internal.tree.MixinDefNode;
+import com.vaadin.sass.internal.tree.MixinNode;
 
 public class Mixins extends AbstractTestBase {
 
diff --git a/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/NestedProperties.java b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/NestedProperties.java
index 2f57934086..a607a01542 100644
--- a/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/NestedProperties.java
+++ b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/NestedProperties.java
@@ -24,13 +24,13 @@ import org.junit.Test;
 import org.w3c.css.sac.CSSException;
 
 import com.vaadin.sass.AbstractTestBase;
-import com.vaadin.sass.ScssStylesheet;
-import com.vaadin.sass.handler.SCSSDocumentHandler;
-import com.vaadin.sass.handler.SCSSDocumentHandlerImpl;
-import com.vaadin.sass.parser.Parser;
-import com.vaadin.sass.tree.BlockNode;
-import com.vaadin.sass.tree.NestPropertiesNode;
-import com.vaadin.sass.tree.RuleNode;
+import com.vaadin.sass.internal.ScssStylesheet;
+import com.vaadin.sass.internal.handler.SCSSDocumentHandler;
+import com.vaadin.sass.internal.handler.SCSSDocumentHandlerImpl;
+import com.vaadin.sass.internal.parser.Parser;
+import com.vaadin.sass.internal.tree.BlockNode;
+import com.vaadin.sass.internal.tree.NestPropertiesNode;
+import com.vaadin.sass.internal.tree.RuleNode;
 
 public class NestedProperties extends AbstractTestBase {
     String scss = "/scss/nested-properties.scss";
diff --git a/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Nesting.java b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Nesting.java
index 55365c78e1..109182f608 100644
--- a/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Nesting.java
+++ b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Nesting.java
@@ -24,11 +24,11 @@ import org.junit.Test;
 import org.w3c.css.sac.CSSException;
 
 import com.vaadin.sass.AbstractTestBase;
-import com.vaadin.sass.ScssStylesheet;
-import com.vaadin.sass.handler.SCSSDocumentHandler;
-import com.vaadin.sass.handler.SCSSDocumentHandlerImpl;
-import com.vaadin.sass.parser.Parser;
-import com.vaadin.sass.tree.BlockNode;
+import com.vaadin.sass.internal.ScssStylesheet;
+import com.vaadin.sass.internal.handler.SCSSDocumentHandler;
+import com.vaadin.sass.internal.handler.SCSSDocumentHandlerImpl;
+import com.vaadin.sass.internal.parser.Parser;
+import com.vaadin.sass.internal.tree.BlockNode;
 
 public class Nesting extends AbstractTestBase {
 
diff --git a/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/ParentImports.java b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/ParentImports.java
index 8b12f3b7e9..b0de2b07bd 100644
--- a/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/ParentImports.java
+++ b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/ParentImports.java
@@ -24,11 +24,11 @@ import org.junit.Test;
 import org.w3c.css.sac.CSSException;
 
 import com.vaadin.sass.AbstractTestBase;
-import com.vaadin.sass.ScssStylesheet;
-import com.vaadin.sass.handler.SCSSDocumentHandler;
-import com.vaadin.sass.handler.SCSSDocumentHandlerImpl;
-import com.vaadin.sass.parser.Parser;
-import com.vaadin.sass.tree.ImportNode;
+import com.vaadin.sass.internal.ScssStylesheet;
+import com.vaadin.sass.internal.handler.SCSSDocumentHandler;
+import com.vaadin.sass.internal.handler.SCSSDocumentHandlerImpl;
+import com.vaadin.sass.internal.parser.Parser;
+import com.vaadin.sass.internal.tree.ImportNode;
 
 public class ParentImports extends AbstractTestBase {
 
diff --git a/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/ParentSelector.java b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/ParentSelector.java
index ebe62fd678..e5d062f0d0 100644
--- a/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/ParentSelector.java
+++ b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/ParentSelector.java
@@ -23,11 +23,11 @@ import org.junit.Test;
 import org.w3c.css.sac.CSSException;
 
 import com.vaadin.sass.AbstractTestBase;
-import com.vaadin.sass.ScssStylesheet;
-import com.vaadin.sass.handler.SCSSDocumentHandler;
-import com.vaadin.sass.handler.SCSSDocumentHandlerImpl;
-import com.vaadin.sass.parser.Parser;
-import com.vaadin.sass.tree.BlockNode;
+import com.vaadin.sass.internal.ScssStylesheet;
+import com.vaadin.sass.internal.handler.SCSSDocumentHandler;
+import com.vaadin.sass.internal.handler.SCSSDocumentHandlerImpl;
+import com.vaadin.sass.internal.parser.Parser;
+import com.vaadin.sass.internal.tree.BlockNode;
 
 public class ParentSelector extends AbstractTestBase {
     String scss = "/scss/parent-selector.scss";
diff --git a/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/VariableGuarded.java b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/VariableGuarded.java
index 2c37737e69..a0727736e4 100644
--- a/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/VariableGuarded.java
+++ b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/VariableGuarded.java
@@ -8,10 +8,10 @@ import org.junit.Test;
 import org.w3c.css.sac.CSSException;
 
 import com.vaadin.sass.AbstractTestBase;
-import com.vaadin.sass.ScssStylesheet;
-import com.vaadin.sass.handler.SCSSDocumentHandler;
-import com.vaadin.sass.handler.SCSSDocumentHandlerImpl;
-import com.vaadin.sass.parser.Parser;
+import com.vaadin.sass.internal.ScssStylesheet;
+import com.vaadin.sass.internal.handler.SCSSDocumentHandler;
+import com.vaadin.sass.internal.handler.SCSSDocumentHandlerImpl;
+import com.vaadin.sass.internal.parser.Parser;
 
 public class VariableGuarded extends AbstractTestBase {
     String scss = "/scss/var-guarded.scss";
diff --git a/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Variables.java b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Variables.java
index 32984c53ec..5c884259ab 100644
--- a/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Variables.java
+++ b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Variables.java
@@ -24,14 +24,14 @@ import org.junit.Test;
 import org.w3c.css.sac.CSSException;
 
 import com.vaadin.sass.AbstractTestBase;
-import com.vaadin.sass.ScssStylesheet;
-import com.vaadin.sass.handler.SCSSDocumentHandler;
-import com.vaadin.sass.handler.SCSSDocumentHandlerImpl;
-import com.vaadin.sass.parser.Parser;
-import com.vaadin.sass.parser.SCSSLexicalUnit;
-import com.vaadin.sass.tree.BlockNode;
-import com.vaadin.sass.tree.RuleNode;
-import com.vaadin.sass.tree.VariableNode;
+import com.vaadin.sass.internal.ScssStylesheet;
+import com.vaadin.sass.internal.handler.SCSSDocumentHandler;
+import com.vaadin.sass.internal.handler.SCSSDocumentHandlerImpl;
+import com.vaadin.sass.internal.parser.Parser;
+import com.vaadin.sass.internal.parser.SCSSLexicalUnit;
+import com.vaadin.sass.internal.tree.BlockNode;
+import com.vaadin.sass.internal.tree.RuleNode;
+import com.vaadin.sass.internal.tree.VariableNode;
 
 public class Variables extends AbstractTestBase {
 
diff --git a/theme-compiler/tests/src/com/vaadin/sass/tree/ImportNodeTest.java b/theme-compiler/tests/src/com/vaadin/sass/tree/ImportNodeTest.java
index b3a1c8f318..a2c8956a51 100644
--- a/theme-compiler/tests/src/com/vaadin/sass/tree/ImportNodeTest.java
+++ b/theme-compiler/tests/src/com/vaadin/sass/tree/ImportNodeTest.java
@@ -20,6 +20,7 @@ import org.junit.Assert;
 import org.junit.Test;
 
 import com.steadystate.css.parser.SACMediaListImpl;
+import com.vaadin.sass.internal.tree.ImportNode;
 
 public class ImportNodeTest {
     @Test