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

Change-Id: Ia783142aa96665a26491b659a387490883875d37

server/src/com/vaadin/server/VaadinServlet.java

@@ -40,7 +40,7 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.vaadin.sass.ScssStylesheet;
+import com.vaadin.sass.internal.ScssStylesheet;
 import com.vaadin.server.AbstractCommunicationManager.Callback;
 import com.vaadin.shared.ApplicationConstants;
 import com.vaadin.ui.UI;

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

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 {

theme-compiler/src/com/vaadin/sass/ScssStylesheet.java → 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 {
 

theme-compiler/src/com/vaadin/sass/handler/SCSSDocumentHandler.java → 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();

theme-compiler/src/com/vaadin/sass/handler/SCSSDocumentHandlerImpl.java → 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 {
 

theme-compiler/src/com/vaadin/sass/handler/SCSSErrorHandler.java → 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;

theme-compiler/src/com/vaadin/sass/parser/CharStream.java → 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

theme-compiler/src/com/vaadin/sass/parser/Generic_CharStream.java → 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

theme-compiler/src/com/vaadin/sass/parser/JumpException.java → 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 $

theme-compiler/src/com/vaadin/sass/parser/LexicalUnitImpl.java → 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 $

theme-compiler/src/com/vaadin/sass/parser/LocatorImpl.java → 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;
 

theme-compiler/src/com/vaadin/sass/parser/MediaListImpl.java → 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;
 

theme-compiler/src/com/vaadin/sass/parser/ParseException.java → 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;
 

theme-compiler/src/com/vaadin/sass/parser/Parser.java → 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

theme-compiler/src/com/vaadin/sass/parser/Parser.jj → 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

theme-compiler/src/com/vaadin/sass/parser/ParserConstants.java → 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;
 
 
 /**

theme-compiler/src/com/vaadin/sass/parser/ParserTokenManager.java → 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

theme-compiler/src/com/vaadin/sass/parser/SCSSLexicalUnit.java → 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;
 

theme-compiler/src/com/vaadin/sass/parser/SelectorListImpl.java → 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;

theme-compiler/src/com/vaadin/sass/parser/Selectors.java → 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;

theme-compiler/src/com/vaadin/sass/parser/ThrowedParseException.java → 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 $

theme-compiler/src/com/vaadin/sass/parser/Token.java → 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.

theme-compiler/src/com/vaadin/sass/parser/TokenMgrError.java → 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

theme-compiler/src/com/vaadin/sass/resolver/ClassloaderResolver.java → 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;

theme-compiler/src/com/vaadin/sass/resolver/FilesystemResolver.java → 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;

theme-compiler/src/com/vaadin/sass/resolver/ScssStylesheetResolver.java → 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;
 

theme-compiler/src/com/vaadin/sass/resolver/VaadinResolver.java → 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;

theme-compiler/src/com/vaadin/sass/selector/CompositeSelector.java → 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;
 

theme-compiler/src/com/vaadin/sass/selector/SelectorUtil.java → 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 {
 

theme-compiler/src/com/vaadin/sass/tree/BlockNode.java → 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 {
 

theme-compiler/src/com/vaadin/sass/tree/CommentNode.java → 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;

theme-compiler/src/com/vaadin/sass/tree/ExtendNode.java → 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;

theme-compiler/src/com/vaadin/sass/tree/FontFaceNode.java → 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 {
 

theme-compiler/src/com/vaadin/sass/tree/ForNode.java → 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;

theme-compiler/src/com/vaadin/sass/tree/FunctionNode.java → 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;

theme-compiler/src/com/vaadin/sass/tree/IVariableNode.java → 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;
 

theme-compiler/src/com/vaadin/sass/tree/ImportNode.java → 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;

theme-compiler/src/com/vaadin/sass/tree/ListAppendNode.java → 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;
 

theme-compiler/src/com/vaadin/sass/tree/ListContainsNode.java → 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 {
 

theme-compiler/src/com/vaadin/sass/tree/ListModifyNode.java → 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 {
 

theme-compiler/src/com/vaadin/sass/tree/ListRemoveNode.java → 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;
 

theme-compiler/src/com/vaadin/sass/tree/MediaNode.java → 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;
 

theme-compiler/src/com/vaadin/sass/tree/MicrosoftRuleNode.java → 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 {
 

theme-compiler/src/com/vaadin/sass/tree/MixinDefNode.java → 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;

theme-compiler/src/com/vaadin/sass/tree/MixinNode.java → 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;

theme-compiler/src/com/vaadin/sass/tree/NestPropertiesNode.java → 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;

theme-compiler/src/com/vaadin/sass/tree/Node.java → 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;

theme-compiler/src/com/vaadin/sass/tree/RuleNode.java → 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;

theme-compiler/src/com/vaadin/sass/tree/SimpleNode.java → 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

theme-compiler/src/com/vaadin/sass/tree/VariableNode.java → 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;

theme-compiler/src/com/vaadin/sass/tree/WhileNode.java → 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;

theme-compiler/src/com/vaadin/sass/tree/controldirective/EachDefNode.java → 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;

theme-compiler/src/com/vaadin/sass/tree/controldirective/ElseNode.java → 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 {
 

theme-compiler/src/com/vaadin/sass/tree/controldirective/IfElseDefNode.java → 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 {
 

theme-compiler/src/com/vaadin/sass/tree/controldirective/IfElseNode.java → 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 {
 

theme-compiler/src/com/vaadin/sass/tree/controldirective/IfNode.java → 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;

theme-compiler/src/com/vaadin/sass/util/Clonable.java → 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 {
 

theme-compiler/src/com/vaadin/sass/util/ColorUtil.java → 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) {

theme-compiler/src/com/vaadin/sass/util/DeepCopy.java → 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;

theme-compiler/src/com/vaadin/sass/util/FastByteArrayInputStream.java → 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;
 

theme-compiler/src/com/vaadin/sass/util/FastByteArrayOutputStream.java → 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;

theme-compiler/src/com/vaadin/sass/util/StringUtil.java → 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;

theme-compiler/src/com/vaadin/sass/visitor/BlockNodeHandler.java → 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

theme-compiler/src/com/vaadin/sass/visitor/EachNodeHandler.java → 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 {
 

theme-compiler/src/com/vaadin/sass/visitor/ExtendNodeHandler.java → 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>>>();

theme-compiler/src/com/vaadin/sass/visitor/IfElseNodeHandler.java → 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 {
 

theme-compiler/src/com/vaadin/sass/visitor/ImportNodeHandler.java → 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 {
 

theme-compiler/src/com/vaadin/sass/visitor/MixinNodeHandler.java → 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 {
 

theme-compiler/src/com/vaadin/sass/visitor/NestedNodeHandler.java → 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

theme-compiler/src/com/vaadin/sass/visitor/VariableNodeHandler.java → 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 {
 

theme-compiler/src/com/vaadin/sass/visitor/Visitor.java → 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 {
 

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;

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 {
 

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";

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";

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 {
 

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";

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 {
 

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 {
 

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 {
 

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";

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 {
 

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 {
 

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";

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";

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 {
 

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