update directory package structure

assert/assert.go

@@ -8,9 +8,9 @@ import (
 	"testing"
 
 	"github.com/d5/tengo/compiler"
+	"github.com/d5/tengo/compiler/source"
+	"github.com/d5/tengo/compiler/token"
 	"github.com/d5/tengo/objects"
-	"github.com/d5/tengo/source"
-	"github.com/d5/tengo/token"
 )
 
 func NoError(t *testing.T, err error, msg ...interface{}) bool {

cmd/bench/main.go

@@ -4,12 +4,12 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/d5/tengo/ast"
 	"github.com/d5/tengo/compiler"
+	"github.com/d5/tengo/compiler/ast"
+	"github.com/d5/tengo/compiler/parser"
+	"github.com/d5/tengo/compiler/source"
 	"github.com/d5/tengo/objects"
-	"github.com/d5/tengo/parser"
-	"github.com/d5/tengo/source"
-	"github.com/d5/tengo/vm"
+	"github.com/d5/tengo/runtime"
 )
 
 func main() {
@@ -156,11 +156,11 @@ func compileFile(file *ast.File) (time.Duration, *compiler.Bytecode, error) {
 }
 
 func runVM(bytecode *compiler.Bytecode) (time.Duration, objects.Object, error) {
-	globals := make([]*objects.Object, vm.GlobalsSize)
+	globals := make([]*objects.Object, runtime.GlobalsSize)
 
 	start := time.Now()
 
-	v := vm.NewVM(bytecode, globals)
+	v := runtime.NewVM(bytecode, globals)
 	if err := v.Run(); err != nil {
 		return time.Since(start), nil, err
 	}

cmd/repl/main.go

@@ -7,12 +7,12 @@ import (
 	"os"
 	"os/user"
 
-	"github.com/d5/tengo/ast"
 	"github.com/d5/tengo/compiler"
+	"github.com/d5/tengo/compiler/ast"
+	"github.com/d5/tengo/compiler/parser"
+	"github.com/d5/tengo/compiler/source"
 	"github.com/d5/tengo/objects"
-	"github.com/d5/tengo/parser"
-	"github.com/d5/tengo/source"
-	"github.com/d5/tengo/vm"
+	"github.com/d5/tengo/runtime"
 )
 
 const (
@@ -34,7 +34,7 @@ func startRepl(in io.Reader, out io.Writer) {
 	stdin := bufio.NewScanner(in)
 
 	fileSet := source.NewFileSet()
-	globals := make([]*objects.Object, vm.GlobalsSize)
+	globals := make([]*objects.Object, runtime.GlobalsSize)
 	symbolTable := compiler.NewSymbolTable()
 
 	for {
@@ -61,7 +61,7 @@ func startRepl(in io.Reader, out io.Writer) {
 			continue
 		}
 
-		machine := vm.NewVM(c.Bytecode(), globals)
+		machine := runtime.NewVM(c.Bytecode(), globals)
 		if err != nil {
 			_, _ = fmt.Fprintf(out, "VM error:\n %s\n", err.Error())
 			continue

cmd/tengo/main.go

@@ -11,7 +11,7 @@ import (
 
 	"github.com/d5/tengo"
 	"github.com/d5/tengo/compiler"
-	"github.com/d5/tengo/vm"
+	"github.com/d5/tengo/runtime"
 )
 
 var (
@@ -113,7 +113,7 @@ func doRun(data []byte, _, _ string) (err error) {
 		return
 	}
 
-	machine := vm.NewVM(bytecode, nil)
+	machine := runtime.NewVM(bytecode, nil)
 
 	err = machine.Run()
 	if err != nil {

compiler/ast/array_lit.go

@@ -3,7 +3,7 @@ package ast
 import (
 	"strings"
 
-	"github.com/d5/tengo/source"
+	"github.com/d5/tengo/compiler/source"
 )
 
 type ArrayLit struct {

compiler/ast/assign_stmt.go

@@ -3,8 +3,8 @@ package ast
 import (
 	"strings"
 
-	"github.com/d5/tengo/source"
-	"github.com/d5/tengo/token"
+	"github.com/d5/tengo/compiler/source"
+	"github.com/d5/tengo/compiler/token"
 )
 
 type AssignStmt struct {

compiler/ast/bad_expr.go

@@ -1,6 +1,6 @@
 package ast
 
-import "github.com/d5/tengo/source"
+import "github.com/d5/tengo/compiler/source"
 
 type BadExpr struct {
 	From source.Pos

compiler/ast/bad_stmt.go

@@ -1,6 +1,6 @@
 package ast
 
-import "github.com/d5/tengo/source"
+import "github.com/d5/tengo/compiler/source"
 
 type BadStmt struct {
 	From source.Pos

compiler/ast/binary_expr.go

@@ -1,8 +1,8 @@
 package ast
 
 import (
-	"github.com/d5/tengo/source"
-	"github.com/d5/tengo/token"
+	"github.com/d5/tengo/compiler/source"
+	"github.com/d5/tengo/compiler/token"
 )
 
 type BinaryExpr struct {

compiler/ast/block_stmt.go

@@ -3,7 +3,7 @@ package ast
 import (
 	"strings"
 
-	"github.com/d5/tengo/source"
+	"github.com/d5/tengo/compiler/source"
 )
 
 type BlockStmt struct {

compiler/ast/bool_lit.go

@@ -1,6 +1,6 @@
 package ast
 
-import "github.com/d5/tengo/source"
+import "github.com/d5/tengo/compiler/source"
 
 type BoolLit struct {
 	Value    bool

compiler/ast/branch_stmt.go

@@ -1,8 +1,8 @@
 package ast
 
 import (
-	"github.com/d5/tengo/source"
-	"github.com/d5/tengo/token"
+	"github.com/d5/tengo/compiler/source"
+	"github.com/d5/tengo/compiler/token"
 )
 
 type BranchStmt struct {

compiler/ast/call_expr.go

@@ -3,7 +3,7 @@ package ast
 import (
 	"strings"
 
-	"github.com/d5/tengo/source"
+	"github.com/d5/tengo/compiler/source"
 )
 
 type CallExpr struct {

compiler/ast/char_lit.go

@@ -1,6 +1,6 @@
 package ast
 
-import "github.com/d5/tengo/source"
+import "github.com/d5/tengo/compiler/source"
 
 type CharLit struct {
 	Value    rune

compiler/ast/empty_stmt.go

@@ -1,6 +1,6 @@
 package ast
 
-import "github.com/d5/tengo/source"
+import "github.com/d5/tengo/compiler/source"
 
 type EmptyStmt struct {
 	Semicolon source.Pos

compiler/ast/expr_stmt.go

@@ -1,6 +1,6 @@
 package ast
 
-import "github.com/d5/tengo/source"
+import "github.com/d5/tengo/compiler/source"
 
 type ExprStmt struct {
 	Expr Expr

compiler/ast/file.go

@@ -3,7 +3,7 @@ package ast
 import (
 	"strings"
 
-	"github.com/d5/tengo/source"
+	"github.com/d5/tengo/compiler/source"
 )
 
 type File struct {

compiler/ast/float_lit.go

@@ -1,6 +1,6 @@
 package ast
 
-import "github.com/d5/tengo/source"
+import "github.com/d5/tengo/compiler/source"
 
 type FloatLit struct {
 	Value    float64

compiler/ast/for_in_stmt.go

@@ -1,6 +1,6 @@
 package ast
 
-import "github.com/d5/tengo/source"
+import "github.com/d5/tengo/compiler/source"
 
 type ForInStmt struct {
 	ForPos   source.Pos

compiler/ast/for_stmt.go

@@ -1,6 +1,6 @@
 package ast
 
-import "github.com/d5/tengo/source"
+import "github.com/d5/tengo/compiler/source"
 
 type ForStmt struct {
 	ForPos source.Pos

compiler/ast/func_lit.go

@@ -1,6 +1,6 @@
 package ast
 
-import "github.com/d5/tengo/source"
+import "github.com/d5/tengo/compiler/source"
 
 type FuncLit struct {
 	Type *FuncType

compiler/ast/func_type.go

@@ -1,6 +1,6 @@
 package ast
 
-import "github.com/d5/tengo/source"
+import "github.com/d5/tengo/compiler/source"
 
 type FuncType struct {
 	FuncPos source.Pos

compiler/ast/ident.go

@@ -1,6 +1,6 @@
 package ast
 
-import "github.com/d5/tengo/source"
+import "github.com/d5/tengo/compiler/source"
 
 type Ident struct {
 	Name    string

compiler/ast/ident_list.go

@@ -3,7 +3,7 @@ package ast
 import (
 	"strings"
 
-	"github.com/d5/tengo/source"
+	"github.com/d5/tengo/compiler/source"
 )
 
 type IdentList struct {

compiler/ast/if_stmt.go

@@ -1,6 +1,6 @@
 package ast
 
-import "github.com/d5/tengo/source"
+import "github.com/d5/tengo/compiler/source"
 
 type IfStmt struct {
 	IfPos source.Pos

compiler/ast/inc_dec_stmt.go

@@ -1,8 +1,8 @@
 package ast
 
 import (
-	"github.com/d5/tengo/source"
-	"github.com/d5/tengo/token"
+	"github.com/d5/tengo/compiler/source"
+	"github.com/d5/tengo/compiler/token"
 )
 
 type IncDecStmt struct {

compiler/ast/index_expr.go

@@ -1,6 +1,6 @@
 package ast
 
-import "github.com/d5/tengo/source"
+import "github.com/d5/tengo/compiler/source"
 
 type IndexExpr struct {
 	Expr   Expr

compiler/ast/int_lit.go

@@ -1,6 +1,6 @@
 package ast
 
-import "github.com/d5/tengo/source"
+import "github.com/d5/tengo/compiler/source"
 
 type IntLit struct {
 	Value    int64

compiler/ast/map_element_lit.go

@@ -1,6 +1,6 @@
 package ast
 
-import "github.com/d5/tengo/source"
+import "github.com/d5/tengo/compiler/source"
 
 type MapElementLit struct {
 	Key      string

compiler/ast/map_lit.go

@@ -3,7 +3,7 @@ package ast
 import (
 	"strings"
 
-	"github.com/d5/tengo/source"
+	"github.com/d5/tengo/compiler/source"
 )
 
 type MapLit struct {

compiler/ast/node.go

@@ -1,6 +1,6 @@
 package ast
 
-import "github.com/d5/tengo/source"
+import "github.com/d5/tengo/compiler/source"
 
 type Node interface {
 	Pos() source.Pos

compiler/ast/paren_expr.go

@@ -1,6 +1,6 @@
 package ast
 
-import "github.com/d5/tengo/source"
+import "github.com/d5/tengo/compiler/source"
 
 type ParenExpr struct {
 	Expr   Expr

compiler/ast/return_stmt.go

@@ -3,7 +3,7 @@ package ast
 import (
 	"strings"
 
-	"github.com/d5/tengo/source"
+	"github.com/d5/tengo/compiler/source"
 )
 
 type ReturnStmt struct {

compiler/ast/selector_expr.go

@@ -1,6 +1,6 @@
 package ast
 
-import "github.com/d5/tengo/source"
+import "github.com/d5/tengo/compiler/source"
 
 type SelectorExpr struct {
 	Expr Expr

compiler/ast/slice_expr.go

@@ -1,6 +1,6 @@
 package ast
 
-import "github.com/d5/tengo/source"
+import "github.com/d5/tengo/compiler/source"
 
 type SliceExpr struct {
 	Expr   Expr

compiler/ast/string_lit.go

@@ -1,6 +1,6 @@
 package ast
 
-import "github.com/d5/tengo/source"
+import "github.com/d5/tengo/compiler/source"
 
 type StringLit struct {
 	Value    string

compiler/ast/unary_expr.go

@@ -1,8 +1,8 @@
 package ast
 
 import (
-	"github.com/d5/tengo/source"
-	"github.com/d5/tengo/token"
+	"github.com/d5/tengo/compiler/source"
+	"github.com/d5/tengo/compiler/token"
 )
 
 type UnaryExpr struct {

compiler/ast/undefined_lit.go

@@ -1,6 +1,6 @@
 package ast
 
-import "github.com/d5/tengo/source"
+import "github.com/d5/tengo/compiler/source"
 
 type UndefinedLit struct {
 	TokenPos source.Pos

compiler/compiler.go

@@ -5,9 +5,9 @@ import (
 	"io"
 	"reflect"
 
-	"github.com/d5/tengo/ast"
+	"github.com/d5/tengo/compiler/ast"
+	"github.com/d5/tengo/compiler/token"
 	"github.com/d5/tengo/objects"
-	"github.com/d5/tengo/token"
 )
 
 type Compiler struct {

compiler/compiler_assign.go

@@ -4,8 +4,8 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/d5/tengo/ast"
-	"github.com/d5/tengo/token"
+	"github.com/d5/tengo/compiler/ast"
+	"github.com/d5/tengo/compiler/token"
 )
 
 func (c *Compiler) compileAssign(lhs, rhs []ast.Expr, op token.Token) error {

compiler/compiler_for.go

@@ -1,7 +1,7 @@
 package compiler
 
 import (
-	"github.com/d5/tengo/ast"
+	"github.com/d5/tengo/compiler/ast"
 )
 
 func (c *Compiler) compileForStmt(stmt *ast.ForStmt) error {

compiler/compiler_logical.go

@@ -1,8 +1,8 @@
 package compiler
 
 import (
-	"github.com/d5/tengo/ast"
-	"github.com/d5/tengo/token"
+	"github.com/d5/tengo/compiler/ast"
+	"github.com/d5/tengo/compiler/token"
 )
 
 func (c *Compiler) compileLogical(node *ast.BinaryExpr) error {

compiler/compiler_test.go

@@ -8,9 +8,9 @@ import (
 
 	"github.com/d5/tengo/assert"
 	"github.com/d5/tengo/compiler"
+	"github.com/d5/tengo/compiler/parser"
+	"github.com/d5/tengo/compiler/source"
 	"github.com/d5/tengo/objects"
-	"github.com/d5/tengo/parser"
-	"github.com/d5/tengo/source"
 )
 
 func TestCompiler_Compile(t *testing.T) {

compiler/parser/error.go

@@ -1,6 +1,6 @@
 package parser
 
-import "github.com/d5/tengo/source"
+import "github.com/d5/tengo/compiler/source"
 
 type Error struct {
 	Pos source.FilePos

compiler/parser/error_list.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"sort"
 
-	"github.com/d5/tengo/source"
+	"github.com/d5/tengo/compiler/source"
 )
 
 type ErrorList []*Error

compiler/parser/parse_file.go

@@ -3,8 +3,8 @@ package parser
 import (
 	"io"
 
-	"github.com/d5/tengo/ast"
-	"github.com/d5/tengo/source"
+	"github.com/d5/tengo/compiler/ast"
+	"github.com/d5/tengo/compiler/source"
 )
 
 func ParseFile(file *source.File, src []byte, trace io.Writer) (res *ast.File, err error) {

compiler/parser/parse_source.go

@@ -3,8 +3,8 @@ package parser
 import (
 	"io"
 
-	"github.com/d5/tengo/ast"
-	"github.com/d5/tengo/source"
+	"github.com/d5/tengo/compiler/ast"
+	"github.com/d5/tengo/compiler/source"
 )
 
 // ParseSource parses source code 'src' and builds an AST.

compiler/parser/parser.go

@@ -5,10 +5,10 @@ import (
 	"io"
 	"strconv"
 
-	"github.com/d5/tengo/ast"
-	"github.com/d5/tengo/scanner"
-	"github.com/d5/tengo/source"
-	"github.com/d5/tengo/token"
+	"github.com/d5/tengo/compiler/ast"
+	"github.com/d5/tengo/compiler/scanner"
+	"github.com/d5/tengo/compiler/source"
+	"github.com/d5/tengo/compiler/token"
 )
 
 type bailout struct{}

compiler/parser/parser_array_test.go

@@ -3,8 +3,8 @@ package parser_test
 import (
 	"testing"
 
-	"github.com/d5/tengo/ast"
-	"github.com/d5/tengo/token"
+	"github.com/d5/tengo/compiler/ast"
+	"github.com/d5/tengo/compiler/token"
 )
 
 func TestArray(t *testing.T) {

compiler/parser/parser_assignment_test.go

@@ -3,8 +3,8 @@ package parser_test
 import (
 	"testing"
 
-	"github.com/d5/tengo/ast"
-	"github.com/d5/tengo/token"
+	"github.com/d5/tengo/compiler/ast"
+	"github.com/d5/tengo/compiler/token"
 )
 
 func TestAssignment(t *testing.T) {

compiler/parser/parser_boolean_test.go

@@ -3,8 +3,8 @@ package parser_test
 import (
 	"testing"
 
-	"github.com/d5/tengo/ast"
-	"github.com/d5/tengo/token"
+	"github.com/d5/tengo/compiler/ast"
+	"github.com/d5/tengo/compiler/token"
 )
 
 func TestBoolean(t *testing.T) {

compiler/parser/parser_call_test.go

@@ -3,8 +3,8 @@ package parser_test
 import (
 	"testing"
 
-	"github.com/d5/tengo/ast"
-	"github.com/d5/tengo/token"
+	"github.com/d5/tengo/compiler/ast"
+	"github.com/d5/tengo/compiler/token"
 )
 
 func TestCall(t *testing.T) {

compiler/parser/parser_char_test.go

@@ -3,7 +3,7 @@ package parser_test
 import (
 	"testing"
 
-	"github.com/d5/tengo/ast"
+	"github.com/d5/tengo/compiler/ast"
 )
 
 func TestChar(t *testing.T) {

compiler/parser/parser_for_in_test.go

@@ -3,7 +3,7 @@ package parser_test
 import (
 	"testing"
 
-	"github.com/d5/tengo/ast"
+	"github.com/d5/tengo/compiler/ast"
 )
 
 func TestForIn(t *testing.T) {

compiler/parser/parser_for_test.go

@@ -3,8 +3,8 @@ package parser_test
 import (
 	"testing"
 
-	"github.com/d5/tengo/ast"
-	"github.com/d5/tengo/token"
+	"github.com/d5/tengo/compiler/ast"
+	"github.com/d5/tengo/compiler/token"
 )
 
 func TestFor(t *testing.T) {

compiler/parser/parser_function_test.go

@@ -3,8 +3,8 @@ package parser_test
 import (
 	"testing"
 
-	"github.com/d5/tengo/ast"
-	"github.com/d5/tengo/token"
+	"github.com/d5/tengo/compiler/ast"
+	"github.com/d5/tengo/compiler/token"
 )
 
 func TestFunction(t *testing.T) {

compiler/parser/parser_if_test.go

@@ -3,8 +3,8 @@ package parser_test
 import (
 	"testing"
 
-	"github.com/d5/tengo/ast"
-	"github.com/d5/tengo/token"
+	"github.com/d5/tengo/compiler/ast"
+	"github.com/d5/tengo/compiler/token"
 )
 
 func TestIf(t *testing.T) {

compiler/parser/parser_index_test.go

@@ -3,8 +3,8 @@ package parser_test
 import (
 	"testing"
 
-	"github.com/d5/tengo/ast"
-	"github.com/d5/tengo/token"
+	"github.com/d5/tengo/compiler/ast"
+	"github.com/d5/tengo/compiler/token"
 )
 
 func TestIndex(t *testing.T) {

compiler/parser/parser_logical_test.go

@@ -3,8 +3,8 @@ package parser_test
 import (
 	"testing"
 
-	"github.com/d5/tengo/ast"
-	"github.com/d5/tengo/token"
+	"github.com/d5/tengo/compiler/ast"
+	"github.com/d5/tengo/compiler/token"
 )
 
 func TestLogical(t *testing.T) {

compiler/parser/parser_map_test.go

@@ -3,8 +3,8 @@ package parser_test
 import (
 	"testing"
 
-	"github.com/d5/tengo/ast"
-	"github.com/d5/tengo/token"
+	"github.com/d5/tengo/compiler/ast"
+	"github.com/d5/tengo/compiler/token"
 )
 
 func TestMap(t *testing.T) {

compiler/parser/parser_selector_test.go

@@ -3,8 +3,8 @@ package parser_test
 import (
 	"testing"
 
-	"github.com/d5/tengo/ast"
-	"github.com/d5/tengo/token"
+	"github.com/d5/tengo/compiler/ast"
+	"github.com/d5/tengo/compiler/token"
 )
 
 func TestSelector(t *testing.T) {

compiler/parser/parser_semicolon_test.go

@@ -3,7 +3,7 @@ package parser_test
 import (
 	"testing"
 
-	"github.com/d5/tengo/ast"
+	"github.com/d5/tengo/compiler/ast"
 )
 
 func TestSemicolon(t *testing.T) {

compiler/parser/parser_string_test.go

@@ -3,8 +3,8 @@ package parser_test
 import (
 	"testing"
 
-	"github.com/d5/tengo/ast"
-	"github.com/d5/tengo/token"
+	"github.com/d5/tengo/compiler/ast"
+	"github.com/d5/tengo/compiler/token"
 )
 
 func TestString(t *testing.T) {

compiler/parser/parser_test.go

@@ -7,10 +7,10 @@ import (
 	"testing"
 
 	"github.com/d5/tengo/assert"
-	"github.com/d5/tengo/ast"
-	"github.com/d5/tengo/parser"
-	"github.com/d5/tengo/source"
-	"github.com/d5/tengo/token"
+	"github.com/d5/tengo/compiler/ast"
+	"github.com/d5/tengo/compiler/parser"
+	"github.com/d5/tengo/compiler/source"
+	"github.com/d5/tengo/compiler/token"
 )
 
 type pfn func(int, int) source.Pos       // position conversion function

compiler/parser/sync.go

@@ -1,6 +1,6 @@
 package parser
 
-import "github.com/d5/tengo/token"
+import "github.com/d5/tengo/compiler/token"
 
 var stmtStart = map[token.Token]bool{
 	token.Break:    true,

compiler/scanner/error_handler.go

@@ -1,5 +1,5 @@
 package scanner
 
-import "github.com/d5/tengo/source"
+import "github.com/d5/tengo/compiler/source"
 
 type ErrorHandler func(pos source.FilePos, msg string)

compiler/scanner/scanner.go

@@ -5,8 +5,8 @@ import (
 	"unicode"
 	"unicode/utf8"
 
-	"github.com/d5/tengo/source"
-	"github.com/d5/tengo/token"
+	"github.com/d5/tengo/compiler/source"
+	"github.com/d5/tengo/compiler/token"
 )
 
 // byte order mark

compiler/scanner/scanner_test.go

@@ -8,9 +8,9 @@ import (
 	"time"
 
 	"github.com/d5/tengo/assert"
-	"github.com/d5/tengo/scanner"
-	"github.com/d5/tengo/source"
-	"github.com/d5/tengo/token"
+	"github.com/d5/tengo/compiler/scanner"
+	"github.com/d5/tengo/compiler/source"
+	"github.com/d5/tengo/compiler/token"
 )
 
 var testFileSet = source.NewFileSet()

objects/array.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/d5/tengo/token"
+	"github.com/d5/tengo/compiler/token"
 )
 
 type Array struct {

objects/bool.go

@@ -1,7 +1,7 @@
 package objects
 
 import (
-	"github.com/d5/tengo/token"
+	"github.com/d5/tengo/compiler/token"
 )
 
 type Bool struct {

objects/break.go

@@ -1,6 +1,6 @@
 package objects
 
-import "github.com/d5/tengo/token"
+import "github.com/d5/tengo/compiler/token"
 
 type Break struct{}
 

objects/builtin_function.go

@@ -1,7 +1,7 @@
 package objects
 
 import (
-	"github.com/d5/tengo/token"
+	"github.com/d5/tengo/compiler/token"
 )
 
 type BuiltinFunction struct {

objects/char.go

@@ -1,7 +1,7 @@
 package objects
 
 import (
-	"github.com/d5/tengo/token"
+	"github.com/d5/tengo/compiler/token"
 )
 
 type Char struct {

objects/closure.go

@@ -1,7 +1,7 @@
 package objects
 
 import (
-	"github.com/d5/tengo/token"
+	"github.com/d5/tengo/compiler/token"
 )
 
 type Closure struct {

objects/compiled_function.go

@@ -1,7 +1,7 @@
 package objects
 
 import (
-	"github.com/d5/tengo/token"
+	"github.com/d5/tengo/compiler/token"
 )
 
 type CompiledFunction struct {

objects/continue.go

@@ -1,6 +1,6 @@
 package objects
 
-import "github.com/d5/tengo/token"
+import "github.com/d5/tengo/compiler/token"
 
 type Continue struct {
 }

objects/float.go

@@ -4,7 +4,7 @@ import (
 	"math"
 	"strconv"
 
-	"github.com/d5/tengo/token"
+	"github.com/d5/tengo/compiler/token"
 )
 
 type Float struct {

objects/int.go

@@ -3,7 +3,7 @@ package objects
 import (
 	"strconv"
 
-	"github.com/d5/tengo/token"
+	"github.com/d5/tengo/compiler/token"
 )
 
 type Int struct {

objects/iterator.go

@@ -1,6 +1,6 @@
 package objects
 
-import "github.com/d5/tengo/token"
+import "github.com/d5/tengo/compiler/token"
 
 type Iterator interface {
 	Object

objects/map.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/d5/tengo/token"
+	"github.com/d5/tengo/compiler/token"
 )
 
 type Map struct {

objects/object.go

@@ -1,6 +1,6 @@
 package objects
 
-import "github.com/d5/tengo/token"
+import "github.com/d5/tengo/compiler/token"
 
 type Object interface {
 	TypeName() string

objects/return_value.go

@@ -1,6 +1,6 @@
 package objects
 
-import "github.com/d5/tengo/token"
+import "github.com/d5/tengo/compiler/token"
 
 type ReturnValue struct {
 	Value Object

objects/string.go

@@ -3,7 +3,7 @@ package objects
 import (
 	"fmt"
 
-	"github.com/d5/tengo/token"
+	"github.com/d5/tengo/compiler/token"
 )
 
 type String struct {

objects/undefined.go

@@ -1,6 +1,6 @@
 package objects
 
-import "github.com/d5/tengo/token"
+import "github.com/d5/tengo/compiler/token"
 
 var undefined = &Undefined{}
 

runtime/errors.go

@@ -1,4 +1,4 @@
-package vm
+package runtime
 
 import (
 	"errors"

runtime/frame.go

@@ -1,4 +1,4 @@
-package vm
+package runtime
 
 import (
 	"github.com/d5/tengo/objects"

runtime/vm.go

@@ -1,11 +1,11 @@
-package vm
+package runtime
 
 import (
 	"fmt"
 
 	"github.com/d5/tengo/compiler"
+	"github.com/d5/tengo/compiler/token"
 	"github.com/d5/tengo/objects"
-	"github.com/d5/tengo/token"
 )
 
 const (

runtime/vm_array_test.go

@@ -1,4 +1,4 @@
-package vm_test
+package runtime_test
 
 import (
 	"testing"

runtime/vm_assignment_test.go

@@ -1,4 +1,4 @@
-package vm_test
+package runtime_test
 
 import (
 	"testing"
@@ -193,8 +193,8 @@ out = func() {
 `, 136)
 
 	// assigning different type value
-	expect(t, `a := 1; a = "foo"; out = a`, "foo")                                                 // global
-	expect(t, `func() { a := 1; a = "foo"; out = a }()`, "foo")                                    // local
+	expect(t, `a := 1; a = "foo"; out = a`, "foo")              // global
+	expect(t, `func() { a := 1; a = "foo"; out = a }()`, "foo") // local
 	expect(t, `
 out = func() { 
 	a := 5