diff --git a/.travis.yml b/.travis.yml
index d0d99296..8ec2e23e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,20 +1,21 @@
 language: go
 
 go:
-  - 1.6.3
+  - 1.9.2
 
 install:
-  - export GOPATH=`pwd`:$GOPATH
   - go get github.com/go-errors/errors
   - go get github.com/stretchr/testify
   - go get github.com/jstemmer/go-junit-report
   - go get golang.org/x/tools/cmd/cover
   - go get github.com/mattn/goveralls
   - go get github.com/wadey/gocovmerge
+  - go get github.com/arduino/go-properties-map
+  - go get github.com/arduino/go-timeutils
 
 script:
-  - go build -v arduino.cc/arduino-builder
-  - export TEST_PACKAGES=`go list arduino.cc/...`
+  - go build -o $HOME/arduino-builder -v github.com/arduino/arduino-builder/arduino-builder
+  - export TEST_PACKAGES=`go list github.com/arduino/arduino-builder/...`
   - RES=0; I=0; for PKG in $TEST_PACKAGES; do go test -v -timeout 30m -covermode=count -coverprofile=coverage.$I.out $PKG; ((RES=RES+$?)); ((I++)); done; ( exit $RES )
 
 after_success:
diff --git a/README.md b/README.md
index fa5930f6..21a45750 100644
--- a/README.md
+++ b/README.md
@@ -55,31 +55,26 @@ See [Doing continuous integration with arduino builder](https://github.com/ardui
 
 ### Building from source
 
-You need [Go 1.6.3](https://golang.org/dl/#go1.6.3).
+You need [a recent version of Go (>=1.8.0)](https://golang.org/).
 
-To install `codereview/patch` you have to install [Mercurial](https://www.mercurial-scm.org/) first.
-
-To set things up, run the following inside the cloned arduino-builder
-directory:
+To build, run the following commands:
 
 ```
-export GOPATH=$(pwd)
 go get github.com/go-errors/errors
 go get github.com/stretchr/testify
 go get github.com/jstemmer/go-junit-report
-go build arduino.cc/arduino-builder
+go get github.com/arduino/go-properties-map
+go get github.com/arduino/go-timeutils
+go get github.com/arduino/arduino-builder
+go build github.com/arduino/arduino-builder/arduino-builder
 ```
 
-After installing dependencies, you do not need to run the `go get`
-commands again, but you will have to set `GOPATH` again for every shell
-you want to build in.
-
 ### TDD
 
 In order to run the tests, type:
 
 ```
-go test arduino.cc/...
+go test github.com/arduino/arduino-builder/arduino-builder/...
 ```
 
 This runs all tests, showing any failures and a summary at the end.
@@ -93,13 +88,13 @@ To run a single test, use the -run option, which accepts a regular
 expression (see also go help testflag).
 
 ```
-go test arduino.cc/... -run 'TestBuilderEmptySketch'
-go test arduino.cc/... -run 'TestPrototypesAdder.*'
+go test github.com/arduino/arduino-builder/arduino-builder/... -run 'TestBuilderEmptySketch'
+go test github.com/arduino/arduino-builder/arduino-builder/... -run 'TestPrototypesAdder.*'
 ```
 
 In jenkins, use
 ```
-go test -v arduino.cc/... | bin/go-junit-report > report.xml
+go test -v github.com/arduino/arduino-builder/arduino-builder/... | bin/go-junit-report > report.xml
 ```
 
 The first time you run the tests, some needed files (toolchains and
@@ -114,6 +109,6 @@ increasing the timeout might be needed as well.
 
 `arduino-builder` is licensed under General Public License version 2, as published by the Free Software Foundation. See [LICENSE.txt](LICENSE.txt).
 
-Copyright (C) 2015 Arduino LLC and contributors
+Copyright (C) 2017 Arduino AG and contributors
 
 See https://www.arduino.cc/ and https://github.com/arduino/arduino-builder/graphs/contributors
diff --git a/src/arduino.cc/builder/add_additional_entries_to_context.go b/add_additional_entries_to_context.go
similarity index 95%
rename from src/arduino.cc/builder/add_additional_entries_to_context.go
rename to add_additional_entries_to_context.go
index 795aea01..3d6f1fa1 100644
--- a/src/arduino.cc/builder/add_additional_entries_to_context.go
+++ b/add_additional_entries_to_context.go
@@ -32,9 +32,9 @@ package builder
 import (
 	"path/filepath"
 
-	"arduino.cc/builder/constants"
-	"arduino.cc/builder/i18n"
-	"arduino.cc/builder/types"
+	"github.com/arduino/arduino-builder/constants"
+	"github.com/arduino/arduino-builder/i18n"
+	"github.com/arduino/arduino-builder/types"
 )
 
 type AddAdditionalEntriesToContext struct{}
diff --git a/src/arduino.cc/builder/add_build_board_property_if_missing.go b/add_build_board_property_if_missing.go
similarity index 95%
rename from src/arduino.cc/builder/add_build_board_property_if_missing.go
rename to add_build_board_property_if_missing.go
index 10cd0e2e..93c06c85 100644
--- a/src/arduino.cc/builder/add_build_board_property_if_missing.go
+++ b/add_build_board_property_if_missing.go
@@ -30,8 +30,8 @@
 package builder
 
 import (
-	"arduino.cc/builder/constants"
-	"arduino.cc/builder/types"
+	"github.com/arduino/arduino-builder/constants"
+	"github.com/arduino/arduino-builder/types"
 	"os"
 	"strings"
 )
diff --git a/src/arduino.cc/builder/add_missing_build_properties_from_parent_platform_txt_files.go b/add_missing_build_properties_from_parent_platform_txt_files.go
similarity index 97%
rename from src/arduino.cc/builder/add_missing_build_properties_from_parent_platform_txt_files.go
rename to add_missing_build_properties_from_parent_platform_txt_files.go
index 79a44552..558aa820 100644
--- a/src/arduino.cc/builder/add_missing_build_properties_from_parent_platform_txt_files.go
+++ b/add_missing_build_properties_from_parent_platform_txt_files.go
@@ -30,7 +30,7 @@
 package builder
 
 import (
-	"arduino.cc/builder/types"
+	"github.com/arduino/arduino-builder/types"
 )
 
 type AddMissingBuildPropertiesFromParentPlatformTxtFiles struct{}
diff --git a/src/arduino.cc/builder/additional_sketch_files_copier.go b/additional_sketch_files_copier.go
similarity index 95%
rename from src/arduino.cc/builder/additional_sketch_files_copier.go
rename to additional_sketch_files_copier.go
index 490e961d..c992e820 100644
--- a/src/arduino.cc/builder/additional_sketch_files_copier.go
+++ b/additional_sketch_files_copier.go
@@ -30,9 +30,9 @@
 package builder
 
 import (
-	"arduino.cc/builder/i18n"
-	"arduino.cc/builder/types"
-	"arduino.cc/builder/utils"
+	"github.com/arduino/arduino-builder/i18n"
+	"github.com/arduino/arduino-builder/types"
+	"github.com/arduino/arduino-builder/utils"
 	"bytes"
 	"io/ioutil"
 	"path/filepath"
diff --git a/src/arduino.cc/arduino-builder/main.go b/arduino-builder/main.go
similarity index 97%
rename from src/arduino.cc/arduino-builder/main.go
rename to arduino-builder/main.go
index 39a65c09..d2ca98c4 100644
--- a/src/arduino.cc/arduino-builder/main.go
+++ b/arduino-builder/main.go
@@ -40,12 +40,12 @@ import (
 	"strings"
 	"syscall"
 
-	"arduino.cc/builder"
-	"arduino.cc/builder/gohasissues"
-	"arduino.cc/builder/i18n"
-	"arduino.cc/builder/types"
-	"arduino.cc/builder/utils"
-	"arduino.cc/properties"
+	"github.com/arduino/arduino-builder"
+	"github.com/arduino/arduino-builder/gohasissues"
+	"github.com/arduino/arduino-builder/i18n"
+	"github.com/arduino/arduino-builder/types"
+	"github.com/arduino/arduino-builder/utils"
+	"github.com/arduino/go-properties-map"
 	"github.com/go-errors/errors"
 )
 
diff --git a/src/arduino.cc/builder/builder.go b/builder.go
similarity index 97%
rename from src/arduino.cc/builder/builder.go
rename to builder.go
index 372f7538..d5b8eff7 100644
--- a/src/arduino.cc/builder/builder.go
+++ b/builder.go
@@ -35,11 +35,11 @@ import (
 	"strconv"
 	"time"
 
-	"arduino.cc/builder/constants"
-	"arduino.cc/builder/i18n"
-	"arduino.cc/builder/phases"
-	"arduino.cc/builder/types"
-	"arduino.cc/builder/utils"
+	"github.com/arduino/arduino-builder/constants"
+	"github.com/arduino/arduino-builder/i18n"
+	"github.com/arduino/arduino-builder/phases"
+	"github.com/arduino/arduino-builder/types"
+	"github.com/arduino/arduino-builder/utils"
 )
 
 var MAIN_FILE_VALID_EXTENSIONS = map[string]bool{".ino": true, ".pde": true}
diff --git a/src/arduino.cc/builder/builder_utils/utils.go b/builder_utils/utils.go
similarity index 98%
rename from src/arduino.cc/builder/builder_utils/utils.go
rename to builder_utils/utils.go
index 97b6e355..139ad770 100644
--- a/src/arduino.cc/builder/builder_utils/utils.go
+++ b/builder_utils/utils.go
@@ -38,10 +38,10 @@ import (
 	"path/filepath"
 	"strings"
 
-	"arduino.cc/builder/constants"
-	"arduino.cc/builder/i18n"
-	"arduino.cc/builder/utils"
-	"arduino.cc/properties"
+	"github.com/arduino/arduino-builder/constants"
+	"github.com/arduino/arduino-builder/i18n"
+	"github.com/arduino/arduino-builder/utils"
+	"github.com/arduino/go-properties-map"
 )
 
 func CompileFilesRecursive(objectFiles []string, sourcePath string, buildPath string, buildProperties properties.Map, includes []string, verbose bool, warningsLevel string, logger i18n.Logger) ([]string, error) {
@@ -384,10 +384,7 @@ func PrepareCommandForRecipe(buildProperties properties.Map, recipe string, remo
 	var err error
 	commandLine := buildProperties.ExpandPropsInString(pattern)
 	if removeUnsetProperties {
-		commandLine, err = properties.DeleteUnexpandedPropsFromString(commandLine)
-		if err != nil {
-			return nil, i18n.WrapError(err)
-		}
+		commandLine = properties.DeleteUnexpandedPropsFromString(commandLine)
 	}
 
 	command, err := utils.PrepareCommand(commandLine, logger)
diff --git a/src/arduino.cc/builder/constants/constants.go b/constants/constants.go
similarity index 100%
rename from src/arduino.cc/builder/constants/constants.go
rename to constants/constants.go
diff --git a/src/arduino.cc/builder/container_add_prototypes.go b/container_add_prototypes.go
similarity index 94%
rename from src/arduino.cc/builder/container_add_prototypes.go
rename to container_add_prototypes.go
index b69da297..cd0d56f7 100644
--- a/src/arduino.cc/builder/container_add_prototypes.go
+++ b/container_add_prototypes.go
@@ -32,9 +32,9 @@ package builder
 import (
 	"path/filepath"
 
-	"arduino.cc/builder/constants"
-	"arduino.cc/builder/i18n"
-	"arduino.cc/builder/types"
+	"github.com/arduino/arduino-builder/constants"
+	"github.com/arduino/arduino-builder/i18n"
+	"github.com/arduino/arduino-builder/types"
 )
 
 type ContainerAddPrototypes struct{}
diff --git a/src/arduino.cc/builder/container_build_options.go b/container_build_options.go
similarity index 95%
rename from src/arduino.cc/builder/container_build_options.go
rename to container_build_options.go
index eff01468..d2e22513 100644
--- a/src/arduino.cc/builder/container_build_options.go
+++ b/container_build_options.go
@@ -30,8 +30,8 @@
 package builder
 
 import (
-	"arduino.cc/builder/i18n"
-	"arduino.cc/builder/types"
+	"github.com/arduino/arduino-builder/i18n"
+	"github.com/arduino/arduino-builder/types"
 )
 
 type ContainerBuildOptions struct{}
diff --git a/src/arduino.cc/builder/container_find_includes.go b/container_find_includes.go
similarity index 98%
rename from src/arduino.cc/builder/container_find_includes.go
rename to container_find_includes.go
index cc14a4f2..dbd31c71 100644
--- a/src/arduino.cc/builder/container_find_includes.go
+++ b/container_find_includes.go
@@ -113,11 +113,11 @@ import (
 	"path/filepath"
 	"time"
 
-	"arduino.cc/builder/builder_utils"
-	"arduino.cc/builder/constants"
-	"arduino.cc/builder/i18n"
-	"arduino.cc/builder/types"
-	"arduino.cc/builder/utils"
+	"github.com/arduino/arduino-builder/builder_utils"
+	"github.com/arduino/arduino-builder/constants"
+	"github.com/arduino/arduino-builder/i18n"
+	"github.com/arduino/arduino-builder/types"
+	"github.com/arduino/arduino-builder/utils"
 )
 
 type ContainerFindIncludes struct{}
diff --git a/src/arduino.cc/builder/container_merge_copy_sketch_files.go b/container_merge_copy_sketch_files.go
similarity index 95%
rename from src/arduino.cc/builder/container_merge_copy_sketch_files.go
rename to container_merge_copy_sketch_files.go
index 2d844b2f..e84f29ba 100644
--- a/src/arduino.cc/builder/container_merge_copy_sketch_files.go
+++ b/container_merge_copy_sketch_files.go
@@ -30,8 +30,8 @@
 package builder
 
 import (
-	"arduino.cc/builder/i18n"
-	"arduino.cc/builder/types"
+	"github.com/arduino/arduino-builder/i18n"
+	"github.com/arduino/arduino-builder/types"
 )
 
 type ContainerMergeCopySketchFiles struct{}
diff --git a/src/arduino.cc/builder/container_setup.go b/container_setup.go
similarity index 96%
rename from src/arduino.cc/builder/container_setup.go
rename to container_setup.go
index e76bb500..93ee6d73 100644
--- a/src/arduino.cc/builder/container_setup.go
+++ b/container_setup.go
@@ -30,8 +30,8 @@
 package builder
 
 import (
-	"arduino.cc/builder/i18n"
-	"arduino.cc/builder/types"
+	"github.com/arduino/arduino-builder/i18n"
+	"github.com/arduino/arduino-builder/types"
 )
 
 type ContainerSetupHardwareToolsLibsSketchAndProps struct{}
diff --git a/src/arduino.cc/builder/create_build_options_map.go b/create_build_options_map.go
similarity index 95%
rename from src/arduino.cc/builder/create_build_options_map.go
rename to create_build_options_map.go
index d9caa59f..490a2188 100644
--- a/src/arduino.cc/builder/create_build_options_map.go
+++ b/create_build_options_map.go
@@ -30,8 +30,8 @@
 package builder
 
 import (
-	"arduino.cc/builder/i18n"
-	"arduino.cc/builder/types"
+	"github.com/arduino/arduino-builder/i18n"
+	"github.com/arduino/arduino-builder/types"
 	"encoding/json"
 )
 
diff --git a/src/arduino.cc/builder/ctags/ctags_has_issues.go b/ctags/ctags_has_issues.go
similarity index 99%
rename from src/arduino.cc/builder/ctags/ctags_has_issues.go
rename to ctags/ctags_has_issues.go
index 7049af64..f61ab70a 100644
--- a/src/arduino.cc/builder/ctags/ctags_has_issues.go
+++ b/ctags/ctags_has_issues.go
@@ -34,7 +34,7 @@ import (
 	"os"
 	"strings"
 
-	"arduino.cc/builder/types"
+	"github.com/arduino/arduino-builder/types"
 )
 
 func (p *CTagsParser) FixCLinkageTagsDeclarations(tags []*types.CTag) {
diff --git a/src/arduino.cc/builder/ctags/ctags_parser.go b/ctags/ctags_parser.go
similarity index 99%
rename from src/arduino.cc/builder/ctags/ctags_parser.go
rename to ctags/ctags_parser.go
index d420b4e0..fc45b8ff 100644
--- a/src/arduino.cc/builder/ctags/ctags_parser.go
+++ b/ctags/ctags_parser.go
@@ -33,7 +33,7 @@ import (
 	"strconv"
 	"strings"
 
-	"arduino.cc/builder/types"
+	"github.com/arduino/arduino-builder/types"
 )
 
 const KIND_PROTOTYPE = "prototype"
diff --git a/src/arduino.cc/builder/ctags/ctags_parser_test.go b/ctags/ctags_parser_test.go
similarity index 99%
rename from src/arduino.cc/builder/ctags/ctags_parser_test.go
rename to ctags/ctags_parser_test.go
index 4bf9a510..8813e772 100644
--- a/src/arduino.cc/builder/ctags/ctags_parser_test.go
+++ b/ctags/ctags_parser_test.go
@@ -34,7 +34,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"arduino.cc/builder/types"
+	"github.com/arduino/arduino-builder/types"
 
 	"github.com/stretchr/testify/require"
 )
diff --git a/src/arduino.cc/builder/ctags/ctags_to_prototypes.go b/ctags/ctags_to_prototypes.go
similarity index 98%
rename from src/arduino.cc/builder/ctags/ctags_to_prototypes.go
rename to ctags/ctags_to_prototypes.go
index c03e6285..7117c3f1 100644
--- a/src/arduino.cc/builder/ctags/ctags_to_prototypes.go
+++ b/ctags/ctags_to_prototypes.go
@@ -32,7 +32,7 @@ package ctags
 import (
 	"strings"
 
-	"arduino.cc/builder/types"
+	"github.com/arduino/arduino-builder/types"
 )
 
 func (p *CTagsParser) GeneratePrototypes() ([]*types.Prototype, int) {
diff --git a/src/arduino.cc/builder/ctags/ctags_to_prototypes_test.go b/ctags/ctags_to_prototypes_test.go
similarity index 98%
rename from src/arduino.cc/builder/ctags/ctags_to_prototypes_test.go
rename to ctags/ctags_to_prototypes_test.go
index 2f8b6116..9388747d 100644
--- a/src/arduino.cc/builder/ctags/ctags_to_prototypes_test.go
+++ b/ctags/ctags_to_prototypes_test.go
@@ -34,7 +34,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"arduino.cc/builder/types"
+	"github.com/arduino/arduino-builder/types"
 	"github.com/stretchr/testify/require"
 )
 
@@ -220,7 +220,7 @@ func TestCTagsToPrototypesFunctionPointersNoIndirect(t *testing.T) {
 }
 
 func TestCTagsRunnerSketchWithClassFunction(t *testing.T) {
-	prototypes, _ := producePrototypes(t, "TestCTagsRunnerSketchWithClassFunction.txt", "/home/megabug/Workspace/arduino-builder/src/arduino.cc/builder/test/sketch_class_function/sketch_class_function.ino")
+	prototypes, _ := producePrototypes(t, "TestCTagsRunnerSketchWithClassFunction.txt", "/home/megabug/Workspace/arduino-builder/src/github.com/arduino/arduino-builder/test/sketch_class_function/sketch_class_function.ino")
 
 	require.Equal(t, 3, len(prototypes))
 	require.Equal(t, "void setup();", prototypes[0].Prototype)
diff --git a/src/arduino.cc/builder/ctags/test_data/TestCTagsParserClassMembersAreFilteredOut.txt b/ctags/test_data/TestCTagsParserClassMembersAreFilteredOut.txt
similarity index 100%
rename from src/arduino.cc/builder/ctags/test_data/TestCTagsParserClassMembersAreFilteredOut.txt
rename to ctags/test_data/TestCTagsParserClassMembersAreFilteredOut.txt
diff --git a/src/arduino.cc/builder/ctags/test_data/TestCTagsParserDefaultArguments.txt b/ctags/test_data/TestCTagsParserDefaultArguments.txt
similarity index 100%
rename from src/arduino.cc/builder/ctags/test_data/TestCTagsParserDefaultArguments.txt
rename to ctags/test_data/TestCTagsParserDefaultArguments.txt
diff --git a/src/arduino.cc/builder/ctags/test_data/TestCTagsParserFunctionPointer.txt b/ctags/test_data/TestCTagsParserFunctionPointer.txt
similarity index 100%
rename from src/arduino.cc/builder/ctags/test_data/TestCTagsParserFunctionPointer.txt
rename to ctags/test_data/TestCTagsParserFunctionPointer.txt
diff --git a/src/arduino.cc/builder/ctags/test_data/TestCTagsParserFunctionPointers.txt b/ctags/test_data/TestCTagsParserFunctionPointers.txt
similarity index 100%
rename from src/arduino.cc/builder/ctags/test_data/TestCTagsParserFunctionPointers.txt
rename to ctags/test_data/TestCTagsParserFunctionPointers.txt
diff --git a/src/arduino.cc/builder/ctags/test_data/TestCTagsParserFunctionPointersNoIndirect.txt b/ctags/test_data/TestCTagsParserFunctionPointersNoIndirect.txt
similarity index 100%
rename from src/arduino.cc/builder/ctags/test_data/TestCTagsParserFunctionPointersNoIndirect.txt
rename to ctags/test_data/TestCTagsParserFunctionPointersNoIndirect.txt
diff --git a/src/arduino.cc/builder/ctags/test_data/TestCTagsParserNamespace.txt b/ctags/test_data/TestCTagsParserNamespace.txt
similarity index 100%
rename from src/arduino.cc/builder/ctags/test_data/TestCTagsParserNamespace.txt
rename to ctags/test_data/TestCTagsParserNamespace.txt
diff --git a/src/arduino.cc/builder/ctags/test_data/TestCTagsParserShouldDealFunctionWithDifferentSignatures.txt b/ctags/test_data/TestCTagsParserShouldDealFunctionWithDifferentSignatures.txt
similarity index 100%
rename from src/arduino.cc/builder/ctags/test_data/TestCTagsParserShouldDealFunctionWithDifferentSignatures.txt
rename to ctags/test_data/TestCTagsParserShouldDealFunctionWithDifferentSignatures.txt
diff --git a/src/arduino.cc/builder/ctags/test_data/TestCTagsParserShouldDealWithClasses.txt b/ctags/test_data/TestCTagsParserShouldDealWithClasses.txt
similarity index 100%
rename from src/arduino.cc/builder/ctags/test_data/TestCTagsParserShouldDealWithClasses.txt
rename to ctags/test_data/TestCTagsParserShouldDealWithClasses.txt
diff --git a/src/arduino.cc/builder/ctags/test_data/TestCTagsParserShouldDealWithMacros.txt b/ctags/test_data/TestCTagsParserShouldDealWithMacros.txt
similarity index 100%
rename from src/arduino.cc/builder/ctags/test_data/TestCTagsParserShouldDealWithMacros.txt
rename to ctags/test_data/TestCTagsParserShouldDealWithMacros.txt
diff --git a/src/arduino.cc/builder/ctags/test_data/TestCTagsParserShouldDealWithStructs.txt b/ctags/test_data/TestCTagsParserShouldDealWithStructs.txt
similarity index 100%
rename from src/arduino.cc/builder/ctags/test_data/TestCTagsParserShouldDealWithStructs.txt
rename to ctags/test_data/TestCTagsParserShouldDealWithStructs.txt
diff --git a/src/arduino.cc/builder/ctags/test_data/TestCTagsParserShouldListPrototypes.txt b/ctags/test_data/TestCTagsParserShouldListPrototypes.txt
similarity index 100%
rename from src/arduino.cc/builder/ctags/test_data/TestCTagsParserShouldListPrototypes.txt
rename to ctags/test_data/TestCTagsParserShouldListPrototypes.txt
diff --git a/src/arduino.cc/builder/ctags/test_data/TestCTagsParserShouldListTemplates.txt b/ctags/test_data/TestCTagsParserShouldListTemplates.txt
similarity index 100%
rename from src/arduino.cc/builder/ctags/test_data/TestCTagsParserShouldListTemplates.txt
rename to ctags/test_data/TestCTagsParserShouldListTemplates.txt
diff --git a/src/arduino.cc/builder/ctags/test_data/TestCTagsParserShouldListTemplates2.txt b/ctags/test_data/TestCTagsParserShouldListTemplates2.txt
similarity index 100%
rename from src/arduino.cc/builder/ctags/test_data/TestCTagsParserShouldListTemplates2.txt
rename to ctags/test_data/TestCTagsParserShouldListTemplates2.txt
diff --git a/src/arduino.cc/builder/ctags/test_data/TestCTagsParserStatic.txt b/ctags/test_data/TestCTagsParserStatic.txt
similarity index 100%
rename from src/arduino.cc/builder/ctags/test_data/TestCTagsParserStatic.txt
rename to ctags/test_data/TestCTagsParserStatic.txt
diff --git a/src/arduino.cc/builder/ctags/test_data/TestCTagsParserStructWithFunctions.txt b/ctags/test_data/TestCTagsParserStructWithFunctions.txt
similarity index 100%
rename from src/arduino.cc/builder/ctags/test_data/TestCTagsParserStructWithFunctions.txt
rename to ctags/test_data/TestCTagsParserStructWithFunctions.txt
diff --git a/ctags/test_data/TestCTagsRunnerSketchWithClassFunction.txt b/ctags/test_data/TestCTagsRunnerSketchWithClassFunction.txt
new file mode 100644
index 00000000..42f3b5ca
--- /dev/null
+++ b/ctags/test_data/TestCTagsRunnerSketchWithClassFunction.txt
@@ -0,0 +1,4 @@
+asdf	/home/megabug/Workspace/arduino-builder/src/github.com/arduino/arduino-builder/test/sketch_class_function/sketch_class_function.ino	/^    void asdf() {}$/;"	kind:function	line:2	class:test	signature:()	returntype:void
+setup	/home/megabug/Workspace/arduino-builder/src/github.com/arduino/arduino-builder/test/sketch_class_function/sketch_class_function.ino	/^void setup() {$/;"	kind:function	line:4	signature:()	returntype:void
+loop	/home/megabug/Workspace/arduino-builder/src/github.com/arduino/arduino-builder/test/sketch_class_function/sketch_class_function.ino	/^void loop() {}$/;"	kind:function	line:7	signature:()	returntype:void
+asdf	/home/megabug/Workspace/arduino-builder/src/github.com/arduino/arduino-builder/test/sketch_class_function/sketch_class_function.ino	/^void asdf() {}$/;"	kind:function	line:8	signature:()	returntype:void
diff --git a/src/arduino.cc/builder/ctags/test_data/TestCTagsRunnerSketchWithMultifile.txt b/ctags/test_data/TestCTagsRunnerSketchWithMultifile.txt
similarity index 100%
rename from src/arduino.cc/builder/ctags/test_data/TestCTagsRunnerSketchWithMultifile.txt
rename to ctags/test_data/TestCTagsRunnerSketchWithMultifile.txt
diff --git a/src/arduino.cc/builder/ctags_runner.go b/ctags_runner.go
similarity index 92%
rename from src/arduino.cc/builder/ctags_runner.go
rename to ctags_runner.go
index 2ab75638..82e4165c 100644
--- a/src/arduino.cc/builder/ctags_runner.go
+++ b/ctags_runner.go
@@ -32,11 +32,11 @@ package builder
 import (
 	"fmt"
 
-	"arduino.cc/builder/constants"
-	"arduino.cc/builder/ctags"
-	"arduino.cc/builder/i18n"
-	"arduino.cc/builder/types"
-	"arduino.cc/builder/utils"
+	"github.com/arduino/arduino-builder/constants"
+	"github.com/arduino/arduino-builder/ctags"
+	"github.com/arduino/arduino-builder/i18n"
+	"github.com/arduino/arduino-builder/types"
+	"github.com/arduino/arduino-builder/utils"
 )
 
 type CTagsRunner struct{}
diff --git a/src/arduino.cc/builder/ctags_target_file_saver.go b/ctags_target_file_saver.go
similarity index 93%
rename from src/arduino.cc/builder/ctags_target_file_saver.go
rename to ctags_target_file_saver.go
index 0f3277ca..3c79b31f 100644
--- a/src/arduino.cc/builder/ctags_target_file_saver.go
+++ b/ctags_target_file_saver.go
@@ -30,9 +30,9 @@
 package builder
 
 import (
-	"arduino.cc/builder/i18n"
-	"arduino.cc/builder/types"
-	"arduino.cc/builder/utils"
+	"github.com/arduino/arduino-builder/i18n"
+	"github.com/arduino/arduino-builder/types"
+	"github.com/arduino/arduino-builder/utils"
 	"path/filepath"
 )
 
diff --git a/src/arduino.cc/builder/dump_build_properties.go b/dump_build_properties.go
similarity index 95%
rename from src/arduino.cc/builder/dump_build_properties.go
rename to dump_build_properties.go
index af20cc1b..c84c97e4 100644
--- a/src/arduino.cc/builder/dump_build_properties.go
+++ b/dump_build_properties.go
@@ -30,8 +30,8 @@
 package builder
 
 import (
-	"arduino.cc/builder/types"
-	"arduino.cc/builder/utils"
+	"github.com/arduino/arduino-builder/types"
+	"github.com/arduino/arduino-builder/utils"
 	"fmt"
 	"sort"
 )
diff --git a/src/arduino.cc/builder/ensure_buildpath_exists.go b/ensure_buildpath_exists.go
similarity index 92%
rename from src/arduino.cc/builder/ensure_buildpath_exists.go
rename to ensure_buildpath_exists.go
index 39ab0156..495b8d83 100644
--- a/src/arduino.cc/builder/ensure_buildpath_exists.go
+++ b/ensure_buildpath_exists.go
@@ -30,9 +30,9 @@
 package builder
 
 import (
-	"arduino.cc/builder/i18n"
-	"arduino.cc/builder/types"
-	"arduino.cc/builder/utils"
+	"github.com/arduino/arduino-builder/i18n"
+	"github.com/arduino/arduino-builder/types"
+	"github.com/arduino/arduino-builder/utils"
 )
 
 type EnsureBuildPathExists struct{}
diff --git a/src/arduino.cc/builder/fail_if_buildpath_equals_sketchpath.go b/fail_if_buildpath_equals_sketchpath.go
similarity index 93%
rename from src/arduino.cc/builder/fail_if_buildpath_equals_sketchpath.go
rename to fail_if_buildpath_equals_sketchpath.go
index e42adee5..4a3ac711 100644
--- a/src/arduino.cc/builder/fail_if_buildpath_equals_sketchpath.go
+++ b/fail_if_buildpath_equals_sketchpath.go
@@ -30,9 +30,9 @@
 package builder
 
 import (
-	"arduino.cc/builder/constants"
-	"arduino.cc/builder/i18n"
-	"arduino.cc/builder/types"
+	"github.com/arduino/arduino-builder/constants"
+	"github.com/arduino/arduino-builder/i18n"
+	"github.com/arduino/arduino-builder/types"
 	"path/filepath"
 )
 
diff --git a/src/arduino.cc/builder/fail_if_imported_library_is_wrong.go b/fail_if_imported_library_is_wrong.go
similarity index 94%
rename from src/arduino.cc/builder/fail_if_imported_library_is_wrong.go
rename to fail_if_imported_library_is_wrong.go
index 1c1c5ae1..2620560c 100644
--- a/src/arduino.cc/builder/fail_if_imported_library_is_wrong.go
+++ b/fail_if_imported_library_is_wrong.go
@@ -30,9 +30,9 @@
 package builder
 
 import (
-	"arduino.cc/builder/constants"
-	"arduino.cc/builder/i18n"
-	"arduino.cc/builder/types"
+	"github.com/arduino/arduino-builder/constants"
+	"github.com/arduino/arduino-builder/i18n"
+	"github.com/arduino/arduino-builder/types"
 	"os"
 	"path/filepath"
 )
diff --git a/src/arduino.cc/builder/filter_sketch_source.go b/filter_sketch_source.go
similarity index 97%
rename from src/arduino.cc/builder/filter_sketch_source.go
rename to filter_sketch_source.go
index 0f20ce7e..6de658cd 100644
--- a/src/arduino.cc/builder/filter_sketch_source.go
+++ b/filter_sketch_source.go
@@ -34,8 +34,8 @@ import (
 	"strconv"
 	"strings"
 
-	"arduino.cc/builder/types"
-	"arduino.cc/builder/utils"
+	"github.com/arduino/arduino-builder/types"
+	"github.com/arduino/arduino-builder/utils"
 )
 
 type FilterSketchSource struct {
diff --git a/fmt_fix_vet b/fmt_fix_vet
deleted file mode 100755
index 34eb5dcd..00000000
--- a/fmt_fix_vet
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash -x
-
-go fmt ./src/arduino.cc/...
-go fix ./src/arduino.cc/...
-go vet ./src/arduino.cc/...
diff --git a/src/arduino.cc/builder/gcc_preproc_runner.go b/gcc_preproc_runner.go
similarity index 94%
rename from src/arduino.cc/builder/gcc_preproc_runner.go
rename to gcc_preproc_runner.go
index e735ac40..b571cacc 100644
--- a/src/arduino.cc/builder/gcc_preproc_runner.go
+++ b/gcc_preproc_runner.go
@@ -33,12 +33,12 @@ import (
 	"path/filepath"
 	"strings"
 
-	"arduino.cc/builder/builder_utils"
-	"arduino.cc/builder/constants"
-	"arduino.cc/builder/i18n"
-	"arduino.cc/builder/types"
-	"arduino.cc/builder/utils"
-	"arduino.cc/properties"
+	"github.com/arduino/arduino-builder/builder_utils"
+	"github.com/arduino/arduino-builder/constants"
+	"github.com/arduino/arduino-builder/i18n"
+	"github.com/arduino/arduino-builder/types"
+	"github.com/arduino/arduino-builder/utils"
+	"github.com/arduino/go-properties-map"
 )
 
 type GCCPreprocRunner struct {
diff --git a/src/arduino.cc/builder/gcc_preproc_source_saver.go b/gcc_preproc_source_saver.go
similarity index 90%
rename from src/arduino.cc/builder/gcc_preproc_source_saver.go
rename to gcc_preproc_source_saver.go
index 4eb1c083..556cd276 100644
--- a/src/arduino.cc/builder/gcc_preproc_source_saver.go
+++ b/gcc_preproc_source_saver.go
@@ -32,10 +32,10 @@ package builder
 // XXX: OBSOLETE?
 
 import (
-	"arduino.cc/builder/constants"
-	"arduino.cc/builder/i18n"
-	"arduino.cc/builder/types"
-	"arduino.cc/builder/utils"
+	"github.com/arduino/arduino-builder/constants"
+	"github.com/arduino/arduino-builder/i18n"
+	"github.com/arduino/arduino-builder/types"
+	"github.com/arduino/arduino-builder/utils"
 	"path/filepath"
 )
 
diff --git a/src/arduino.cc/builder/generate_buildpath_if_missing.go b/generate_buildpath_if_missing.go
similarity index 91%
rename from src/arduino.cc/builder/generate_buildpath_if_missing.go
rename to generate_buildpath_if_missing.go
index f165afaf..7b11ae13 100644
--- a/src/arduino.cc/builder/generate_buildpath_if_missing.go
+++ b/generate_buildpath_if_missing.go
@@ -30,10 +30,10 @@
 package builder
 
 import (
-	"arduino.cc/builder/constants"
-	"arduino.cc/builder/i18n"
-	"arduino.cc/builder/types"
-	"arduino.cc/builder/utils"
+	"github.com/arduino/arduino-builder/constants"
+	"github.com/arduino/arduino-builder/i18n"
+	"github.com/arduino/arduino-builder/types"
+	"github.com/arduino/arduino-builder/utils"
 	"os"
 	"path/filepath"
 	"strings"
diff --git a/src/arduino.cc/builder/gohasissues/go_has_issues.go b/gohasissues/go_has_issues.go
similarity index 100%
rename from src/arduino.cc/builder/gohasissues/go_has_issues.go
rename to gohasissues/go_has_issues.go
diff --git a/src/arduino.cc/builder/hardware/platform.keys.rewrite.txt b/hardware/platform.keys.rewrite.txt
similarity index 100%
rename from src/arduino.cc/builder/hardware/platform.keys.rewrite.txt
rename to hardware/platform.keys.rewrite.txt
diff --git a/src/arduino.cc/builder/hardware/platform.txt b/hardware/platform.txt
similarity index 100%
rename from src/arduino.cc/builder/hardware/platform.txt
rename to hardware/platform.txt
diff --git a/src/arduino.cc/builder/hardware_loader.go b/hardware_loader.go
similarity index 94%
rename from src/arduino.cc/builder/hardware_loader.go
rename to hardware_loader.go
index 26a2df85..d22d0b3b 100644
--- a/src/arduino.cc/builder/hardware_loader.go
+++ b/hardware_loader.go
@@ -33,11 +33,11 @@ import (
 	"os"
 	"path/filepath"
 
-	"arduino.cc/builder/constants"
-	"arduino.cc/builder/i18n"
-	"arduino.cc/builder/types"
-	"arduino.cc/builder/utils"
-	"arduino.cc/properties"
+	"github.com/arduino/arduino-builder/constants"
+	"github.com/arduino/arduino-builder/i18n"
+	"github.com/arduino/arduino-builder/types"
+	"github.com/arduino/arduino-builder/utils"
+	"github.com/arduino/go-properties-map"
 )
 
 type HardwareLoader struct{}
@@ -64,7 +64,7 @@ func (s *HardwareLoader) Run(ctx *types.Context) error {
 			return i18n.ErrorfWithLogger(logger, constants.MSG_MUST_BE_A_FOLDER, folder)
 		}
 
-		hardwarePlatformTxt, err := properties.SafeLoad(filepath.Join(folder, constants.FILE_PLATFORM_TXT), logger)
+		hardwarePlatformTxt, err := properties.SafeLoad(filepath.Join(folder, constants.FILE_PLATFORM_TXT))
 		if err != nil {
 			return i18n.WrapError(err)
 		}
@@ -112,7 +112,7 @@ func getOrCreatePackage(packages *types.Packages, packageId string) *types.Packa
 }
 
 func loadPackage(targetPackage *types.Package, folder string, logger i18n.Logger) error {
-	packagePlatformTxt, err := properties.SafeLoad(filepath.Join(folder, constants.FILE_PLATFORM_TXT), logger)
+	packagePlatformTxt, err := properties.SafeLoad(filepath.Join(folder, constants.FILE_PLATFORM_TXT))
 	if err != nil {
 		return i18n.WrapError(err)
 	}
@@ -186,12 +186,12 @@ func loadPlatform(targetPlatform *types.Platform, packageId string, folder strin
 
 	assignDefaultBoardToPlatform(targetPlatform)
 
-	platformTxt, err := properties.SafeLoad(filepath.Join(folder, constants.FILE_PLATFORM_TXT), logger)
+	platformTxt, err := properties.SafeLoad(filepath.Join(folder, constants.FILE_PLATFORM_TXT))
 	if err != nil {
 		return i18n.WrapError(err)
 	}
 
-	localPlatformProperties, err := properties.SafeLoad(filepath.Join(folder, constants.FILE_PLATFORM_LOCAL_TXT), logger)
+	localPlatformProperties, err := properties.SafeLoad(filepath.Join(folder, constants.FILE_PLATFORM_LOCAL_TXT))
 	if err != nil {
 		return i18n.WrapError(err)
 	}
@@ -200,7 +200,7 @@ func loadPlatform(targetPlatform *types.Platform, packageId string, folder strin
 	targetPlatform.Properties.Merge(platformTxt)
 	targetPlatform.Properties.Merge(localPlatformProperties)
 
-	programmersProperties, err := properties.SafeLoad(filepath.Join(folder, constants.FILE_PROGRAMMERS_TXT), logger)
+	programmersProperties, err := properties.SafeLoad(filepath.Join(folder, constants.FILE_PROGRAMMERS_TXT))
 	if err != nil {
 		return i18n.WrapError(err)
 	}
@@ -220,12 +220,12 @@ func assignDefaultBoardToPlatform(targetPlatform *types.Platform) {
 }
 
 func loadBoards(boards map[string]*types.Board, packageId string, platformId string, folder string, logger i18n.Logger) error {
-	boardsProperties, err := properties.Load(filepath.Join(folder, constants.FILE_BOARDS_TXT), logger)
+	boardsProperties, err := properties.Load(filepath.Join(folder, constants.FILE_BOARDS_TXT))
 	if err != nil {
 		return i18n.WrapError(err)
 	}
 
-	localProperties, err := properties.SafeLoad(filepath.Join(folder, constants.FILE_BOARDS_LOCAL_TXT), logger)
+	localProperties, err := properties.SafeLoad(filepath.Join(folder, constants.FILE_BOARDS_LOCAL_TXT))
 	if err != nil {
 		return i18n.WrapError(err)
 	}
diff --git a/src/arduino.cc/builder/i18n/errors.go b/i18n/errors.go
similarity index 88%
rename from src/arduino.cc/builder/i18n/errors.go
rename to i18n/errors.go
index 604fa1e8..ba2a86ea 100644
--- a/src/arduino.cc/builder/i18n/errors.go
+++ b/i18n/errors.go
@@ -1,6 +1,6 @@
 package i18n
 
-import "arduino.cc/builder/constants"
+import "github.com/arduino/arduino-builder/constants"
 import "github.com/go-errors/errors"
 import "os"
 
diff --git a/src/arduino.cc/builder/i18n/i18n.go b/i18n/i18n.go
similarity index 100%
rename from src/arduino.cc/builder/i18n/i18n.go
rename to i18n/i18n.go
diff --git a/src/arduino.cc/builder/includes_finder_with_regexp.go b/includes_finder_with_regexp.go
similarity index 98%
rename from src/arduino.cc/builder/includes_finder_with_regexp.go
rename to includes_finder_with_regexp.go
index f093759d..56ac955e 100644
--- a/src/arduino.cc/builder/includes_finder_with_regexp.go
+++ b/includes_finder_with_regexp.go
@@ -30,7 +30,7 @@
 package builder
 
 import (
-	"arduino.cc/builder/types"
+	"github.com/arduino/arduino-builder/types"
 	"regexp"
 	"strings"
 )
diff --git a/src/arduino.cc/builder/libraries_loader.go b/libraries_loader.go
similarity index 97%
rename from src/arduino.cc/builder/libraries_loader.go
rename to libraries_loader.go
index 0fd3bfd9..1730bf44 100644
--- a/src/arduino.cc/builder/libraries_loader.go
+++ b/libraries_loader.go
@@ -34,11 +34,11 @@ import (
 	"path/filepath"
 	"strings"
 
-	"arduino.cc/builder/constants"
-	"arduino.cc/builder/i18n"
-	"arduino.cc/builder/types"
-	"arduino.cc/builder/utils"
-	"arduino.cc/properties"
+	"github.com/arduino/arduino-builder/constants"
+	"github.com/arduino/arduino-builder/i18n"
+	"github.com/arduino/arduino-builder/types"
+	"github.com/arduino/arduino-builder/utils"
+	"github.com/arduino/go-properties-map"
 )
 
 type LibrariesLoader struct{}
@@ -122,7 +122,7 @@ func addUtilityFolder(library *types.Library) {
 }
 
 func makeNewLibrary(libraryFolder string, debugLevel int, logger i18n.Logger) (*types.Library, error) {
-	libProperties, err := properties.Load(filepath.Join(libraryFolder, constants.LIBRARY_PROPERTIES), logger)
+	libProperties, err := properties.Load(filepath.Join(libraryFolder, constants.LIBRARY_PROPERTIES))
 	if err != nil {
 		return nil, i18n.WrapError(err)
 	}
diff --git a/src/arduino.cc/builder/load_previous_build_options.go b/load_previous_build_options.go
similarity index 93%
rename from src/arduino.cc/builder/load_previous_build_options.go
rename to load_previous_build_options.go
index 2d051847..3b9bd5d0 100644
--- a/src/arduino.cc/builder/load_previous_build_options.go
+++ b/load_previous_build_options.go
@@ -30,9 +30,9 @@
 package builder
 
 import (
-	"arduino.cc/builder/constants"
-	"arduino.cc/builder/i18n"
-	"arduino.cc/builder/types"
+	"github.com/arduino/arduino-builder/constants"
+	"github.com/arduino/arduino-builder/i18n"
+	"github.com/arduino/arduino-builder/types"
 	"io/ioutil"
 	"os"
 	"path/filepath"
diff --git a/src/arduino.cc/builder/load_vid_pid_specific_properties.go b/load_vid_pid_specific_properties.go
similarity index 93%
rename from src/arduino.cc/builder/load_vid_pid_specific_properties.go
rename to load_vid_pid_specific_properties.go
index f2f27ed2..df3cc434 100644
--- a/src/arduino.cc/builder/load_vid_pid_specific_properties.go
+++ b/load_vid_pid_specific_properties.go
@@ -33,10 +33,10 @@ import (
 	"strconv"
 	"strings"
 
-	"arduino.cc/builder/constants"
-	"arduino.cc/builder/i18n"
-	"arduino.cc/builder/types"
-	"arduino.cc/properties"
+	"github.com/arduino/arduino-builder/constants"
+	"github.com/arduino/arduino-builder/i18n"
+	"github.com/arduino/arduino-builder/types"
+	"github.com/arduino/go-properties-map"
 )
 
 type LoadVIDPIDSpecificProperties struct{}
diff --git a/src/arduino.cc/builder/merge_sketch_with_bootloader.go b/merge_sketch_with_bootloader.go
similarity index 96%
rename from src/arduino.cc/builder/merge_sketch_with_bootloader.go
rename to merge_sketch_with_bootloader.go
index 34fa657b..ebefa77e 100644
--- a/src/arduino.cc/builder/merge_sketch_with_bootloader.go
+++ b/merge_sketch_with_bootloader.go
@@ -30,10 +30,10 @@
 package builder
 
 import (
-	"arduino.cc/builder/constants"
-	"arduino.cc/builder/i18n"
-	"arduino.cc/builder/types"
-	"arduino.cc/builder/utils"
+	"github.com/arduino/arduino-builder/constants"
+	"github.com/arduino/arduino-builder/i18n"
+	"github.com/arduino/arduino-builder/types"
+	"github.com/arduino/arduino-builder/utils"
 	"os"
 	"path/filepath"
 	"strings"
diff --git a/src/arduino.cc/builder/phases/core_builder.go b/phases/core_builder.go
similarity index 94%
rename from src/arduino.cc/builder/phases/core_builder.go
rename to phases/core_builder.go
index 92eef40a..75b6535d 100644
--- a/src/arduino.cc/builder/phases/core_builder.go
+++ b/phases/core_builder.go
@@ -32,12 +32,12 @@ package phases
 import (
 	"path/filepath"
 
-	"arduino.cc/builder/builder_utils"
-	"arduino.cc/builder/constants"
-	"arduino.cc/builder/i18n"
-	"arduino.cc/builder/types"
-	"arduino.cc/builder/utils"
-	"arduino.cc/properties"
+	"github.com/arduino/arduino-builder/builder_utils"
+	"github.com/arduino/arduino-builder/constants"
+	"github.com/arduino/arduino-builder/i18n"
+	"github.com/arduino/arduino-builder/types"
+	"github.com/arduino/arduino-builder/utils"
+	"github.com/arduino/go-properties-map"
 )
 
 type CoreBuilder struct{}
diff --git a/src/arduino.cc/builder/phases/libraries_builder.go b/phases/libraries_builder.go
similarity index 95%
rename from src/arduino.cc/builder/phases/libraries_builder.go
rename to phases/libraries_builder.go
index 34c832a3..fda56b80 100644
--- a/src/arduino.cc/builder/phases/libraries_builder.go
+++ b/phases/libraries_builder.go
@@ -33,12 +33,12 @@ import (
 	"path/filepath"
 	"strings"
 
-	"arduino.cc/builder/builder_utils"
-	"arduino.cc/builder/constants"
-	"arduino.cc/builder/i18n"
-	"arduino.cc/builder/types"
-	"arduino.cc/builder/utils"
-	"arduino.cc/properties"
+	"github.com/arduino/arduino-builder/builder_utils"
+	"github.com/arduino/arduino-builder/constants"
+	"github.com/arduino/arduino-builder/i18n"
+	"github.com/arduino/arduino-builder/types"
+	"github.com/arduino/arduino-builder/utils"
+	"github.com/arduino/go-properties-map"
 )
 
 var PRECOMPILED_LIBRARIES_VALID_EXTENSIONS_STATIC = map[string]bool{".a": true}
diff --git a/src/arduino.cc/builder/phases/linker.go b/phases/linker.go
similarity index 93%
rename from src/arduino.cc/builder/phases/linker.go
rename to phases/linker.go
index 5f633a8c..d35f4993 100644
--- a/src/arduino.cc/builder/phases/linker.go
+++ b/phases/linker.go
@@ -33,12 +33,12 @@ import (
 	"path/filepath"
 	"strings"
 
-	"arduino.cc/builder/builder_utils"
-	"arduino.cc/builder/constants"
-	"arduino.cc/builder/i18n"
-	"arduino.cc/builder/types"
-	"arduino.cc/builder/utils"
-	"arduino.cc/properties"
+	"github.com/arduino/arduino-builder/builder_utils"
+	"github.com/arduino/arduino-builder/constants"
+	"github.com/arduino/arduino-builder/i18n"
+	"github.com/arduino/arduino-builder/types"
+	"github.com/arduino/arduino-builder/utils"
+	"github.com/arduino/go-properties-map"
 )
 
 type Linker struct{}
diff --git a/src/arduino.cc/builder/phases/sizer.go b/phases/sizer.go
similarity index 95%
rename from src/arduino.cc/builder/phases/sizer.go
rename to phases/sizer.go
index b4373a2d..7ea86997 100644
--- a/src/arduino.cc/builder/phases/sizer.go
+++ b/phases/sizer.go
@@ -34,11 +34,11 @@ import (
 	"regexp"
 	"strconv"
 
-	"arduino.cc/builder/builder_utils"
-	"arduino.cc/builder/constants"
-	"arduino.cc/builder/i18n"
-	"arduino.cc/builder/types"
-	"arduino.cc/properties"
+	"github.com/arduino/arduino-builder/builder_utils"
+	"github.com/arduino/arduino-builder/constants"
+	"github.com/arduino/arduino-builder/i18n"
+	"github.com/arduino/arduino-builder/types"
+	"github.com/arduino/go-properties-map"
 )
 
 type Sizer struct {
diff --git a/src/arduino.cc/builder/phases/sizer_test.go b/phases/sizer_test.go
similarity index 100%
rename from src/arduino.cc/builder/phases/sizer_test.go
rename to phases/sizer_test.go
diff --git a/src/arduino.cc/builder/phases/sketch_builder.go b/phases/sketch_builder.go
similarity index 91%
rename from src/arduino.cc/builder/phases/sketch_builder.go
rename to phases/sketch_builder.go
index 68b5a859..04c7ded7 100644
--- a/src/arduino.cc/builder/phases/sketch_builder.go
+++ b/phases/sketch_builder.go
@@ -30,11 +30,11 @@
 package phases
 
 import (
-	"arduino.cc/builder/builder_utils"
-	"arduino.cc/builder/constants"
-	"arduino.cc/builder/i18n"
-	"arduino.cc/builder/types"
-	"arduino.cc/builder/utils"
+	"github.com/arduino/arduino-builder/builder_utils"
+	"github.com/arduino/arduino-builder/constants"
+	"github.com/arduino/arduino-builder/i18n"
+	"github.com/arduino/arduino-builder/types"
+	"github.com/arduino/arduino-builder/utils"
 	"os"
 	"path/filepath"
 )
diff --git a/src/arduino.cc/builder/platform_keys_rewrite_loader.go b/platform_keys_rewrite_loader.go
similarity index 91%
rename from src/arduino.cc/builder/platform_keys_rewrite_loader.go
rename to platform_keys_rewrite_loader.go
index 0f2cc57a..8298c9bf 100644
--- a/src/arduino.cc/builder/platform_keys_rewrite_loader.go
+++ b/platform_keys_rewrite_loader.go
@@ -36,17 +36,16 @@ import (
 	"strconv"
 	"strings"
 
-	"arduino.cc/builder/constants"
-	"arduino.cc/builder/i18n"
-	"arduino.cc/builder/types"
-	"arduino.cc/builder/utils"
-	"arduino.cc/properties"
+	"github.com/arduino/arduino-builder/constants"
+	"github.com/arduino/arduino-builder/i18n"
+	"github.com/arduino/arduino-builder/types"
+	"github.com/arduino/arduino-builder/utils"
+	"github.com/arduino/go-properties-map"
 )
 
 type PlatformKeysRewriteLoader struct{}
 
 func (s *PlatformKeysRewriteLoader) Run(ctx *types.Context) error {
-	logger := ctx.GetLogger()
 	folders := ctx.HardwareFolders
 
 	platformKeysRewriteTxtPath, err := findPlatformKeysRewriteTxt(folders)
@@ -60,7 +59,10 @@ func (s *PlatformKeysRewriteLoader) Run(ctx *types.Context) error {
 	platformKeysRewrite := types.PlatforKeysRewrite{}
 	platformKeysRewrite.Rewrites = []types.PlatforKeyRewrite{}
 
-	txt, err := properties.Load(platformKeysRewriteTxtPath, logger)
+	txt, err := properties.Load(platformKeysRewriteTxtPath)
+	if err != nil {
+		return i18n.WrapError(err)
+	}
 	keys := utils.KeysOfMapOfString(txt)
 	sort.Strings(keys)
 
diff --git a/src/arduino.cc/builder/print_preprocessed_source.go b/print_preprocessed_source.go
similarity index 97%
rename from src/arduino.cc/builder/print_preprocessed_source.go
rename to print_preprocessed_source.go
index b788cb72..c6afae14 100644
--- a/src/arduino.cc/builder/print_preprocessed_source.go
+++ b/print_preprocessed_source.go
@@ -30,7 +30,7 @@
 package builder
 
 import (
-	"arduino.cc/builder/types"
+	"github.com/arduino/arduino-builder/types"
 	"fmt"
 )
 
diff --git a/src/arduino.cc/builder/print_used_and_not_used_libraries.go b/print_used_and_not_used_libraries.go
similarity index 96%
rename from src/arduino.cc/builder/print_used_and_not_used_libraries.go
rename to print_used_and_not_used_libraries.go
index b853ebc2..b60a6bf0 100644
--- a/src/arduino.cc/builder/print_used_and_not_used_libraries.go
+++ b/print_used_and_not_used_libraries.go
@@ -30,8 +30,8 @@
 package builder
 
 import (
-	"arduino.cc/builder/constants"
-	"arduino.cc/builder/types"
+	"github.com/arduino/arduino-builder/constants"
+	"github.com/arduino/arduino-builder/types"
 	"os"
 	"time"
 )
diff --git a/src/arduino.cc/builder/print_used_libraries_if_verbose.go b/print_used_libraries_if_verbose.go
similarity index 95%
rename from src/arduino.cc/builder/print_used_libraries_if_verbose.go
rename to print_used_libraries_if_verbose.go
index afcf4eb4..3489c9a0 100644
--- a/src/arduino.cc/builder/print_used_libraries_if_verbose.go
+++ b/print_used_libraries_if_verbose.go
@@ -30,8 +30,8 @@
 package builder
 
 import (
-	"arduino.cc/builder/constants"
-	"arduino.cc/builder/types"
+	"github.com/arduino/arduino-builder/constants"
+	"github.com/arduino/arduino-builder/types"
 	"time"
 )
 
diff --git a/src/arduino.cc/builder/prototypes_adder.go b/prototypes_adder.go
similarity index 96%
rename from src/arduino.cc/builder/prototypes_adder.go
rename to prototypes_adder.go
index d80b656d..db283519 100644
--- a/src/arduino.cc/builder/prototypes_adder.go
+++ b/prototypes_adder.go
@@ -30,9 +30,9 @@
 package builder
 
 import (
-	"arduino.cc/builder/constants"
-	"arduino.cc/builder/types"
-	"arduino.cc/builder/utils"
+	"github.com/arduino/arduino-builder/constants"
+	"github.com/arduino/arduino-builder/types"
+	"github.com/arduino/arduino-builder/utils"
 	"fmt"
 	"strconv"
 	"strings"
diff --git a/src/arduino.cc/builder/read_file_and_store_in_context.go b/read_file_and_store_in_context.go
similarity index 95%
rename from src/arduino.cc/builder/read_file_and_store_in_context.go
rename to read_file_and_store_in_context.go
index bac49009..a2533929 100644
--- a/src/arduino.cc/builder/read_file_and_store_in_context.go
+++ b/read_file_and_store_in_context.go
@@ -30,8 +30,8 @@
 package builder
 
 import (
-	"arduino.cc/builder/i18n"
-	"arduino.cc/builder/types"
+	"github.com/arduino/arduino-builder/i18n"
+	"github.com/arduino/arduino-builder/types"
 	"io/ioutil"
 )
 
diff --git a/src/arduino.cc/builder/recipe_runner.go b/recipe_runner.go
similarity index 93%
rename from src/arduino.cc/builder/recipe_runner.go
rename to recipe_runner.go
index b0bd14e3..bec23f90 100644
--- a/src/arduino.cc/builder/recipe_runner.go
+++ b/recipe_runner.go
@@ -30,10 +30,10 @@
 package builder
 
 import (
-	"arduino.cc/builder/builder_utils"
-	"arduino.cc/builder/constants"
-	"arduino.cc/builder/i18n"
-	"arduino.cc/builder/types"
+	"github.com/arduino/arduino-builder/builder_utils"
+	"github.com/arduino/arduino-builder/constants"
+	"github.com/arduino/arduino-builder/i18n"
+	"github.com/arduino/arduino-builder/types"
 	"os"
 	"sort"
 	"strings"
diff --git a/src/arduino.cc/builder/resolve_library.go b/resolve_library.go
similarity index 98%
rename from src/arduino.cc/builder/resolve_library.go
rename to resolve_library.go
index 2495bcc0..dd96ab75 100644
--- a/src/arduino.cc/builder/resolve_library.go
+++ b/resolve_library.go
@@ -33,9 +33,9 @@ import (
 	"path/filepath"
 	"strings"
 
-	"arduino.cc/builder/constants"
-	"arduino.cc/builder/types"
-	"arduino.cc/builder/utils"
+	"github.com/arduino/arduino-builder/constants"
+	"github.com/arduino/arduino-builder/types"
+	"github.com/arduino/arduino-builder/utils"
 )
 
 func ResolveLibrary(ctx *types.Context, header string) *types.Library {
diff --git a/src/arduino.cc/builder/resolve_library_test.go b/resolve_library_test.go
similarity index 98%
rename from src/arduino.cc/builder/resolve_library_test.go
rename to resolve_library_test.go
index 13a9f108..5d421216 100644
--- a/src/arduino.cc/builder/resolve_library_test.go
+++ b/resolve_library_test.go
@@ -32,7 +32,7 @@ package builder
 import (
 	"testing"
 
-	"arduino.cc/builder/types"
+	"github.com/arduino/arduino-builder/types"
 
 	"github.com/stretchr/testify/require"
 )
diff --git a/src/arduino.cc/builder/rewrite_hardware_keys.go b/rewrite_hardware_keys.go
similarity index 96%
rename from src/arduino.cc/builder/rewrite_hardware_keys.go
rename to rewrite_hardware_keys.go
index a245d309..97f7aef4 100644
--- a/src/arduino.cc/builder/rewrite_hardware_keys.go
+++ b/rewrite_hardware_keys.go
@@ -30,8 +30,8 @@
 package builder
 
 import (
-	"arduino.cc/builder/constants"
-	"arduino.cc/builder/types"
+	"github.com/arduino/arduino-builder/constants"
+	"github.com/arduino/arduino-builder/types"
 )
 
 type RewriteHardwareKeys struct{}
diff --git a/src/arduino.cc/builder/set_custom_build_properties.go b/set_custom_build_properties.go
similarity index 92%
rename from src/arduino.cc/builder/set_custom_build_properties.go
rename to set_custom_build_properties.go
index fb754fb6..12b3467a 100644
--- a/src/arduino.cc/builder/set_custom_build_properties.go
+++ b/set_custom_build_properties.go
@@ -30,17 +30,16 @@
 package builder
 
 import (
-	"arduino.cc/builder/i18n"
-	"arduino.cc/builder/types"
-	"arduino.cc/properties"
+	"github.com/arduino/arduino-builder/i18n"
+	"github.com/arduino/arduino-builder/types"
+	"github.com/arduino/go-properties-map"
 )
 
 type SetCustomBuildProperties struct{}
 
 func (s *SetCustomBuildProperties) Run(ctx *types.Context) error {
-	logger := ctx.GetLogger()
 	buildProperties := ctx.BuildProperties
-	customBuildProperties, err := properties.LoadFromSlice(ctx.CustomBuildProperties, logger)
+	customBuildProperties, err := properties.LoadFromSlice(ctx.CustomBuildProperties)
 	if err != nil {
 		return i18n.WrapError(err)
 	}
diff --git a/src/arduino.cc/builder/setup_build_properties.go b/setup_build_properties.go
similarity index 95%
rename from src/arduino.cc/builder/setup_build_properties.go
rename to setup_build_properties.go
index 02a272fc..b18d643a 100644
--- a/src/arduino.cc/builder/setup_build_properties.go
+++ b/setup_build_properties.go
@@ -35,11 +35,11 @@ import (
 	"strings"
 	"time"
 
-	"arduino.cc/builder/constants"
-	"arduino.cc/builder/types"
-	"arduino.cc/builder/utils"
-	"arduino.cc/properties"
-	"arduino.cc/timeutils"
+	"github.com/arduino/arduino-builder/constants"
+	"github.com/arduino/arduino-builder/types"
+	"github.com/arduino/arduino-builder/utils"
+	"github.com/arduino/go-properties-map"
+	"github.com/arduino/go-timeutils"
 )
 
 type SetupBuildProperties struct{}
diff --git a/src/arduino.cc/builder/sketch_loader.go b/sketch_loader.go
similarity index 96%
rename from src/arduino.cc/builder/sketch_loader.go
rename to sketch_loader.go
index 1f40733e..f8ab8caa 100644
--- a/src/arduino.cc/builder/sketch_loader.go
+++ b/sketch_loader.go
@@ -36,10 +36,10 @@ import (
 	"sort"
 	"strings"
 
-	"arduino.cc/builder/constants"
-	"arduino.cc/builder/i18n"
-	"arduino.cc/builder/types"
-	"arduino.cc/builder/utils"
+	"github.com/arduino/arduino-builder/constants"
+	"github.com/arduino/arduino-builder/i18n"
+	"github.com/arduino/arduino-builder/types"
+	"github.com/arduino/arduino-builder/utils"
 )
 
 type SketchLoader struct{}
diff --git a/src/arduino.cc/builder/sketch_saver.go b/sketch_saver.go
similarity index 93%
rename from src/arduino.cc/builder/sketch_saver.go
rename to sketch_saver.go
index 8737cc69..b377e872 100644
--- a/src/arduino.cc/builder/sketch_saver.go
+++ b/sketch_saver.go
@@ -30,9 +30,9 @@
 package builder
 
 import (
-	"arduino.cc/builder/i18n"
-	"arduino.cc/builder/types"
-	"arduino.cc/builder/utils"
+	"github.com/arduino/arduino-builder/i18n"
+	"github.com/arduino/arduino-builder/types"
+	"github.com/arduino/arduino-builder/utils"
 	"path/filepath"
 )
 
diff --git a/src/arduino.cc/builder/sketch_source_merger.go b/sketch_source_merger.go
similarity index 96%
rename from src/arduino.cc/builder/sketch_source_merger.go
rename to sketch_source_merger.go
index 3ad088db..bbfaad0d 100644
--- a/src/arduino.cc/builder/sketch_source_merger.go
+++ b/sketch_source_merger.go
@@ -31,8 +31,8 @@
 package builder
 
 import (
-	"arduino.cc/builder/types"
-	"arduino.cc/builder/utils"
+	"github.com/arduino/arduino-builder/types"
+	"github.com/arduino/arduino-builder/utils"
 	"regexp"
 )
 
diff --git a/src/arduino.cc/builder/ctags/test_data/TestCTagsRunnerSketchWithClassFunction.txt b/src/arduino.cc/builder/ctags/test_data/TestCTagsRunnerSketchWithClassFunction.txt
deleted file mode 100644
index 8d83586a..00000000
--- a/src/arduino.cc/builder/ctags/test_data/TestCTagsRunnerSketchWithClassFunction.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-asdf	/home/megabug/Workspace/arduino-builder/src/arduino.cc/builder/test/sketch_class_function/sketch_class_function.ino	/^    void asdf() {}$/;"	kind:function	line:2	class:test	signature:()	returntype:void
-setup	/home/megabug/Workspace/arduino-builder/src/arduino.cc/builder/test/sketch_class_function/sketch_class_function.ino	/^void setup() {$/;"	kind:function	line:4	signature:()	returntype:void
-loop	/home/megabug/Workspace/arduino-builder/src/arduino.cc/builder/test/sketch_class_function/sketch_class_function.ino	/^void loop() {}$/;"	kind:function	line:7	signature:()	returntype:void
-asdf	/home/megabug/Workspace/arduino-builder/src/arduino.cc/builder/test/sketch_class_function/sketch_class_function.ino	/^void asdf() {}$/;"	kind:function	line:8	signature:()	returntype:void
diff --git a/src/arduino.cc/properties/properties.go b/src/arduino.cc/properties/properties.go
deleted file mode 100644
index e406d4b8..00000000
--- a/src/arduino.cc/properties/properties.go
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * This file is part of Arduino Builder.
- *
- * Copyright 2016 Arduino LLC (http://www.arduino.cc/)
- *
- * Arduino Builder is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * As a special exception, you may use this file as part of a free software
- * library without restriction.  Specifically, if other files instantiate
- * templates or use macros or inline functions from this file, or you compile
- * this file and link it with other files to produce an executable, this
- * file does not by itself cause the resulting executable to be covered by
- * the GNU General Public License.  This exception does not however
- * invalidate any other reasons why the executable file might be covered by
- * the GNU General Public License.
- */
-
-package properties
-
-import (
-	"io/ioutil"
-	"os"
-	"reflect"
-	"regexp"
-	"runtime"
-	"strings"
-
-	"arduino.cc/builder/constants"
-	"arduino.cc/builder/i18n"
-
-	"github.com/go-errors/errors"
-)
-
-// Map is a properties container
-type Map map[string]string
-
-var osSuffix string
-
-func init() {
-	switch value := runtime.GOOS; value {
-	case "linux":
-		osSuffix = runtime.GOOS
-	case "freebsd":
-		osSuffix = runtime.GOOS
-	case "windows":
-		osSuffix = runtime.GOOS
-	case "darwin":
-		osSuffix = "macosx"
-	default:
-		panic("Unsupported OS")
-	}
-}
-
-func Load(filepath string, logger i18n.Logger) (Map, error) {
-	bytes, err := ioutil.ReadFile(filepath)
-	if err != nil {
-		return nil, err
-	}
-
-	text := string(bytes)
-	text = strings.Replace(text, "\r\n", "\n", -1)
-	text = strings.Replace(text, "\r", "\n", -1)
-
-	properties := make(Map)
-
-	for _, line := range strings.Split(text, "\n") {
-		err := properties.loadSingleLine(line)
-		if err != nil {
-			return nil, i18n.ErrorfWithLogger(logger, constants.MSG_WRONG_PROPERTIES_FILE, line, filepath)
-		}
-	}
-
-	return properties, nil
-}
-
-func LoadFromSlice(lines []string, logger i18n.Logger) (Map, error) {
-	properties := make(Map)
-
-	for _, line := range lines {
-		err := properties.loadSingleLine(line)
-		if err != nil {
-			return nil, i18n.ErrorfWithLogger(logger, constants.MSG_WRONG_PROPERTIES, line)
-		}
-	}
-
-	return properties, nil
-}
-
-func (properties Map) loadSingleLine(line string) error {
-	line = strings.TrimSpace(line)
-
-	if len(line) > 0 && line[0] != '#' {
-		lineParts := strings.SplitN(line, "=", 2)
-		if len(lineParts) != 2 {
-			return errors.New("")
-		}
-		key := strings.TrimSpace(lineParts[0])
-		value := strings.TrimSpace(lineParts[1])
-
-		key = strings.Replace(key, "."+osSuffix, constants.EMPTY_STRING, 1)
-		properties[key] = value
-	}
-
-	return nil
-}
-
-func SafeLoad(filepath string, logger i18n.Logger) (Map, error) {
-	_, err := os.Stat(filepath)
-	if os.IsNotExist(err) {
-		return make(Map), nil
-	}
-
-	properties, err := Load(filepath, logger)
-	if err != nil {
-		return nil, i18n.WrapError(err)
-	}
-	return properties, nil
-}
-
-func (aMap Map) FirstLevelOf() map[string]Map {
-	newMap := make(map[string]Map)
-	for key, value := range aMap {
-		if strings.Index(key, ".") == -1 {
-			continue
-		}
-		keyParts := strings.SplitN(key, ".", 2)
-		if newMap[keyParts[0]] == nil {
-			newMap[keyParts[0]] = make(Map)
-		}
-		newMap[keyParts[0]][keyParts[1]] = value
-	}
-	return newMap
-}
-
-func (aMap Map) SubTree(key string) Map {
-	return aMap.FirstLevelOf()[key]
-}
-
-func (aMap Map) ExpandPropsInString(str string) string {
-	replaced := true
-	for i := 0; i < 10 && replaced; i++ {
-		replaced = false
-		for key, value := range aMap {
-			newStr := strings.Replace(str, "{"+key+"}", value, -1)
-			replaced = replaced || str != newStr
-			str = newStr
-		}
-	}
-	return str
-}
-
-func (target Map) Merge(sources ...Map) Map {
-	for _, source := range sources {
-		for key, value := range source {
-			target[key] = value
-		}
-	}
-	return target
-}
-
-func (aMap Map) Clone() Map {
-	newMap := make(Map)
-	newMap.Merge(aMap)
-	return newMap
-}
-
-func (aMap Map) Equals(anotherMap Map) bool {
-	return reflect.DeepEqual(aMap, anotherMap)
-}
-
-func MergeMapsOfProperties(target map[string]Map, sources ...map[string]Map) map[string]Map {
-	for _, source := range sources {
-		for key, value := range source {
-			target[key] = value
-		}
-	}
-	return target
-}
-
-func DeleteUnexpandedPropsFromString(str string) (string, error) {
-	rxp, err := regexp.Compile("\\{.+?\\}")
-	if err != nil {
-		return constants.EMPTY_STRING, i18n.WrapError(err)
-	}
-
-	return rxp.ReplaceAllString(str, constants.EMPTY_STRING), nil
-}
diff --git a/src/arduino.cc/properties/properties_test.go b/src/arduino.cc/properties/properties_test.go
deleted file mode 100644
index a967752d..00000000
--- a/src/arduino.cc/properties/properties_test.go
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * This file is part of Arduino Builder.
- *
- * Copyright 2016 Arduino LLC (http://www.arduino.cc/)
- *
- * Arduino Builder is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * As a special exception, you may use this file as part of a free software
- * library without restriction.  Specifically, if other files instantiate
- * templates or use macros or inline functions from this file, or you compile
- * this file and link it with other files to produce an executable, this
- * file does not by itself cause the resulting executable to be covered by
- * the GNU General Public License.  This exception does not however
- * invalidate any other reasons why the executable file might be covered by
- * the GNU General Public License.
- */
-
-package properties
-
-import (
-	"path/filepath"
-	"runtime"
-	"testing"
-
-	"arduino.cc/builder/i18n"
-	"github.com/stretchr/testify/require"
-)
-
-func TestPropertiesBoardsTxt(t *testing.T) {
-	p, err := Load(filepath.Join("testdata", "boards.txt"), i18n.HumanLogger{})
-
-	require.NoError(t, err)
-
-	require.Equal(t, "Processor", p["menu.cpu"])
-	require.Equal(t, "32256", p["ethernet.upload.maximum_size"])
-	require.Equal(t, "{build.usb_flags}", p["robotMotor.build.extra_flags"])
-
-	ethernet := p.SubTree("ethernet")
-	require.Equal(t, "Arduino Ethernet", ethernet["name"])
-}
-
-func TestPropertiesTestTxt(t *testing.T) {
-	p, err := Load(filepath.Join("testdata", "test.txt"), i18n.HumanLogger{})
-
-	require.NoError(t, err)
-
-	require.Equal(t, 4, len(p))
-	require.Equal(t, "value = 1", p["key"])
-
-	switch value := runtime.GOOS; value {
-	case "linux":
-		require.Equal(t, "is linux", p["which.os"])
-	case "windows":
-		require.Equal(t, "is windows", p["which.os"])
-	case "darwin":
-		require.Equal(t, "is macosx", p["which.os"])
-	default:
-		require.FailNow(t, "unsupported OS")
-	}
-}
-
-func TestExpandPropsInString(t *testing.T) {
-	aMap := make(Map)
-	aMap["key1"] = "42"
-	aMap["key2"] = "{key1}"
-
-	str := "{key1} == {key2} == true"
-
-	str = aMap.ExpandPropsInString(str)
-	require.Equal(t, "42 == 42 == true", str)
-}
-
-func TestExpandPropsInString2(t *testing.T) {
-	p := make(Map)
-	p["key2"] = "{key2}"
-	p["key1"] = "42"
-
-	str := "{key1} == {key2} == true"
-
-	str = p.ExpandPropsInString(str)
-	require.Equal(t, "42 == {key2} == true", str)
-}
-
-func TestDeleteUnexpandedPropsFromString(t *testing.T) {
-	p := make(Map)
-	p["key1"] = "42"
-	p["key2"] = "{key1}"
-
-	str := "{key1} == {key2} == {key3} == true"
-
-	str = p.ExpandPropsInString(str)
-	str, err := DeleteUnexpandedPropsFromString(str)
-	require.NoError(t, err)
-	require.Equal(t, "42 == 42 ==  == true", str)
-}
-
-func TestDeleteUnexpandedPropsFromString2(t *testing.T) {
-	p := make(Map)
-	p["key2"] = "42"
-
-	str := "{key1} == {key2} == {key3} == true"
-
-	str = p.ExpandPropsInString(str)
-	str, err := DeleteUnexpandedPropsFromString(str)
-	require.NoError(t, err)
-	require.Equal(t, " == 42 ==  == true", str)
-}
-
-func TestPropertiesRedBeearLabBoardsTxt(t *testing.T) {
-	p, err := Load(filepath.Join("testdata", "redbearlab_boards.txt"), i18n.HumanLogger{})
-
-	require.NoError(t, err)
-
-	require.Equal(t, 83, len(p))
-	require.Equal(t, "Blend", p["blend.name"])
-	require.Equal(t, "arduino:arduino", p["blend.build.core"])
-	require.Equal(t, "0x2404", p["blendmicro16.pid.0"])
-
-	ethernet := p.SubTree("blend")
-	require.Equal(t, "arduino:arduino", ethernet["build.core"])
-}
-
-func TestPropertiesBroken(t *testing.T) {
-	_, err := Load(filepath.Join("testdata", "broken.txt"), i18n.HumanLogger{})
-
-	require.Error(t, err)
-}
diff --git a/src/arduino.cc/properties/testdata/boards.txt b/src/arduino.cc/properties/testdata/boards.txt
deleted file mode 100644
index 07381e40..00000000
--- a/src/arduino.cc/properties/testdata/boards.txt
+++ /dev/null
@@ -1,737 +0,0 @@
-# See: http://code.google.com/p/arduino/wiki/Platforms
-
-menu.cpu=Processor
-
-##############################################################
-
-yun.name=Arduino Yún
-yun.upload.via_ssh=true
-
-yun.vid.0=0x2341
-yun.pid.0=0x0041
-yun.vid.1=0x2341
-yun.pid.1=0x8041
-yun.upload.tool=avrdude
-yun.upload.protocol=avr109
-yun.upload.maximum_size=28672
-yun.upload.maximum_data_size=2560
-yun.upload.speed=57600
-yun.upload.disable_flushing=true
-yun.upload.use_1200bps_touch=true
-yun.upload.wait_for_upload_port=true
-
-yun.bootloader.tool=avrdude
-yun.bootloader.low_fuses=0xff
-yun.bootloader.high_fuses=0xd8
-yun.bootloader.extended_fuses=0xfb
-yun.bootloader.file=caterina/Caterina-Yun.hex
-yun.bootloader.unlock_bits=0x3F
-yun.bootloader.lock_bits=0x2F
-
-yun.build.mcu=atmega32u4
-yun.build.f_cpu=16000000L
-yun.build.vid=0x2341
-yun.build.pid=0x8041
-yun.build.usb_product="Arduino Yun"
-yun.build.board=AVR_YUN
-yun.build.core=arduino
-yun.build.variant=yun
-yun.build.extra_flags={build.usb_flags}
-
-##############################################################
-
-uno.name=Arduino Uno
-
-uno.vid.0=0x2341
-uno.pid.0=0x0043
-uno.vid.1=0x2341
-uno.pid.1=0x0001
-
-uno.upload.tool=avrdude
-uno.upload.protocol=arduino
-uno.upload.maximum_size=32256
-uno.upload.maximum_data_size=2048
-uno.upload.speed=115200
-
-uno.bootloader.tool=avrdude
-uno.bootloader.low_fuses=0xFF
-uno.bootloader.high_fuses=0xDE
-uno.bootloader.extended_fuses=0x05
-uno.bootloader.unlock_bits=0x3F
-uno.bootloader.lock_bits=0x0F
-uno.bootloader.file=optiboot/optiboot_atmega328.hex
-
-uno.build.mcu=atmega328p
-uno.build.f_cpu=16000000L
-uno.build.board=AVR_UNO
-uno.build.core=arduino
-uno.build.variant=standard
-
-##############################################################
-
-diecimila.name=Arduino Duemilanove or Diecimila
-
-diecimila.upload.tool=avrdude
-diecimila.upload.protocol=arduino
-
-diecimila.bootloader.tool=avrdude
-diecimila.bootloader.low_fuses=0xFF
-diecimila.bootloader.unlock_bits=0x3F
-diecimila.bootloader.lock_bits=0x0F
-
-diecimila.build.f_cpu=16000000L
-diecimila.build.board=AVR_DUEMILANOVE
-diecimila.build.core=arduino
-diecimila.build.variant=standard
-
-## Arduino Duemilanove or Diecimila w/ ATmega328
-## ---------------------------------------------
-diecimila.menu.cpu.atmega328=ATmega328
-
-diecimila.menu.cpu.atmega328.upload.maximum_size=30720
-diecimila.menu.cpu.atmega328.upload.maximum_data_size=2048
-diecimila.menu.cpu.atmega328.upload.speed=57600
-
-diecimila.menu.cpu.atmega328.bootloader.high_fuses=0xDA
-diecimila.menu.cpu.atmega328.bootloader.extended_fuses=0x05
-diecimila.menu.cpu.atmega328.bootloader.file=atmega/ATmegaBOOT_168_atmega328.hex
-
-diecimila.menu.cpu.atmega328.build.mcu=atmega328p
-
-## Arduino Duemilanove or Diecimila w/ ATmega168
-## ---------------------------------------------
-diecimila.menu.cpu.atmega168=ATmega168
-
-diecimila.menu.cpu.atmega168.upload.maximum_size=14336
-diecimila.menu.cpu.atmega168.upload.maximum_data_size=1024
-diecimila.menu.cpu.atmega168.upload.speed=19200
-
-diecimila.menu.cpu.atmega168.bootloader.high_fuses=0xdd
-diecimila.menu.cpu.atmega168.bootloader.extended_fuses=0x00
-diecimila.menu.cpu.atmega168.bootloader.file=atmega/ATmegaBOOT_168_diecimila.hex
-
-diecimila.menu.cpu.atmega168.build.mcu=atmega168
-
-##############################################################
-
-nano.name=Arduino Nano
-
-nano.upload.tool=avrdude
-nano.upload.protocol=arduino
-
-nano.bootloader.tool=avrdude
-nano.bootloader.unlock_bits=0x3F
-nano.bootloader.lock_bits=0x0F
-
-nano.build.f_cpu=16000000L
-nano.build.board=AVR_NANO
-nano.build.core=arduino
-nano.build.variant=eightanaloginputs
-
-## Arduino Nano w/ ATmega328
-## -------------------------
-nano.menu.cpu.atmega328=ATmega328
-
-nano.menu.cpu.atmega328.upload.maximum_size=30720
-nano.menu.cpu.atmega328.upload.maximum_data_size=2048
-nano.menu.cpu.atmega328.upload.speed=57600
-
-nano.menu.cpu.atmega328.bootloader.low_fuses=0xFF
-nano.menu.cpu.atmega328.bootloader.high_fuses=0xDA
-nano.menu.cpu.atmega328.bootloader.extended_fuses=0x05
-nano.menu.cpu.atmega328.bootloader.file=atmega/ATmegaBOOT_168_atmega328.hex
-
-nano.menu.cpu.atmega328.build.mcu=atmega328p
-
-## Arduino Nano w/ ATmega168
-## -------------------------
-nano.menu.cpu.atmega168=ATmega168
-
-nano.menu.cpu.atmega168.upload.maximum_size=14336
-nano.menu.cpu.atmega168.upload.maximum_data_size=1024
-nano.menu.cpu.atmega168.upload.speed=19200
-
-nano.menu.cpu.atmega168.bootloader.low_fuses=0xff
-nano.menu.cpu.atmega168.bootloader.high_fuses=0xdd
-nano.menu.cpu.atmega168.bootloader.extended_fuses=0x00
-nano.menu.cpu.atmega168.bootloader.file=atmega/ATmegaBOOT_168_diecimila.hex
-
-nano.menu.cpu.atmega168.build.mcu=atmega168
-
-##############################################################
-
-mega.name=Arduino Mega or Mega 2560
-
-mega.vid.0=0x2341
-mega.pid.0=0x0010
-mega.vid.1=0x2341
-mega.pid.1=0x0042
-
-mega.upload.tool=avrdude
-mega.upload.maximum_data_size=8192
-
-mega.bootloader.tool=avrdude
-mega.bootloader.low_fuses=0xFF
-mega.bootloader.unlock_bits=0x3F
-mega.bootloader.lock_bits=0x0F
-
-mega.build.f_cpu=16000000L
-mega.build.core=arduino
-mega.build.variant=mega
-# default board  may be overridden by the cpu menu
-mega.build.board=AVR_MEGA2560
-
-## Arduino Mega w/ ATmega2560
-## -------------------------
-mega.menu.cpu.atmega2560=ATmega2560 (Mega 2560)
-
-mega.menu.cpu.atmega2560.upload.protocol=wiring
-mega.menu.cpu.atmega2560.upload.maximum_size=253952
-mega.menu.cpu.atmega2560.upload.speed=115200
-
-mega.menu.cpu.atmega2560.bootloader.high_fuses=0xD8
-mega.menu.cpu.atmega2560.bootloader.extended_fuses=0xFD
-mega.menu.cpu.atmega2560.bootloader.file=stk500v2/stk500boot_v2_mega2560.hex
-
-mega.menu.cpu.atmega2560.build.mcu=atmega2560
-mega.menu.cpu.atmega2560.build.board=AVR_MEGA2560
-
-## Arduino Mega w/ ATmega1280
-## -------------------------
-mega.menu.cpu.atmega1280=ATmega1280
-
-mega.menu.cpu.atmega1280.upload.protocol=arduino
-mega.menu.cpu.atmega1280.upload.maximum_size=126976
-mega.menu.cpu.atmega1280.upload.speed=57600
-
-mega.menu.cpu.atmega1280.bootloader.high_fuses=0xDA
-mega.menu.cpu.atmega1280.bootloader.extended_fuses=0xF5
-mega.menu.cpu.atmega1280.bootloader.file=atmega/ATmegaBOOT_168_atmega1280.hex
-
-mega.menu.cpu.atmega1280.build.mcu=atmega1280
-mega.menu.cpu.atmega1280.build.board=AVR_MEGA
-
-##############################################################
-
-megaADK.name=Arduino Mega ADK
-
-megaADK.vid.0=0x2341
-megaADK.pid.0=0x003f
-megaADK.vid.1=0x2341
-megaADK.pid.1=0x0044
-
-megaADK.upload.tool=avrdude
-megaADK.upload.protocol=wiring
-megaADK.upload.maximum_size=253952
-megaADK.upload.maximum_data_size=8192
-megaADK.upload.speed=115200
-
-megaADK.bootloader.tool=avrdude
-megaADK.bootloader.low_fuses=0xFF
-megaADK.bootloader.high_fuses=0xD8
-megaADK.bootloader.extended_fuses=0xFD
-megaADK.bootloader.file=stk500v2/stk500boot_v2_mega2560.hex
-megaADK.bootloader.unlock_bits=0x3F
-megaADK.bootloader.lock_bits=0x0F
-
-megaADK.build.mcu=atmega2560
-megaADK.build.f_cpu=16000000L
-megaADK.build.board=AVR_ADK
-megaADK.build.core=arduino
-megaADK.build.variant=mega
-
-##############################################################
-
-leonardo.name=Arduino Leonardo
-leonardo.vid.0=0x2341
-leonardo.pid.0=0x0036
-leonardo.vid.1=0x2341
-leonardo.pid.1=0x8036
-leonardo.upload.tool=avrdude
-leonardo.upload.protocol=avr109
-leonardo.upload.maximum_size=28672
-leonardo.upload.maximum_data_size=2560
-leonardo.upload.speed=57600
-leonardo.upload.disable_flushing=true
-leonardo.upload.use_1200bps_touch=true
-leonardo.upload.wait_for_upload_port=true
-
-leonardo.bootloader.tool=avrdude
-leonardo.bootloader.low_fuses=0xff
-leonardo.bootloader.high_fuses=0xd8
-leonardo.bootloader.extended_fuses=0xcb
-leonardo.bootloader.file=caterina/Caterina-Leonardo.hex
-leonardo.bootloader.unlock_bits=0x3F
-leonardo.bootloader.lock_bits=0x2F
-
-leonardo.build.mcu=atmega32u4
-leonardo.build.f_cpu=16000000L
-leonardo.build.vid=0x2341
-leonardo.build.pid=0x8036
-leonardo.build.usb_product="Arduino Leonardo"
-leonardo.build.board=AVR_LEONARDO
-leonardo.build.core=arduino
-leonardo.build.variant=leonardo
-leonardo.build.extra_flags={build.usb_flags}
-
-##############################################################
-
-micro.name=Arduino Micro
-micro.upload.tool=avrdude
-micro.upload.protocol=avr109
-micro.upload.maximum_size=28672
-micro.upload.maximum_data_size=2560
-micro.upload.speed=57600
-micro.upload.disable_flushing=true
-micro.upload.use_1200bps_touch=true
-micro.upload.wait_for_upload_port=true
-
-micro.bootloader.tool=avrdude
-micro.bootloader.low_fuses=0xff
-micro.bootloader.high_fuses=0xd8
-micro.bootloader.extended_fuses=0xcb
-micro.bootloader.file=caterina/Caterina-Micro.hex
-micro.bootloader.unlock_bits=0x3F
-micro.bootloader.lock_bits=0x2F
-
-micro.build.mcu=atmega32u4
-micro.build.f_cpu=16000000L
-micro.build.vid=0x2341
-micro.build.pid=0x8037
-micro.build.usb_product="Arduino Micro"
-micro.build.board=AVR_MICRO
-micro.build.core=arduino
-micro.build.variant=micro
-micro.build.extra_flags={build.usb_flags}
-
-##############################################################
-
-esplora.name=Arduino Esplora
-esplora.vid.0=0x2341
-esplora.pid.0=0x003c
-esplora.vid.1=0x2341
-esplora.pid.1=0x803c
-esplora.upload.tool=avrdude
-esplora.upload.protocol=avr109
-esplora.upload.maximum_size=28672
-esplora.upload.maximum_data_size=2560
-esplora.upload.speed=57600
-esplora.upload.disable_flushing=true
-esplora.upload.use_1200bps_touch=true
-esplora.upload.wait_for_upload_port=true
-
-esplora.bootloader.tool=avrdude
-esplora.bootloader.low_fuses=0xff
-esplora.bootloader.high_fuses=0xd8
-esplora.bootloader.extended_fuses=0xcb
-esplora.bootloader.file=caterina/Caterina-Esplora.hex
-esplora.bootloader.unlock_bits=0x3F
-esplora.bootloader.lock_bits=0x2F
-
-esplora.build.mcu=atmega32u4
-esplora.build.f_cpu=16000000L
-esplora.build.vid=0x2341
-esplora.build.pid=0x803c
-esplora.build.usb_product="Arduino Esplora"
-esplora.build.board=AVR_ESPLORA
-esplora.build.core=arduino
-esplora.build.variant=leonardo
-esplora.build.extra_flags={build.usb_flags}
-
-##############################################################
-
-mini.name=Arduino Mini
-
-mini.upload.tool=avrdude
-mini.upload.protocol=arduino
-
-mini.bootloader.tool=avrdude
-mini.bootloader.low_fuses=0xff
-mini.bootloader.unlock_bits=0x3F
-mini.bootloader.lock_bits=0x0F
-
-mini.build.f_cpu=16000000L
-mini.build.board=AVR_MINI
-mini.build.core=arduino
-mini.build.variant=eightanaloginputs
-
-## Arduino Mini w/ ATmega328
-## -------------------------
-mini.menu.cpu.atmega328=ATmega328
-
-mini.menu.cpu.atmega328.upload.maximum_size=28672
-mini.menu.cpu.atmega328.upload.maximum_data_size=2048
-mini.menu.cpu.atmega328.upload.speed=115200
-
-mini.menu.cpu.atmega328.bootloader.high_fuses=0xd8
-mini.menu.cpu.atmega328.bootloader.extended_fuses=0x05
-mini.menu.cpu.atmega328.bootloader.file=optiboot/optiboot_atmega328-Mini.hex
-
-mini.menu.cpu.atmega328.build.mcu=atmega328p
-
-## Arduino Mini w/ ATmega168
-## -------------------------
-mini.menu.cpu.atmega168=ATmega168
-
-mini.menu.cpu.atmega168.upload.maximum_size=14336
-mini.menu.cpu.atmega168.upload.maximum_data_size=1024
-mini.menu.cpu.atmega168.upload.speed=19200
-
-mini.menu.cpu.atmega168.bootloader.high_fuses=0xdd
-mini.menu.cpu.atmega168.bootloader.extended_fuses=0x00
-mini.menu.cpu.atmega168.bootloader.file=atmega/ATmegaBOOT_168_ng.hex
-
-mini.menu.cpu.atmega168.build.mcu=atmega168
-
-##############################################################
-
-ethernet.name=Arduino Ethernet
-
-ethernet.upload.tool=avrdude
-ethernet.upload.protocol=arduino
-ethernet.upload.maximum_size=32256
-ethernet.upload.maximum_data_size=2048
-ethernet.upload.speed=115200
-
-ethernet.bootloader.tool=avrdude
-ethernet.bootloader.low_fuses=0xff
-ethernet.bootloader.high_fuses=0xde
-ethernet.bootloader.extended_fuses=0x05
-ethernet.bootloader.file=optiboot/optiboot_atmega328.hex
-ethernet.bootloader.unlock_bits=0x3F
-ethernet.bootloader.lock_bits=0x0F
-
-ethernet.build.variant=ethernet
-ethernet.build.mcu=atmega328p
-ethernet.build.f_cpu=16000000L
-ethernet.build.board=AVR_ETHERNET
-ethernet.build.core=arduino
-
-##############################################################
-
-fio.name=Arduino Fio
-
-fio.upload.tool=avrdude
-fio.upload.protocol=arduino
-fio.upload.maximum_size=30720
-fio.upload.maximum_data_size=2048
-fio.upload.speed=57600
-
-fio.bootloader.tool=avrdude
-fio.bootloader.low_fuses=0xFF
-fio.bootloader.high_fuses=0xDA
-fio.bootloader.extended_fuses=0x05
-fio.bootloader.file=atmega/ATmegaBOOT_168_atmega328_pro_8MHz.hex
-fio.bootloader.unlock_bits=0x3F
-fio.bootloader.lock_bits=0x0F
-
-fio.build.mcu=atmega328p
-fio.build.f_cpu=8000000L
-fio.build.board=AVR_FIO
-fio.build.core=arduino
-fio.build.variant=eightanaloginputs
-
-##############################################################
-
-bt.name=Arduino BT
-
-bt.upload.tool=avrdude
-bt.upload.protocol=arduino
-bt.upload.speed=19200
-bt.upload.disable_flushing=true
-
-bt.bootloader.tool=avrdude
-bt.bootloader.low_fuses=0xff
-bt.bootloader.unlock_bits=0x3F
-bt.bootloader.lock_bits=0x0F
-
-bt.build.f_cpu=16000000L
-bt.build.board=AVR_BT
-bt.build.core=arduino
-bt.build.variant=eightanaloginputs
-
-## Arduino BT w/ ATmega328
-## -----------------------
-bt.menu.cpu.atmega328=ATmega328
-bt.menu.cpu.atmega328.upload.maximum_size=28672
-bt.menu.cpu.atmega328.upload.maximum_data_size=2048
-
-bt.menu.cpu.atmega328.bootloader.high_fuses=0xd8
-bt.menu.cpu.atmega328.bootloader.extended_fuses=0x05
-bt.menu.cpu.atmega328.bootloader.file=bt/ATmegaBOOT_168_atmega328_bt.hex
-
-bt.menu.cpu.atmega328.build.mcu=atmega328p
-
-## Arduino BT w/ ATmega168
-## -----------------------
-bt.menu.cpu.atmega168=ATmega168
-bt.menu.cpu.atmega168.upload.maximum_size=14336
-bt.menu.cpu.atmega168.upload.maximum_data_size=1024
-
-bt.menu.cpu.atmega168.bootloader.high_fuses=0xdd
-bt.menu.cpu.atmega168.bootloader.extended_fuses=0x00
-bt.menu.cpu.atmega168.bootloader.file=bt/ATmegaBOOT_168.hex
-
-bt.menu.cpu.atmega168.build.mcu=atmega168
-
-##############################################################
-
-LilyPadUSB.name=LilyPad Arduino USB
-
-LilyPadUSB.upload.tool=avrdude
-LilyPadUSB.upload.protocol=avr109
-LilyPadUSB.upload.maximum_size=28672
-LilyPadUSB.upload.maximum_data_size=2560
-LilyPadUSB.upload.speed=57600
-LilyPadUSB.upload.disable_flushing=true
-LilyPadUSB.upload.use_1200bps_touch=true
-LilyPadUSB.upload.wait_for_upload_port=true
-
-LilyPadUSB.bootloader.tool=avrdude
-LilyPadUSB.bootloader.low_fuses=0xff
-LilyPadUSB.bootloader.high_fuses=0xd8
-LilyPadUSB.bootloader.extended_fuses=0xce
-LilyPadUSB.bootloader.file=caterina-LilyPadUSB/Caterina-LilyPadUSB.hex
-LilyPadUSB.bootloader.unlock_bits=0x3F
-LilyPadUSB.bootloader.lock_bits=0x2F
-
-LilyPadUSB.build.mcu=atmega32u4
-LilyPadUSB.build.f_cpu=8000000L
-LilyPadUSB.build.vid=0x1B4F
-LilyPadUSB.build.pid=0x9208
-LilyPadUSB.build.usb_product="LilyPad USB"
-LilyPadUSB.build.board=AVR_LILYPAD_USB
-LilyPadUSB.build.core=arduino
-LilyPadUSB.build.variant=leonardo
-LilyPadUSB.build.extra_flags={build.usb_flags}
-
-##############################################################
-
-lilypad.name=LilyPad Arduino
-
-lilypad.upload.tool=avrdude
-lilypad.upload.protocol=arduino
-
-lilypad.bootloader.tool=avrdude
-lilypad.bootloader.unlock_bits=0x3F
-lilypad.bootloader.lock_bits=0x0F
-
-lilypad.build.f_cpu=8000000L
-lilypad.build.board=AVR_LILYPAD
-lilypad.build.core=arduino
-lilypad.build.variant=standard
-
-## LilyPad Arduino w/ ATmega328
-## ----------------------------
-lilypad.menu.cpu.atmega328=ATmega328
-
-lilypad.menu.cpu.atmega328.upload.maximum_size=30720
-lilypad.menu.cpu.atmega328.upload.maximum_data_size=2048
-lilypad.menu.cpu.atmega328.upload.speed=57600
-
-lilypad.menu.cpu.atmega328.bootloader.low_fuses=0xFF
-lilypad.menu.cpu.atmega328.bootloader.high_fuses=0xDA
-lilypad.menu.cpu.atmega328.bootloader.extended_fuses=0x05
-lilypad.menu.cpu.atmega328.bootloader.file=atmega/ATmegaBOOT_168_atmega328_pro_8MHz.hex
-
-lilypad.menu.cpu.atmega328.build.mcu=atmega328p
-
-## LilyPad Arduino w/ ATmega168
-## ----------------------------
-lilypad.menu.cpu.atmega168=ATmega168
-
-lilypad.menu.cpu.atmega168.upload.maximum_size=14336
-lilypad.menu.cpu.atmega168.upload.maximum_data_size=1024
-lilypad.menu.cpu.atmega168.upload.speed=19200
-
-lilypad.menu.cpu.atmega168.bootloader.low_fuses=0xe2
-lilypad.menu.cpu.atmega168.bootloader.high_fuses=0xdd
-lilypad.menu.cpu.atmega168.bootloader.extended_fuses=0x00
-lilypad.menu.cpu.atmega168.bootloader.file=lilypad/LilyPadBOOT_168.hex
-
-lilypad.menu.cpu.atmega168.build.mcu=atmega168
-
-##############################################################
-
-pro.name=Arduino Pro or Pro Mini
-
-pro.upload.tool=avrdude
-pro.upload.protocol=arduino
-
-pro.bootloader.tool=avrdude
-pro.bootloader.unlock_bits=0x3F
-pro.bootloader.lock_bits=0x0F
-
-pro.build.board=AVR_PRO
-pro.build.core=arduino
-pro.build.variant=eightanaloginputs
-
-## Arduino Pro or Pro Mini (5V, 16 MHz) w/ ATmega328
-## -------------------------------------------------
-pro.menu.cpu.16MHzatmega328=ATmega328 (5V, 16 MHz)
-
-pro.menu.cpu.16MHzatmega328.upload.maximum_size=30720
-pro.menu.cpu.16MHzatmega328.upload.maximum_data_size=2048
-pro.menu.cpu.16MHzatmega328.upload.speed=57600
-
-pro.menu.cpu.16MHzatmega328.bootloader.low_fuses=0xFF
-pro.menu.cpu.16MHzatmega328.bootloader.high_fuses=0xDA
-pro.menu.cpu.16MHzatmega328.bootloader.extended_fuses=0x05
-pro.menu.cpu.16MHzatmega328.bootloader.file=atmega/ATmegaBOOT_168_atmega328.hex
-
-pro.menu.cpu.16MHzatmega328.build.mcu=atmega328p
-pro.menu.cpu.16MHzatmega328.build.f_cpu=16000000L
-
-## Arduino Pro or Pro Mini (3.3V, 8 MHz) w/ ATmega328
-## --------------------------------------------------
-pro.menu.cpu.8MHzatmega328=ATmega328 (3.3V, 8 MHz)
-
-pro.menu.cpu.8MHzatmega328.upload.maximum_size=30720
-pro.menu.cpu.8MHzatmega328.upload.maximum_data_size=2048
-pro.menu.cpu.8MHzatmega328.upload.speed=57600
-
-pro.menu.cpu.8MHzatmega328.bootloader.low_fuses=0xFF
-pro.menu.cpu.8MHzatmega328.bootloader.high_fuses=0xDA
-pro.menu.cpu.8MHzatmega328.bootloader.extended_fuses=0x05
-pro.menu.cpu.8MHzatmega328.bootloader.file=atmega/ATmegaBOOT_168_atmega328_pro_8MHz.hex
-
-pro.menu.cpu.8MHzatmega328.build.mcu=atmega328p
-pro.menu.cpu.8MHzatmega328.build.f_cpu=8000000L
-
-## Arduino Pro or Pro Mini (5V, 16 MHz) w/ ATmega168
-## -------------------------------------------------
-pro.menu.cpu.16MHzatmega168=ATmega168 (5V, 16 MHz)
-
-pro.menu.cpu.16MHzatmega168.upload.maximum_size=14336
-pro.menu.cpu.16MHzatmega168.upload.maximum_data_size=1024
-pro.menu.cpu.16MHzatmega168.upload.speed=19200
-
-pro.menu.cpu.16MHzatmega168.bootloader.low_fuses=0xff
-pro.menu.cpu.16MHzatmega168.bootloader.high_fuses=0xdd
-pro.menu.cpu.16MHzatmega168.bootloader.extended_fuses=0x00
-pro.menu.cpu.16MHzatmega168.bootloader.file=atmega/ATmegaBOOT_168_diecimila.hex
-
-pro.menu.cpu.16MHzatmega168.build.mcu=atmega168
-pro.menu.cpu.16MHzatmega168.build.f_cpu=16000000L
-
-## Arduino Pro or Pro Mini (3.3V, 8 MHz) w/ ATmega168
-## --------------------------------------------------
-pro.menu.cpu.8MHzatmega168=ATmega168 (3.3V, 8 MHz)
-
-pro.menu.cpu.8MHzatmega168.upload.maximum_size=14336
-pro.menu.cpu.8MHzatmega168.upload.maximum_data_size=1024
-pro.menu.cpu.8MHzatmega168.upload.speed=19200
-
-pro.menu.cpu.8MHzatmega168.bootloader.low_fuses=0xc6
-pro.menu.cpu.8MHzatmega168.bootloader.high_fuses=0xdd
-pro.menu.cpu.8MHzatmega168.bootloader.extended_fuses=0x00
-pro.menu.cpu.8MHzatmega168.bootloader.file=atmega/ATmegaBOOT_168_pro_8MHz.hex
-
-pro.menu.cpu.8MHzatmega168.build.mcu=atmega168
-pro.menu.cpu.8MHzatmega168.build.f_cpu=8000000L
-
-##############################################################
-
-atmegang.name=Arduino NG or older
-
-atmegang.upload.tool=avrdude
-atmegang.upload.protocol=arduino
-atmegang.upload.speed=19200
-
-atmegang.bootloader.tool=avrdude
-atmegang.bootloader.unlock_bits=0x3F
-atmegang.bootloader.lock_bits=0x0F
-
-atmegang.build.mcu=atmegang
-atmegang.build.f_cpu=16000000L
-atmegang.build.board=AVR_NG
-atmegang.build.core=arduino
-atmegang.build.variant=standard
-
-## Arduino NG or older w/ ATmega168
-## --------------------------------
-atmegang.menu.cpu.atmega168=ATmega168
-
-atmegang.menu.cpu.atmega168.upload.maximum_size=14336
-atmegang.menu.cpu.atmega168.upload.maximum_data_size=1024
-
-atmegang.menu.cpu.atmega168.bootloader.low_fuses=0xff
-atmegang.menu.cpu.atmega168.bootloader.high_fuses=0xdd
-atmegang.menu.cpu.atmega168.bootloader.extended_fuses=0x00
-atmegang.menu.cpu.atmega168.bootloader.file=atmega/ATmegaBOOT_168_ng.hex
-
-atmegang.menu.cpu.atmega168.build.mcu=atmega168
-
-## Arduino NG or older w/ ATmega8
-## ------------------------------
-atmegang.menu.cpu.atmega8=ATmega8
-
-atmegang.menu.cpu.atmega8.upload.maximum_size=7168
-atmegang.menu.cpu.atmega8.upload.maximum_data_size=1024
-
-atmegang.menu.cpu.atmega8.bootloader.low_fuses=0xdf
-atmegang.menu.cpu.atmega8.bootloader.high_fuses=0xca
-atmegang.menu.cpu.atmega8.bootloader.file=atmega8/ATmegaBOOT-prod-firmware-2009-11-07.hex
-
-atmegang.menu.cpu.atmega8.build.mcu=atmega8
-
-##############################################################
-
-robotControl.name=Arduino Robot Control
-robotControl.upload.tool=avrdude
-robotControl.upload.protocol=avr109
-robotControl.upload.maximum_size=28672
-robotControl.upload.maximum_data_size=2560
-robotControl.upload.speed=57600
-robotControl.upload.disable_flushing=true
-robotControl.upload.use_1200bps_touch=true
-robotControl.upload.wait_for_upload_port=true
-
-robotControl.bootloader.tool=avrdude
-robotControl.bootloader.low_fuses=0xff
-robotControl.bootloader.high_fuses=0xd8
-robotControl.bootloader.extended_fuses=0xcb
-robotControl.bootloader.file=caterina-Arduino_Robot/Caterina-Robot-Control.hex
-robotControl.bootloader.unlock_bits=0x3F
-robotControl.bootloader.lock_bits=0x2F
-
-robotControl.build.mcu=atmega32u4
-robotControl.build.f_cpu=16000000L
-robotControl.build.vid=0x2341
-robotControl.build.pid=0x8038
-robotControl.build.usb_product="Robot Control"
-robotControl.build.board=AVR_ROBOT_CONTROL
-robotControl.build.core=arduino
-robotControl.build.variant=robot_control
-robotControl.build.extra_flags={build.usb_flags}
-
-##############################################################
-
-robotMotor.name=Arduino Robot Motor
-robotMotor.upload.tool=avrdude
-robotMotor.upload.protocol=avr109
-robotMotor.upload.maximum_size=28672
-robotMotor.upload.maximum_data_size=2560
-robotMotor.upload.speed=57600
-robotMotor.upload.disable_flushing=true
-robotMotor.upload.use_1200bps_touch=true
-robotMotor.upload.wait_for_upload_port=true
-
-robotMotor.bootloader.tool=avrdude
-robotMotor.bootloader.low_fuses=0xff
-robotMotor.bootloader.high_fuses=0xd8
-robotMotor.bootloader.extended_fuses=0xcb
-robotMotor.bootloader.file=caterina-Arduino_Robot/Caterina-Robot-Motor.hex
-robotMotor.bootloader.unlock_bits=0x3F
-robotMotor.bootloader.lock_bits=0x2F
-
-robotMotor.build.mcu=atmega32u4
-robotMotor.build.f_cpu=16000000L
-robotMotor.build.vid=0x2341
-robotMotor.build.pid=0x8039
-robotMotor.build.usb_product="Robot Motor"
-robotMotor.build.board=AVR_ROBOT_MOTOR
-robotMotor.build.core=arduino
-robotMotor.build.variant=robot_motor
-robotMotor.build.extra_flags={build.usb_flags}
-
diff --git a/src/arduino.cc/properties/testdata/broken.txt b/src/arduino.cc/properties/testdata/broken.txt
deleted file mode 100644
index 7c7b31aa..00000000
--- a/src/arduino.cc/properties/testdata/broken.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-key=value
-brokenkey value
\ No newline at end of file
diff --git a/src/arduino.cc/properties/testdata/redbearlab_boards.txt b/src/arduino.cc/properties/testdata/redbearlab_boards.txt
deleted file mode 100644
index 59c946c7..00000000
--- a/src/arduino.cc/properties/testdata/redbearlab_boards.txt
+++ /dev/null
@@ -1,88 +0,0 @@
-# RedBearLab Blend Boards Configuration
-#
-# For more information see:
-# - https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5---3rd-party-Hardware-specification
-# - https://github.com/arduino/Arduino/wiki/Arduino-Hardware-Cores-migration-guide-from-1.0-to-1.6
-#
-
-##############################################################
-
-blend.name=Blend
blend.bootloader.low_fuses=0xff
blend.bootloader.high_fuses=0xd8
blend.bootloader.extended_fuses=0xcb
blend.bootloader.file=caterina/Caterina-Blend.hex
blend.bootloader.unlock_bits=0x3F
blend.bootloader.lock_bits=0x2F
-blend.bootloader.tool=arduino:avrdude
blend.build.mcu=atmega32u4
blend.build.f_cpu=16000000L
blend.build.vid=0x2341
blend.build.pid=0x8036
blend.build.core=arduino:arduino
blend.build.variant=Blend
-blend.build.board=BLEND
-blend.build.usb_product="Blend"
-blend.build.usb_manufacturer="RedBearLab"
-blend.build.extra_flags={build.usb_flags}
-blend.upload.protocol=avr109
-blend.upload.maximum_size=28672
-blend.upload.speed=57600
-blend.upload.disable_flushing=true
-blend.upload.use_1200bps_touch=true
-blend.upload.wait_for_upload_port=true
-blend.upload.tool=arduino:avrdude
-blend.vid.0=0x2341
-blend.pid.0=0x0036
-blend.vid.1=0x2341
-blend.pid.1=0x8036
-
-##############################################################
-
-blendmicro8.name=Blend Micro 3.3V/8MHz
-blendmicro8.bootloader.low_fuses=0xff
-blendmicro8.bootloader.high_fuses=0xd8
-blendmicro8.bootloader.extended_fuses=0xcf
-blendmicro8.bootloader.file=caterina/Caterina-BlendMicro.hex
-blendmicro8.bootloader.unlock_bits=0x3F
-blendmicro8.bootloader.lock_bits=0x2F
-blendmicro8.bootloader.tool=arduino:avrdude
-blendmicro8.build.mcu=atmega32u4
-blendmicro8.build.f_cpu=8000000L
-blendmicro8.build.vid=0x03EB
-blendmicro8.build.pid=0x2404
-blendmicro8.build.core=arduino:arduino
-blendmicro8.build.variant=BlendMicro-8MHz
-blendmicro8.build.board=BLEND_MICRO_8MHZ
-blendmicro8.build.usb_product="BlendMicro 8MHz"
-blendmicro8.build.usb_manufacturer="RedBearLab"
-blendmicro8.build.extra_flags={build.usb_flags}
-blendmicro8.upload.protocol=avr109
-blendmicro8.upload.maximum_size=28672
-blendmicro8.upload.speed=57600
-blendmicro8.upload.disable_flushing=true
-blendmicro8.upload.use_1200bps_touch=true
-blendmicro8.upload.wait_for_upload_port=true
-blendmicro8.upload.tool=arduino:avrdude
-blendmicro8.vid.0=0x03EB
-blendmicro8.pid.0=0x2404
-
-##############################################################
-
-blendmicro16.name=Blend Micro 3.3V/16MHz (overclock)
-blendmicro16.bootloader.low_fuses=0xff
-blendmicro16.bootloader.high_fuses=0xd8
-blendmicro16.bootloader.extended_fuses=0xcf
-blendmicro16.bootloader.file=caterina/Caterina-BlendMicro.hex
-blendmicro16.bootloader.unlock_bits=0x3F
-blendmicro16.bootloader.lock_bits=0x2F
-blendmicro16.bootloader.tool=arduino:avrdude
-blendmicro16.build.mcu=atmega32u4
-blendmicro16.build.f_cpu=16000000L
-blendmicro16.build.vid=0x03EB
-blendmicro16.build.pid=0x2404
-blendmicro16.build.core=arduino:arduino
-blendmicro16.build.variant=BlendMicro-16MHz
-blendmicro16.build.board=BLEND_MICRO_16MHZ
-blendmicro16.build.usb_product="BlendMicro 16MHz"
-blendmicro16.build.usb_manufacturer="RedBearLab"
-blendmicro16.build.extra_flags={build.usb_flags}
-blendmicro16.upload.protocol=avr109
-blendmicro16.upload.maximum_size=28672
-blendmicro16.upload.speed=57600
-blendmicro16.upload.disable_flushing=true
-blendmicro16.upload.use_1200bps_touch=true
-blendmicro16.upload.wait_for_upload_port=true
-blendmicro16.upload.tool=arduino:avrdude
-blendmicro16.vid.0=0x03EB
-blendmicro16.pid.0=0x2404
-
-##############################################################
diff --git a/src/arduino.cc/properties/testdata/test.txt b/src/arduino.cc/properties/testdata/test.txt
deleted file mode 100644
index af503967..00000000
--- a/src/arduino.cc/properties/testdata/test.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-    # comment
-
-    key   = value = 1
-
-which.os=dunno
-which.os.linux=is linux
-which.os.macosx=is macosx
-which.os.windows=is windows
diff --git a/src/arduino.cc/timeutils/time.go b/src/arduino.cc/timeutils/time.go
deleted file mode 100644
index 6503ee0b..00000000
--- a/src/arduino.cc/timeutils/time.go
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * This file is part of Arduino Builder.
- *
- * Copyright 2016 Arduino LLC (http://www.arduino.cc/)
- *
- * Arduino Builder is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * As a special exception, you may use this file as part of a free software
- * library without restriction.  Specifically, if other files instantiate
- * templates or use macros or inline functions from this file, or you compile
- * this file and link it with other files to produce an executable, this
- * file does not by itself cause the resulting executable to be covered by
- * the GNU General Public License.  This exception does not however
- * invalidate any other reasons why the executable file might be covered by
- * the GNU General Public License.
- */
-
-package timeutils
-
-import "time"
-
-// TimezoneOffsetNoDST returns the timezone offset without the DST component
-func TimezoneOffsetNoDST(t time.Time) int {
-	_, winterOffset := time.Date(t.Year(), 1, 1, 0, 0, 0, 0, t.Location()).Zone()
-	_, summerOffset := time.Date(t.Year(), 7, 1, 0, 0, 0, 0, t.Location()).Zone()
-	if winterOffset > summerOffset {
-		winterOffset, summerOffset = summerOffset, winterOffset
-	}
-	return winterOffset
-}
-
-// DaylightSavingsOffset returns the DST offset of the specified time
-func DaylightSavingsOffset(t time.Time) int {
-	_, offset := t.Zone()
-	return offset - TimezoneOffsetNoDST(t)
-}
-
-// LocalUnix returns the unix timestamp of the specified time with the
-// local timezone offset and DST added
-func LocalUnix(t time.Time) int64 {
-	_, offset := t.Zone()
-	return t.Unix() + int64(offset)
-}
diff --git a/src/arduino.cc/timeutils/time_test.go b/src/arduino.cc/timeutils/time_test.go
deleted file mode 100644
index 363f7bce..00000000
--- a/src/arduino.cc/timeutils/time_test.go
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * This file is part of Arduino Builder.
- *
- * Copyright 2016 Arduino LLC (http://www.arduino.cc/)
- *
- * Arduino Builder is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * As a special exception, you may use this file as part of a free software
- * library without restriction.  Specifically, if other files instantiate
- * templates or use macros or inline functions from this file, or you compile
- * this file and link it with other files to produce an executable, this
- * file does not by itself cause the resulting executable to be covered by
- * the GNU General Public License.  This exception does not however
- * invalidate any other reasons why the executable file might be covered by
- * the GNU General Public License.
- */
-
-package timeutils
-
-import (
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/require"
-)
-
-func TestTime(t *testing.T) {
-	cet, err := time.LoadLocation("CET")
-	require.NoError(t, err)
-	ast, err := time.LoadLocation("Australia/Sydney")
-	require.NoError(t, err)
-
-	firstJanuary2015CET := time.Date(2015, 1, 1, 0, 0, 0, 0, cet)
-	require.Equal(t, int64(1420066800), firstJanuary2015CET.Unix())
-	require.Equal(t, int64(1420066800+3600), LocalUnix(firstJanuary2015CET))
-	require.Equal(t, 3600, TimezoneOffsetNoDST(firstJanuary2015CET))
-	require.Equal(t, 0, DaylightSavingsOffset(firstJanuary2015CET))
-
-	fall2015CET := time.Date(2015, 9, 23, 0, 0, 0, 0, cet)
-	require.Equal(t, int64(1442959200), fall2015CET.Unix())
-	require.Equal(t, int64(1442959200+3600+3600), LocalUnix(fall2015CET))
-	require.Equal(t, 3600, TimezoneOffsetNoDST(fall2015CET))
-	require.Equal(t, 3600, DaylightSavingsOffset(fall2015CET))
-
-	firstJan2015AST := time.Date(2015, 1, 1, 0, 0, 0, 0, ast)
-	require.Equal(t, int64(1420030800), firstJan2015AST.Unix())
-	require.Equal(t, int64(1420030800+36000+3600), LocalUnix(firstJan2015AST))
-	require.Equal(t, 36000, TimezoneOffsetNoDST(firstJan2015AST))
-	require.Equal(t, 3600, DaylightSavingsOffset(firstJan2015AST))
-
-	fall2015AST := time.Date(2015, 9, 23, 0, 0, 0, 0, ast)
-	require.Equal(t, int64(1442930400), fall2015AST.Unix())
-	require.Equal(t, int64(1442930400+36000), LocalUnix(fall2015AST))
-	require.Equal(t, 36000, TimezoneOffsetNoDST(fall2015AST))
-	require.Equal(t, 0, DaylightSavingsOffset(fall2015AST))
-}
diff --git a/src/arduino.cc/builder/store_build_options_map.go b/store_build_options_map.go
similarity index 92%
rename from src/arduino.cc/builder/store_build_options_map.go
rename to store_build_options_map.go
index a318e77f..dc0c3220 100644
--- a/src/arduino.cc/builder/store_build_options_map.go
+++ b/store_build_options_map.go
@@ -30,9 +30,9 @@
 package builder
 
 import (
-	"arduino.cc/builder/constants"
-	"arduino.cc/builder/types"
-	"arduino.cc/builder/utils"
+	"github.com/arduino/arduino-builder/constants"
+	"github.com/arduino/arduino-builder/types"
+	"github.com/arduino/arduino-builder/utils"
 	"path/filepath"
 )
 
diff --git a/src/arduino.cc/builder/target_board_resolver.go b/target_board_resolver.go
similarity index 96%
rename from src/arduino.cc/builder/target_board_resolver.go
rename to target_board_resolver.go
index 0484c3c9..4c6d15e0 100644
--- a/src/arduino.cc/builder/target_board_resolver.go
+++ b/target_board_resolver.go
@@ -30,10 +30,10 @@
 package builder
 
 import (
-	"arduino.cc/builder/constants"
-	"arduino.cc/builder/i18n"
-	"arduino.cc/builder/types"
-	"arduino.cc/builder/utils"
+	"github.com/arduino/arduino-builder/constants"
+	"github.com/arduino/arduino-builder/i18n"
+	"github.com/arduino/arduino-builder/types"
+	"github.com/arduino/arduino-builder/utils"
 	"strings"
 )
 
diff --git a/src/arduino.cc/builder/test/.gitignore b/test/.gitignore
similarity index 100%
rename from src/arduino.cc/builder/test/.gitignore
rename to test/.gitignore
diff --git a/src/arduino.cc/builder/test/add_additional_entries_to_context_test.go b/test/add_additional_entries_to_context_test.go
similarity index 95%
rename from src/arduino.cc/builder/test/add_additional_entries_to_context_test.go
rename to test/add_additional_entries_to_context_test.go
index 3bb057d4..daf31135 100644
--- a/src/arduino.cc/builder/test/add_additional_entries_to_context_test.go
+++ b/test/add_additional_entries_to_context_test.go
@@ -30,9 +30,9 @@
 package test
 
 import (
-	"arduino.cc/builder"
-	"arduino.cc/builder/constants"
-	"arduino.cc/builder/types"
+	"github.com/arduino/arduino-builder"
+	"github.com/arduino/arduino-builder/constants"
+	"github.com/arduino/arduino-builder/types"
 	"github.com/stretchr/testify/require"
 	"path/filepath"
 	"testing"
diff --git a/src/arduino.cc/builder/test/add_build_board_property_if_missing_test.go b/test/add_build_board_property_if_missing_test.go
similarity index 96%
rename from src/arduino.cc/builder/test/add_build_board_property_if_missing_test.go
rename to test/add_build_board_property_if_missing_test.go
index 5dc58fef..34f74b51 100644
--- a/src/arduino.cc/builder/test/add_build_board_property_if_missing_test.go
+++ b/test/add_build_board_property_if_missing_test.go
@@ -30,9 +30,9 @@
 package test
 
 import (
-	"arduino.cc/builder"
-	"arduino.cc/builder/constants"
-	"arduino.cc/builder/types"
+	"github.com/arduino/arduino-builder"
+	"github.com/arduino/arduino-builder/constants"
+	"github.com/arduino/arduino-builder/types"
 	"github.com/stretchr/testify/require"
 	"path/filepath"
 	"testing"
diff --git a/src/arduino.cc/builder/test/additional_sketch_files_copier_test.go b/test/additional_sketch_files_copier_test.go
similarity index 95%
rename from src/arduino.cc/builder/test/additional_sketch_files_copier_test.go
rename to test/additional_sketch_files_copier_test.go
index c7b1ede3..1a138fd0 100644
--- a/src/arduino.cc/builder/test/additional_sketch_files_copier_test.go
+++ b/test/additional_sketch_files_copier_test.go
@@ -30,10 +30,10 @@
 package test
 
 import (
-	"arduino.cc/builder"
-	"arduino.cc/builder/constants"
-	"arduino.cc/builder/gohasissues"
-	"arduino.cc/builder/types"
+	"github.com/arduino/arduino-builder"
+	"github.com/arduino/arduino-builder/constants"
+	"github.com/arduino/arduino-builder/gohasissues"
+	"github.com/arduino/arduino-builder/types"
 	"github.com/stretchr/testify/require"
 	"os"
 	"path/filepath"
diff --git a/src/arduino.cc/builder/test/builder_test.go b/test/builder_test.go
similarity index 98%
rename from src/arduino.cc/builder/test/builder_test.go
rename to test/builder_test.go
index bfcc7edd..da51844e 100644
--- a/src/arduino.cc/builder/test/builder_test.go
+++ b/test/builder_test.go
@@ -36,10 +36,10 @@ import (
 	"testing"
 	"time"
 
-	"arduino.cc/builder"
-	"arduino.cc/builder/builder_utils"
-	"arduino.cc/builder/constants"
-	"arduino.cc/builder/types"
+	"github.com/arduino/arduino-builder"
+	"github.com/arduino/arduino-builder/builder_utils"
+	"github.com/arduino/arduino-builder/constants"
+	"github.com/arduino/arduino-builder/types"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/src/arduino.cc/builder/test/builder_utils_test.go b/test/builder_utils_test.go
similarity index 97%
rename from src/arduino.cc/builder/test/builder_utils_test.go
rename to test/builder_utils_test.go
index dcb85509..c6fc941c 100644
--- a/src/arduino.cc/builder/test/builder_utils_test.go
+++ b/test/builder_utils_test.go
@@ -30,8 +30,8 @@
 package test
 
 import (
-	"arduino.cc/builder/builder_utils"
-	"arduino.cc/builder/utils"
+	"github.com/arduino/arduino-builder/builder_utils"
+	"github.com/arduino/arduino-builder/utils"
 	"github.com/stretchr/testify/require"
 	"io/ioutil"
 	"os"
diff --git a/src/arduino.cc/builder/test/create_build_options_map_test.go b/test/create_build_options_map_test.go
similarity index 96%
rename from src/arduino.cc/builder/test/create_build_options_map_test.go
rename to test/create_build_options_map_test.go
index f129025c..dce062e8 100644
--- a/src/arduino.cc/builder/test/create_build_options_map_test.go
+++ b/test/create_build_options_map_test.go
@@ -30,8 +30,8 @@
 package test
 
 import (
-	"arduino.cc/builder"
-	"arduino.cc/builder/types"
+	"github.com/arduino/arduino-builder"
+	"github.com/arduino/arduino-builder/types"
 	"github.com/stretchr/testify/require"
 	"testing"
 )
diff --git a/src/arduino.cc/builder/test/ctags_runner_test.go b/test/ctags_runner_test.go
similarity index 98%
rename from src/arduino.cc/builder/test/ctags_runner_test.go
rename to test/ctags_runner_test.go
index b090df0a..ddd56dc7 100644
--- a/src/arduino.cc/builder/test/ctags_runner_test.go
+++ b/test/ctags_runner_test.go
@@ -35,9 +35,9 @@ import (
 	"strings"
 	"testing"
 
-	"arduino.cc/builder"
-	"arduino.cc/builder/constants"
-	"arduino.cc/builder/types"
+	"github.com/arduino/arduino-builder"
+	"github.com/arduino/arduino-builder/constants"
+	"github.com/arduino/arduino-builder/types"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/src/arduino.cc/builder/test/dependent_libraries/library1/library1.h b/test/dependent_libraries/library1/library1.h
similarity index 100%
rename from src/arduino.cc/builder/test/dependent_libraries/library1/library1.h
rename to test/dependent_libraries/library1/library1.h
diff --git a/src/arduino.cc/builder/test/dependent_libraries/library2/library2.h b/test/dependent_libraries/library2/library2.h
similarity index 100%
rename from src/arduino.cc/builder/test/dependent_libraries/library2/library2.h
rename to test/dependent_libraries/library2/library2.h
diff --git a/src/arduino.cc/builder/test/dependent_libraries/library3/library3.cpp b/test/dependent_libraries/library3/library3.cpp
similarity index 100%
rename from src/arduino.cc/builder/test/dependent_libraries/library3/library3.cpp
rename to test/dependent_libraries/library3/library3.cpp
diff --git a/src/arduino.cc/builder/test/dependent_libraries/library3/library3.h b/test/dependent_libraries/library3/library3.h
similarity index 100%
rename from src/arduino.cc/builder/test/dependent_libraries/library3/library3.h
rename to test/dependent_libraries/library3/library3.h
diff --git a/src/arduino.cc/builder/test/dependent_libraries/library4/library4.h b/test/dependent_libraries/library4/library4.h
similarity index 100%
rename from src/arduino.cc/builder/test/dependent_libraries/library4/library4.h
rename to test/dependent_libraries/library4/library4.h
diff --git a/src/arduino.cc/builder/test/eol_processing/sketch.ino b/test/eol_processing/sketch.ino
similarity index 100%
rename from src/arduino.cc/builder/test/eol_processing/sketch.ino
rename to test/eol_processing/sketch.ino
diff --git a/src/arduino.cc/builder/test/fail_if_buildpath_equals_sketchpath_test.go b/test/fail_if_buildpath_equals_sketchpath_test.go
similarity index 96%
rename from src/arduino.cc/builder/test/fail_if_buildpath_equals_sketchpath_test.go
rename to test/fail_if_buildpath_equals_sketchpath_test.go
index 04da3ae7..b29dc361 100644
--- a/src/arduino.cc/builder/test/fail_if_buildpath_equals_sketchpath_test.go
+++ b/test/fail_if_buildpath_equals_sketchpath_test.go
@@ -30,8 +30,8 @@
 package test
 
 import (
-	"arduino.cc/builder"
-	"arduino.cc/builder/types"
+	"github.com/arduino/arduino-builder"
+	"github.com/arduino/arduino-builder/types"
 	"github.com/stretchr/testify/require"
 	"testing"
 )
diff --git a/src/arduino.cc/builder/test/generate_buildpath_if_missing_test.go b/test/generate_buildpath_if_missing_test.go
similarity index 97%
rename from src/arduino.cc/builder/test/generate_buildpath_if_missing_test.go
rename to test/generate_buildpath_if_missing_test.go
index e1ec6edc..05d17e22 100644
--- a/src/arduino.cc/builder/test/generate_buildpath_if_missing_test.go
+++ b/test/generate_buildpath_if_missing_test.go
@@ -30,8 +30,8 @@
 package test
 
 import (
-	"arduino.cc/builder"
-	"arduino.cc/builder/types"
+	"github.com/arduino/arduino-builder"
+	"github.com/arduino/arduino-builder/types"
 	"github.com/stretchr/testify/require"
 	"os"
 	"path/filepath"
diff --git a/src/arduino.cc/builder/test/hardware/arduino/avr/boards.local.txt b/test/hardware/arduino/avr/boards.local.txt
similarity index 100%
rename from src/arduino.cc/builder/test/hardware/arduino/avr/boards.local.txt
rename to test/hardware/arduino/avr/boards.local.txt
diff --git a/src/arduino.cc/builder/test/hardware/arduino/avr/boards.txt b/test/hardware/arduino/avr/boards.txt
similarity index 100%
rename from src/arduino.cc/builder/test/hardware/arduino/avr/boards.txt
rename to test/hardware/arduino/avr/boards.txt
diff --git a/src/arduino.cc/builder/test/hardware/arduino/avr/platform.local.txt b/test/hardware/arduino/avr/platform.local.txt
similarity index 100%
rename from src/arduino.cc/builder/test/hardware/arduino/avr/platform.local.txt
rename to test/hardware/arduino/avr/platform.local.txt
diff --git a/src/arduino.cc/builder/test/hardware/platform.txt b/test/hardware/platform.txt
similarity index 100%
rename from src/arduino.cc/builder/test/hardware/platform.txt
rename to test/hardware/platform.txt
diff --git a/src/arduino.cc/builder/test/hardware/watterott/avr/boards.txt b/test/hardware/watterott/avr/boards.txt
similarity index 100%
rename from src/arduino.cc/builder/test/hardware/watterott/avr/boards.txt
rename to test/hardware/watterott/avr/boards.txt
diff --git a/src/arduino.cc/builder/test/hardware/watterott/avr/platform.txt b/test/hardware/watterott/avr/platform.txt
similarity index 100%
rename from src/arduino.cc/builder/test/hardware/watterott/avr/platform.txt
rename to test/hardware/watterott/avr/platform.txt
diff --git a/src/arduino.cc/builder/test/hardware/watterott/avr/programmers.txt b/test/hardware/watterott/avr/programmers.txt
similarity index 100%
rename from src/arduino.cc/builder/test/hardware/watterott/avr/programmers.txt
rename to test/hardware/watterott/avr/programmers.txt
diff --git a/src/arduino.cc/builder/test/hardware_loader_test.go b/test/hardware_loader_test.go
similarity index 98%
rename from src/arduino.cc/builder/test/hardware_loader_test.go
rename to test/hardware_loader_test.go
index c9ea1d52..147396e7 100644
--- a/src/arduino.cc/builder/test/hardware_loader_test.go
+++ b/test/hardware_loader_test.go
@@ -30,10 +30,10 @@
 package test
 
 import (
-	"arduino.cc/builder"
-	"arduino.cc/builder/constants"
-	"arduino.cc/builder/types"
-	"arduino.cc/builder/utils"
+	"github.com/arduino/arduino-builder"
+	"github.com/arduino/arduino-builder/constants"
+	"github.com/arduino/arduino-builder/types"
+	"github.com/arduino/arduino-builder/utils"
 	"github.com/stretchr/testify/require"
 	"path/filepath"
 	"runtime"
diff --git a/src/arduino.cc/builder/test/helper.go b/test/helper.go
similarity index 95%
rename from src/arduino.cc/builder/test/helper.go
rename to test/helper.go
index dfb66338..b3452c7e 100644
--- a/src/arduino.cc/builder/test/helper.go
+++ b/test/helper.go
@@ -38,9 +38,9 @@ import (
 	"testing"
 	"text/template"
 
-	"arduino.cc/builder/constants"
-	"arduino.cc/builder/types"
-	"arduino.cc/builder/utils"
+	"github.com/arduino/arduino-builder/constants"
+	"github.com/arduino/arduino-builder/types"
+	"github.com/arduino/arduino-builder/utils"
 	"github.com/go-errors/errors"
 	"github.com/stretchr/testify/assert"
 )
diff --git a/src/arduino.cc/builder/test/helper_tools_downloader.go b/test/helper_tools_downloader.go
similarity index 98%
rename from src/arduino.cc/builder/test/helper_tools_downloader.go
rename to test/helper_tools_downloader.go
index 3642510c..cfce881c 100644
--- a/src/arduino.cc/builder/test/helper_tools_downloader.go
+++ b/test/helper_tools_downloader.go
@@ -42,11 +42,11 @@ import (
 	"strings"
 	"testing"
 
-	"arduino.cc/builder/constants"
-	"arduino.cc/builder/gohasissues"
-	"arduino.cc/builder/i18n"
-	"arduino.cc/builder/utils"
-	"arduino.cc/properties"
+	"github.com/arduino/arduino-builder/constants"
+	"github.com/arduino/arduino-builder/gohasissues"
+	"github.com/arduino/arduino-builder/i18n"
+	"github.com/arduino/arduino-builder/utils"
+	"github.com/arduino/go-properties-map"
 	"github.com/go-errors/errors"
 )
 
@@ -379,7 +379,7 @@ func coreAlreadyDownloadedAndUnpacked(targetPath string, core Core) (bool, error
 	if os.IsNotExist(err) {
 		return false, nil
 	}
-	platform, err := properties.Load(filepath.Join(corePath, "platform.txt"), i18n.HumanLogger{})
+	platform, err := properties.Load(filepath.Join(corePath, "platform.txt"))
 	if err != nil {
 		return false, i18n.WrapError(err)
 	}
@@ -435,7 +435,7 @@ func libraryAlreadyDownloadedAndUnpacked(targetPath string, library Library) boo
 		return false
 	}
 
-	libProps, err := properties.Load(filepath.Join(targetPath, strings.Replace(library.Name, " ", "_", -1), "library.properties"), i18n.HumanLogger{})
+	libProps, err := properties.Load(filepath.Join(targetPath, strings.Replace(library.Name, " ", "_", -1), "library.properties"))
 	if err != nil {
 		return false
 	}
diff --git a/src/arduino.cc/builder/test/i18n_test.go b/test/i18n_test.go
similarity index 97%
rename from src/arduino.cc/builder/test/i18n_test.go
rename to test/i18n_test.go
index 9836c731..7dfb8d4b 100644
--- a/src/arduino.cc/builder/test/i18n_test.go
+++ b/test/i18n_test.go
@@ -30,8 +30,8 @@
 package test
 
 import (
-	"arduino.cc/builder/constants"
-	"arduino.cc/builder/i18n"
+	"github.com/arduino/arduino-builder/constants"
+	"github.com/arduino/arduino-builder/i18n"
 	"fmt"
 	"github.com/stretchr/testify/require"
 	"testing"
diff --git a/src/arduino.cc/builder/test/includes_finder_with_regexp_test.go b/test/includes_finder_with_regexp_test.go
similarity index 97%
rename from src/arduino.cc/builder/test/includes_finder_with_regexp_test.go
rename to test/includes_finder_with_regexp_test.go
index d6bc1553..d95153a5 100644
--- a/src/arduino.cc/builder/test/includes_finder_with_regexp_test.go
+++ b/test/includes_finder_with_regexp_test.go
@@ -30,8 +30,8 @@
 package test
 
 import (
-	"arduino.cc/builder"
-	"arduino.cc/builder/types"
+	"github.com/arduino/arduino-builder"
+	"github.com/arduino/arduino-builder/types"
 	"github.com/stretchr/testify/require"
 	"testing"
 )
diff --git a/src/arduino.cc/builder/test/includes_to_include_folders_test.go b/test/includes_to_include_folders_test.go
similarity index 99%
rename from src/arduino.cc/builder/test/includes_to_include_folders_test.go
rename to test/includes_to_include_folders_test.go
index 7e431f8b..29f26d06 100644
--- a/src/arduino.cc/builder/test/includes_to_include_folders_test.go
+++ b/test/includes_to_include_folders_test.go
@@ -30,8 +30,8 @@
 package test
 
 import (
-	"arduino.cc/builder"
-	"arduino.cc/builder/types"
+	"github.com/arduino/arduino-builder"
+	"github.com/arduino/arduino-builder/types"
 	"fmt"
 	"github.com/stretchr/testify/require"
 	"os"
diff --git a/src/arduino.cc/builder/test/libraries/ANewLibrary-master/anewlibrary.h b/test/libraries/ANewLibrary-master/anewlibrary.h
similarity index 100%
rename from src/arduino.cc/builder/test/libraries/ANewLibrary-master/anewlibrary.h
rename to test/libraries/ANewLibrary-master/anewlibrary.h
diff --git a/src/arduino.cc/builder/test/libraries/Balanduino/Balanduino.h b/test/libraries/Balanduino/Balanduino.h
similarity index 100%
rename from src/arduino.cc/builder/test/libraries/Balanduino/Balanduino.h
rename to test/libraries/Balanduino/Balanduino.h
diff --git a/src/arduino.cc/builder/test/libraries/Balanduino/Kalman.h b/test/libraries/Balanduino/Kalman.h
similarity index 100%
rename from src/arduino.cc/builder/test/libraries/Balanduino/Kalman.h
rename to test/libraries/Balanduino/Kalman.h
diff --git a/src/arduino.cc/builder/test/libraries/Balanduino/PS3BT.h b/test/libraries/Balanduino/PS3BT.h
similarity index 100%
rename from src/arduino.cc/builder/test/libraries/Balanduino/PS3BT.h
rename to test/libraries/Balanduino/PS3BT.h
diff --git a/src/arduino.cc/builder/test/libraries/Balanduino/SPP.h b/test/libraries/Balanduino/SPP.h
similarity index 100%
rename from src/arduino.cc/builder/test/libraries/Balanduino/SPP.h
rename to test/libraries/Balanduino/SPP.h
diff --git a/src/arduino.cc/builder/test/libraries/Balanduino/Wii.h b/test/libraries/Balanduino/Wii.h
similarity index 100%
rename from src/arduino.cc/builder/test/libraries/Balanduino/Wii.h
rename to test/libraries/Balanduino/Wii.h
diff --git a/src/arduino.cc/builder/test/libraries/Balanduino/XBOXRECV.h b/test/libraries/Balanduino/XBOXRECV.h
similarity index 100%
rename from src/arduino.cc/builder/test/libraries/Balanduino/XBOXRECV.h
rename to test/libraries/Balanduino/XBOXRECV.h
diff --git a/src/arduino.cc/builder/test/libraries/Balanduino/adk.h b/test/libraries/Balanduino/adk.h
similarity index 100%
rename from src/arduino.cc/builder/test/libraries/Balanduino/adk.h
rename to test/libraries/Balanduino/adk.h
diff --git a/src/arduino.cc/builder/test/libraries/Balanduino/usbhub.h b/test/libraries/Balanduino/usbhub.h
similarity index 100%
rename from src/arduino.cc/builder/test/libraries/Balanduino/usbhub.h
rename to test/libraries/Balanduino/usbhub.h
diff --git a/src/arduino.cc/builder/test/libraries/FakeAudio/Audio.h b/test/libraries/FakeAudio/Audio.h
similarity index 100%
rename from src/arduino.cc/builder/test/libraries/FakeAudio/Audio.h
rename to test/libraries/FakeAudio/Audio.h
diff --git a/src/arduino.cc/builder/test/libraries/FakeAudio/FakeAudio.h b/test/libraries/FakeAudio/FakeAudio.h
similarity index 100%
rename from src/arduino.cc/builder/test/libraries/FakeAudio/FakeAudio.h
rename to test/libraries/FakeAudio/FakeAudio.h
diff --git a/src/arduino.cc/builder/test/libraries/IRremote/IRremote.h b/test/libraries/IRremote/IRremote.h
similarity index 100%
rename from src/arduino.cc/builder/test/libraries/IRremote/IRremote.h
rename to test/libraries/IRremote/IRremote.h
diff --git a/src/arduino.cc/builder/test/libraries/IRremote/IRremoteInt.h b/test/libraries/IRremote/IRremoteInt.h
similarity index 100%
rename from src/arduino.cc/builder/test/libraries/IRremote/IRremoteInt.h
rename to test/libraries/IRremote/IRremoteInt.h
diff --git a/src/arduino.cc/builder/test/libraries/SPI/SPI.cpp b/test/libraries/SPI/SPI.cpp
similarity index 100%
rename from src/arduino.cc/builder/test/libraries/SPI/SPI.cpp
rename to test/libraries/SPI/SPI.cpp
diff --git a/src/arduino.cc/builder/test/libraries/SPI/SPI.h b/test/libraries/SPI/SPI.h
similarity index 100%
rename from src/arduino.cc/builder/test/libraries/SPI/SPI.h
rename to test/libraries/SPI/SPI.h
diff --git a/src/arduino.cc/builder/test/libraries/SPI/keywords.txt b/test/libraries/SPI/keywords.txt
similarity index 100%
rename from src/arduino.cc/builder/test/libraries/SPI/keywords.txt
rename to test/libraries/SPI/keywords.txt
diff --git a/src/arduino.cc/builder/test/libraries/SPI/library.properties b/test/libraries/SPI/library.properties
similarity index 100%
rename from src/arduino.cc/builder/test/libraries/SPI/library.properties
rename to test/libraries/SPI/library.properties
diff --git a/src/arduino.cc/builder/test/libraries/ShouldNotRecurseWithOldLibs/ShouldNotRecurseWithOldLibs.cpp b/test/libraries/ShouldNotRecurseWithOldLibs/ShouldNotRecurseWithOldLibs.cpp
similarity index 100%
rename from src/arduino.cc/builder/test/libraries/ShouldNotRecurseWithOldLibs/ShouldNotRecurseWithOldLibs.cpp
rename to test/libraries/ShouldNotRecurseWithOldLibs/ShouldNotRecurseWithOldLibs.cpp
diff --git a/src/arduino.cc/builder/test/libraries/ShouldNotRecurseWithOldLibs/ShouldNotRecurseWithOldLibs.h b/test/libraries/ShouldNotRecurseWithOldLibs/ShouldNotRecurseWithOldLibs.h
similarity index 100%
rename from src/arduino.cc/builder/test/libraries/ShouldNotRecurseWithOldLibs/ShouldNotRecurseWithOldLibs.h
rename to test/libraries/ShouldNotRecurseWithOldLibs/ShouldNotRecurseWithOldLibs.h
diff --git a/src/arduino.cc/builder/test/libraries/ShouldNotRecurseWithOldLibs/doc/error.cpp b/test/libraries/ShouldNotRecurseWithOldLibs/doc/error.cpp
similarity index 100%
rename from src/arduino.cc/builder/test/libraries/ShouldNotRecurseWithOldLibs/doc/error.cpp
rename to test/libraries/ShouldNotRecurseWithOldLibs/doc/error.cpp
diff --git a/src/arduino.cc/builder/test/libraries/ShouldNotRecurseWithOldLibs/utility/utils.cpp b/test/libraries/ShouldNotRecurseWithOldLibs/utility/utils.cpp
similarity index 100%
rename from src/arduino.cc/builder/test/libraries/ShouldNotRecurseWithOldLibs/utility/utils.cpp
rename to test/libraries/ShouldNotRecurseWithOldLibs/utility/utils.cpp
diff --git a/src/arduino.cc/builder/test/libraries/ShouldNotRecurseWithOldLibs/utility/utils.h b/test/libraries/ShouldNotRecurseWithOldLibs/utility/utils.h
similarity index 100%
rename from src/arduino.cc/builder/test/libraries/ShouldNotRecurseWithOldLibs/utility/utils.h
rename to test/libraries/ShouldNotRecurseWithOldLibs/utility/utils.h
diff --git a/src/arduino.cc/builder/test/libraries/USBHost/keywords.txt b/test/libraries/USBHost/keywords.txt
similarity index 100%
rename from src/arduino.cc/builder/test/libraries/USBHost/keywords.txt
rename to test/libraries/USBHost/keywords.txt
diff --git a/src/arduino.cc/builder/test/libraries/USBHost/library.properties b/test/libraries/USBHost/library.properties
similarity index 100%
rename from src/arduino.cc/builder/test/libraries/USBHost/library.properties
rename to test/libraries/USBHost/library.properties
diff --git a/src/arduino.cc/builder/test/libraries/USBHost/src/KeyboardController.cpp b/test/libraries/USBHost/src/KeyboardController.cpp
similarity index 100%
rename from src/arduino.cc/builder/test/libraries/USBHost/src/KeyboardController.cpp
rename to test/libraries/USBHost/src/KeyboardController.cpp
diff --git a/src/arduino.cc/builder/test/libraries/USBHost/src/KeyboardController.h b/test/libraries/USBHost/src/KeyboardController.h
similarity index 100%
rename from src/arduino.cc/builder/test/libraries/USBHost/src/KeyboardController.h
rename to test/libraries/USBHost/src/KeyboardController.h
diff --git a/src/arduino.cc/builder/test/libraries/USBHost/src/MouseController.cpp b/test/libraries/USBHost/src/MouseController.cpp
similarity index 100%
rename from src/arduino.cc/builder/test/libraries/USBHost/src/MouseController.cpp
rename to test/libraries/USBHost/src/MouseController.cpp
diff --git a/src/arduino.cc/builder/test/libraries/USBHost/src/MouseController.h b/test/libraries/USBHost/src/MouseController.h
similarity index 100%
rename from src/arduino.cc/builder/test/libraries/USBHost/src/MouseController.h
rename to test/libraries/USBHost/src/MouseController.h
diff --git a/src/arduino.cc/builder/test/libraries/USBHost/src/Usb.cpp b/test/libraries/USBHost/src/Usb.cpp
similarity index 100%
rename from src/arduino.cc/builder/test/libraries/USBHost/src/Usb.cpp
rename to test/libraries/USBHost/src/Usb.cpp
diff --git a/src/arduino.cc/builder/test/libraries/USBHost/src/Usb.h b/test/libraries/USBHost/src/Usb.h
similarity index 100%
rename from src/arduino.cc/builder/test/libraries/USBHost/src/Usb.h
rename to test/libraries/USBHost/src/Usb.h
diff --git a/src/arduino.cc/builder/test/libraries/USBHost/src/UsbCore.h b/test/libraries/USBHost/src/UsbCore.h
similarity index 100%
rename from src/arduino.cc/builder/test/libraries/USBHost/src/UsbCore.h
rename to test/libraries/USBHost/src/UsbCore.h
diff --git a/src/arduino.cc/builder/test/libraries/USBHost/src/address.h b/test/libraries/USBHost/src/address.h
similarity index 100%
rename from src/arduino.cc/builder/test/libraries/USBHost/src/address.h
rename to test/libraries/USBHost/src/address.h
diff --git a/src/arduino.cc/builder/test/libraries/USBHost/src/adk.cpp b/test/libraries/USBHost/src/adk.cpp
similarity index 100%
rename from src/arduino.cc/builder/test/libraries/USBHost/src/adk.cpp
rename to test/libraries/USBHost/src/adk.cpp
diff --git a/src/arduino.cc/builder/test/libraries/USBHost/src/adk.h b/test/libraries/USBHost/src/adk.h
similarity index 100%
rename from src/arduino.cc/builder/test/libraries/USBHost/src/adk.h
rename to test/libraries/USBHost/src/adk.h
diff --git a/src/arduino.cc/builder/test/libraries/USBHost/src/confdescparser.h b/test/libraries/USBHost/src/confdescparser.h
similarity index 100%
rename from src/arduino.cc/builder/test/libraries/USBHost/src/confdescparser.h
rename to test/libraries/USBHost/src/confdescparser.h
diff --git a/src/arduino.cc/builder/test/libraries/USBHost/src/hexdump.h b/test/libraries/USBHost/src/hexdump.h
similarity index 100%
rename from src/arduino.cc/builder/test/libraries/USBHost/src/hexdump.h
rename to test/libraries/USBHost/src/hexdump.h
diff --git a/src/arduino.cc/builder/test/libraries/USBHost/src/hid.cpp b/test/libraries/USBHost/src/hid.cpp
similarity index 100%
rename from src/arduino.cc/builder/test/libraries/USBHost/src/hid.cpp
rename to test/libraries/USBHost/src/hid.cpp
diff --git a/src/arduino.cc/builder/test/libraries/USBHost/src/hid.h b/test/libraries/USBHost/src/hid.h
similarity index 100%
rename from src/arduino.cc/builder/test/libraries/USBHost/src/hid.h
rename to test/libraries/USBHost/src/hid.h
diff --git a/src/arduino.cc/builder/test/libraries/USBHost/src/hidboot.cpp b/test/libraries/USBHost/src/hidboot.cpp
similarity index 100%
rename from src/arduino.cc/builder/test/libraries/USBHost/src/hidboot.cpp
rename to test/libraries/USBHost/src/hidboot.cpp
diff --git a/src/arduino.cc/builder/test/libraries/USBHost/src/hidboot.h b/test/libraries/USBHost/src/hidboot.h
similarity index 100%
rename from src/arduino.cc/builder/test/libraries/USBHost/src/hidboot.h
rename to test/libraries/USBHost/src/hidboot.h
diff --git a/src/arduino.cc/builder/test/libraries/USBHost/src/hidescriptorparser.cpp b/test/libraries/USBHost/src/hidescriptorparser.cpp
similarity index 100%
rename from src/arduino.cc/builder/test/libraries/USBHost/src/hidescriptorparser.cpp
rename to test/libraries/USBHost/src/hidescriptorparser.cpp
diff --git a/src/arduino.cc/builder/test/libraries/USBHost/src/hidescriptorparser.h b/test/libraries/USBHost/src/hidescriptorparser.h
similarity index 100%
rename from src/arduino.cc/builder/test/libraries/USBHost/src/hidescriptorparser.h
rename to test/libraries/USBHost/src/hidescriptorparser.h
diff --git a/src/arduino.cc/builder/test/libraries/USBHost/src/hiduniversal.cpp b/test/libraries/USBHost/src/hiduniversal.cpp
similarity index 100%
rename from src/arduino.cc/builder/test/libraries/USBHost/src/hiduniversal.cpp
rename to test/libraries/USBHost/src/hiduniversal.cpp
diff --git a/src/arduino.cc/builder/test/libraries/USBHost/src/hiduniversal.h b/test/libraries/USBHost/src/hiduniversal.h
similarity index 100%
rename from src/arduino.cc/builder/test/libraries/USBHost/src/hiduniversal.h
rename to test/libraries/USBHost/src/hiduniversal.h
diff --git a/src/arduino.cc/builder/test/libraries/USBHost/src/hidusagestr.h b/test/libraries/USBHost/src/hidusagestr.h
similarity index 100%
rename from src/arduino.cc/builder/test/libraries/USBHost/src/hidusagestr.h
rename to test/libraries/USBHost/src/hidusagestr.h
diff --git a/src/arduino.cc/builder/test/libraries/USBHost/src/macros.h b/test/libraries/USBHost/src/macros.h
similarity index 100%
rename from src/arduino.cc/builder/test/libraries/USBHost/src/macros.h
rename to test/libraries/USBHost/src/macros.h
diff --git a/src/arduino.cc/builder/test/libraries/USBHost/src/message.cpp b/test/libraries/USBHost/src/message.cpp
similarity index 100%
rename from src/arduino.cc/builder/test/libraries/USBHost/src/message.cpp
rename to test/libraries/USBHost/src/message.cpp
diff --git a/src/arduino.cc/builder/test/libraries/USBHost/src/message.h b/test/libraries/USBHost/src/message.h
similarity index 100%
rename from src/arduino.cc/builder/test/libraries/USBHost/src/message.h
rename to test/libraries/USBHost/src/message.h
diff --git a/src/arduino.cc/builder/test/libraries/USBHost/src/parsetools.cpp b/test/libraries/USBHost/src/parsetools.cpp
similarity index 100%
rename from src/arduino.cc/builder/test/libraries/USBHost/src/parsetools.cpp
rename to test/libraries/USBHost/src/parsetools.cpp
diff --git a/src/arduino.cc/builder/test/libraries/USBHost/src/parsetools.h b/test/libraries/USBHost/src/parsetools.h
similarity index 100%
rename from src/arduino.cc/builder/test/libraries/USBHost/src/parsetools.h
rename to test/libraries/USBHost/src/parsetools.h
diff --git a/src/arduino.cc/builder/test/libraries/USBHost/src/printhex.h b/test/libraries/USBHost/src/printhex.h
similarity index 100%
rename from src/arduino.cc/builder/test/libraries/USBHost/src/printhex.h
rename to test/libraries/USBHost/src/printhex.h
diff --git a/src/arduino.cc/builder/test/libraries/USBHost/src/sink_parser.h b/test/libraries/USBHost/src/sink_parser.h
similarity index 100%
rename from src/arduino.cc/builder/test/libraries/USBHost/src/sink_parser.h
rename to test/libraries/USBHost/src/sink_parser.h
diff --git a/src/arduino.cc/builder/test/libraries/USBHost/src/usb_ch9.h b/test/libraries/USBHost/src/usb_ch9.h
similarity index 100%
rename from src/arduino.cc/builder/test/libraries/USBHost/src/usb_ch9.h
rename to test/libraries/USBHost/src/usb_ch9.h
diff --git a/src/arduino.cc/builder/test/libraries/USBHost/src/usbhub.cpp b/test/libraries/USBHost/src/usbhub.cpp
similarity index 100%
rename from src/arduino.cc/builder/test/libraries/USBHost/src/usbhub.cpp
rename to test/libraries/USBHost/src/usbhub.cpp
diff --git a/src/arduino.cc/builder/test/libraries/USBHost/src/usbhub.h b/test/libraries/USBHost/src/usbhub.h
similarity index 100%
rename from src/arduino.cc/builder/test/libraries/USBHost/src/usbhub.h
rename to test/libraries/USBHost/src/usbhub.h
diff --git a/src/arduino.cc/builder/test/libraries/testlib1/testlib1.h b/test/libraries/testlib1/testlib1.h
similarity index 100%
rename from src/arduino.cc/builder/test/libraries/testlib1/testlib1.h
rename to test/libraries/testlib1/testlib1.h
diff --git a/src/arduino.cc/builder/test/libraries/testlib2/testlib2.h b/test/libraries/testlib2/testlib2.h
similarity index 100%
rename from src/arduino.cc/builder/test/libraries/testlib2/testlib2.h
rename to test/libraries/testlib2/testlib2.h
diff --git a/src/arduino.cc/builder/test/libraries/testlib3/testlib3.h b/test/libraries/testlib3/testlib3.h
similarity index 100%
rename from src/arduino.cc/builder/test/libraries/testlib3/testlib3.h
rename to test/libraries/testlib3/testlib3.h
diff --git a/src/arduino.cc/builder/test/libraries/testlib4/testlib4.h b/test/libraries/testlib4/testlib4.h
similarity index 100%
rename from src/arduino.cc/builder/test/libraries/testlib4/testlib4.h
rename to test/libraries/testlib4/testlib4.h
diff --git a/src/arduino.cc/builder/test/libraries/wronglib/library.properties b/test/libraries/wronglib/library.properties
similarity index 100%
rename from src/arduino.cc/builder/test/libraries/wronglib/library.properties
rename to test/libraries/wronglib/library.properties
diff --git a/src/arduino.cc/builder/test/libraries/wronglib/src/.gitkeep b/test/libraries/wronglib/src/.gitkeep
similarity index 100%
rename from src/arduino.cc/builder/test/libraries/wronglib/src/.gitkeep
rename to test/libraries/wronglib/src/.gitkeep
diff --git a/src/arduino.cc/builder/test/libraries/wronglib/utility/.gitkeep b/test/libraries/wronglib/utility/.gitkeep
similarity index 100%
rename from src/arduino.cc/builder/test/libraries/wronglib/utility/.gitkeep
rename to test/libraries/wronglib/utility/.gitkeep
diff --git a/src/arduino.cc/builder/test/libraries_loader_test.go b/test/libraries_loader_test.go
similarity index 98%
rename from src/arduino.cc/builder/test/libraries_loader_test.go
rename to test/libraries_loader_test.go
index 4073cf17..1908d4de 100644
--- a/src/arduino.cc/builder/test/libraries_loader_test.go
+++ b/test/libraries_loader_test.go
@@ -34,9 +34,9 @@ import (
 	"sort"
 	"testing"
 
-	"arduino.cc/builder"
-	"arduino.cc/builder/constants"
-	"arduino.cc/builder/types"
+	"github.com/arduino/arduino-builder"
+	"github.com/arduino/arduino-builder/constants"
+	"github.com/arduino/arduino-builder/types"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/src/arduino.cc/builder/test/load_previous_build_options_map_test.go b/test/load_previous_build_options_map_test.go
similarity index 92%
rename from src/arduino.cc/builder/test/load_previous_build_options_map_test.go
rename to test/load_previous_build_options_map_test.go
index 772d1c04..55984804 100644
--- a/src/arduino.cc/builder/test/load_previous_build_options_map_test.go
+++ b/test/load_previous_build_options_map_test.go
@@ -30,10 +30,10 @@
 package test
 
 import (
-	"arduino.cc/builder"
-	"arduino.cc/builder/constants"
-	"arduino.cc/builder/types"
-	"arduino.cc/builder/utils"
+	"github.com/arduino/arduino-builder"
+	"github.com/arduino/arduino-builder/constants"
+	"github.com/arduino/arduino-builder/types"
+	"github.com/arduino/arduino-builder/utils"
 	"github.com/stretchr/testify/require"
 	"os"
 	"path/filepath"
diff --git a/src/arduino.cc/builder/test/load_vid_pid_specific_properties_test.go b/test/load_vid_pid_specific_properties_test.go
similarity index 97%
rename from src/arduino.cc/builder/test/load_vid_pid_specific_properties_test.go
rename to test/load_vid_pid_specific_properties_test.go
index b0857b23..05fbf80f 100644
--- a/src/arduino.cc/builder/test/load_vid_pid_specific_properties_test.go
+++ b/test/load_vid_pid_specific_properties_test.go
@@ -30,8 +30,8 @@
 package test
 
 import (
-	"arduino.cc/builder"
-	"arduino.cc/builder/types"
+	"github.com/arduino/arduino-builder"
+	"github.com/arduino/arduino-builder/types"
 	"github.com/stretchr/testify/require"
 	"os"
 	"path/filepath"
diff --git a/src/arduino.cc/builder/test/merge_sketch_with_bootloader_test.go b/test/merge_sketch_with_bootloader_test.go
similarity index 97%
rename from src/arduino.cc/builder/test/merge_sketch_with_bootloader_test.go
rename to test/merge_sketch_with_bootloader_test.go
index ae0c91bc..5d6776cf 100644
--- a/src/arduino.cc/builder/test/merge_sketch_with_bootloader_test.go
+++ b/test/merge_sketch_with_bootloader_test.go
@@ -30,10 +30,10 @@
 package test
 
 import (
-	"arduino.cc/builder"
-	"arduino.cc/builder/constants"
-	"arduino.cc/builder/types"
-	"arduino.cc/builder/utils"
+	"github.com/arduino/arduino-builder"
+	"github.com/arduino/arduino-builder/constants"
+	"github.com/arduino/arduino-builder/types"
+	"github.com/arduino/arduino-builder/utils"
 	"github.com/stretchr/testify/require"
 	"io/ioutil"
 	"os"
diff --git a/src/arduino.cc/builder/test/platform_keys_rewrite_loader_test.go b/test/platform_keys_rewrite_loader_test.go
similarity index 97%
rename from src/arduino.cc/builder/test/platform_keys_rewrite_loader_test.go
rename to test/platform_keys_rewrite_loader_test.go
index 47ff86a4..914f5f75 100644
--- a/src/arduino.cc/builder/test/platform_keys_rewrite_loader_test.go
+++ b/test/platform_keys_rewrite_loader_test.go
@@ -30,9 +30,9 @@
 package test
 
 import (
-	"arduino.cc/builder"
-	"arduino.cc/builder/constants"
-	"arduino.cc/builder/types"
+	"github.com/arduino/arduino-builder"
+	"github.com/arduino/arduino-builder/constants"
+	"github.com/arduino/arduino-builder/types"
 	"github.com/stretchr/testify/require"
 	"path/filepath"
 	"testing"
diff --git a/src/arduino.cc/builder/test/prototypes_adder_test.go b/test/prototypes_adder_test.go
similarity index 99%
rename from src/arduino.cc/builder/test/prototypes_adder_test.go
rename to test/prototypes_adder_test.go
index b0fc729d..7c281461 100644
--- a/src/arduino.cc/builder/test/prototypes_adder_test.go
+++ b/test/prototypes_adder_test.go
@@ -31,9 +31,9 @@
 package test
 
 import (
-	"arduino.cc/builder"
-	"arduino.cc/builder/types"
-	"arduino.cc/builder/utils"
+	"github.com/arduino/arduino-builder"
+	"github.com/arduino/arduino-builder/types"
+	"github.com/arduino/arduino-builder/utils"
 	"github.com/stretchr/testify/require"
 	"os"
 	"path/filepath"
diff --git a/src/arduino.cc/builder/test/read_file_and_store_in_context_test.go b/test/read_file_and_store_in_context_test.go
similarity index 93%
rename from src/arduino.cc/builder/test/read_file_and_store_in_context_test.go
rename to test/read_file_and_store_in_context_test.go
index 0fb9db49..a83cfa0c 100644
--- a/src/arduino.cc/builder/test/read_file_and_store_in_context_test.go
+++ b/test/read_file_and_store_in_context_test.go
@@ -30,9 +30,9 @@
 package test
 
 import (
-	"arduino.cc/builder"
-	"arduino.cc/builder/types"
-	"arduino.cc/builder/utils"
+	"github.com/arduino/arduino-builder"
+	"github.com/arduino/arduino-builder/types"
+	"github.com/arduino/arduino-builder/utils"
 	"github.com/stretchr/testify/require"
 	"io/ioutil"
 	"os"
diff --git a/src/arduino.cc/builder/test/recipe_runner_test.go b/test/recipe_runner_test.go
similarity index 93%
rename from src/arduino.cc/builder/test/recipe_runner_test.go
rename to test/recipe_runner_test.go
index c187e22f..2ebb7a37 100644
--- a/src/arduino.cc/builder/test/recipe_runner_test.go
+++ b/test/recipe_runner_test.go
@@ -32,10 +32,10 @@ package test
 import (
 	"testing"
 
-	"arduino.cc/builder"
-	"arduino.cc/builder/constants"
-	"arduino.cc/builder/types"
-	"arduino.cc/properties"
+	"github.com/arduino/arduino-builder"
+	"github.com/arduino/arduino-builder/constants"
+	"github.com/arduino/arduino-builder/types"
+	"github.com/arduino/go-properties-map"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/src/arduino.cc/builder/test/rewrite_hardware_keys_test.go b/test/rewrite_hardware_keys_test.go
similarity index 96%
rename from src/arduino.cc/builder/test/rewrite_hardware_keys_test.go
rename to test/rewrite_hardware_keys_test.go
index cab44675..76829e0f 100644
--- a/src/arduino.cc/builder/test/rewrite_hardware_keys_test.go
+++ b/test/rewrite_hardware_keys_test.go
@@ -30,9 +30,9 @@
 package test
 
 import (
-	"arduino.cc/builder"
-	"arduino.cc/builder/constants"
-	"arduino.cc/builder/types"
+	"github.com/arduino/arduino-builder"
+	"github.com/arduino/arduino-builder/constants"
+	"github.com/arduino/arduino-builder/types"
 	"github.com/stretchr/testify/require"
 	"testing"
 )
diff --git a/src/arduino.cc/builder/test/setup_build_properties_test.go b/test/setup_build_properties_test.go
similarity index 98%
rename from src/arduino.cc/builder/test/setup_build_properties_test.go
rename to test/setup_build_properties_test.go
index 592bccd5..c8d39a91 100644
--- a/src/arduino.cc/builder/test/setup_build_properties_test.go
+++ b/test/setup_build_properties_test.go
@@ -30,10 +30,10 @@
 package test
 
 import (
-	"arduino.cc/builder"
-	"arduino.cc/builder/constants"
-	"arduino.cc/builder/types"
-	"arduino.cc/builder/utils"
+	"github.com/arduino/arduino-builder"
+	"github.com/arduino/arduino-builder/constants"
+	"github.com/arduino/arduino-builder/types"
+	"github.com/arduino/arduino-builder/utils"
 	"github.com/stretchr/testify/require"
 	"os"
 	"path/filepath"
diff --git a/src/arduino.cc/builder/test/sketch1/doc.txt b/test/sketch1/doc.txt
similarity index 100%
rename from src/arduino.cc/builder/test/sketch1/doc.txt
rename to test/sketch1/doc.txt
diff --git a/src/arduino.cc/builder/test/sketch1/header.h b/test/sketch1/header.h
similarity index 100%
rename from src/arduino.cc/builder/test/sketch1/header.h
rename to test/sketch1/header.h
diff --git a/src/arduino.cc/builder/test/sketch1/merged_sketch.txt b/test/sketch1/merged_sketch.txt
similarity index 100%
rename from src/arduino.cc/builder/test/sketch1/merged_sketch.txt
rename to test/sketch1/merged_sketch.txt
diff --git a/src/arduino.cc/builder/test/sketch1/old.pde b/test/sketch1/old.pde
similarity index 100%
rename from src/arduino.cc/builder/test/sketch1/old.pde
rename to test/sketch1/old.pde
diff --git a/src/arduino.cc/builder/test/sketch1/other.ino b/test/sketch1/other.ino
similarity index 100%
rename from src/arduino.cc/builder/test/sketch1/other.ino
rename to test/sketch1/other.ino
diff --git a/src/arduino.cc/builder/test/sketch1/s_file.S b/test/sketch1/s_file.S
similarity index 100%
rename from src/arduino.cc/builder/test/sketch1/s_file.S
rename to test/sketch1/s_file.S
diff --git a/src/arduino.cc/builder/test/sketch1/sketch.ino b/test/sketch1/sketch.ino
similarity index 100%
rename from src/arduino.cc/builder/test/sketch1/sketch.ino
rename to test/sketch1/sketch.ino
diff --git a/src/arduino.cc/builder/test/sketch1/src/helper.h b/test/sketch1/src/helper.h
similarity index 100%
rename from src/arduino.cc/builder/test/sketch1/src/helper.h
rename to test/sketch1/src/helper.h
diff --git a/src/arduino.cc/builder/test/sketch10/sketch.ino b/test/sketch10/sketch.ino
similarity index 100%
rename from src/arduino.cc/builder/test/sketch10/sketch.ino
rename to test/sketch10/sketch.ino
diff --git a/src/arduino.cc/builder/test/sketch11/sketch_fastleds.ino b/test/sketch11/sketch_fastleds.ino
similarity index 100%
rename from src/arduino.cc/builder/test/sketch11/sketch_fastleds.ino
rename to test/sketch11/sketch_fastleds.ino
diff --git a/src/arduino.cc/builder/test/sketch12/sketch12.ino b/test/sketch12/sketch12.ino
similarity index 100%
rename from src/arduino.cc/builder/test/sketch12/sketch12.ino
rename to test/sketch12/sketch12.ino
diff --git a/src/arduino.cc/builder/test/sketch2/SketchWithIfDef.ino b/test/sketch2/SketchWithIfDef.ino
similarity index 100%
rename from src/arduino.cc/builder/test/sketch2/SketchWithIfDef.ino
rename to test/sketch2/SketchWithIfDef.ino
diff --git a/src/arduino.cc/builder/test/sketch2/SketchWithIfDef.preprocessed.txt b/test/sketch2/SketchWithIfDef.preprocessed.txt
similarity index 100%
rename from src/arduino.cc/builder/test/sketch2/SketchWithIfDef.preprocessed.txt
rename to test/sketch2/SketchWithIfDef.preprocessed.txt
diff --git a/src/arduino.cc/builder/test/sketch2/SketchWithIfDef.resolved.directives.txt b/test/sketch2/SketchWithIfDef.resolved.directives.txt
similarity index 100%
rename from src/arduino.cc/builder/test/sketch2/SketchWithIfDef.resolved.directives.txt
rename to test/sketch2/SketchWithIfDef.resolved.directives.txt
diff --git a/src/arduino.cc/builder/test/sketch2/empty_1.h b/test/sketch2/empty_1.h
similarity index 100%
rename from src/arduino.cc/builder/test/sketch2/empty_1.h
rename to test/sketch2/empty_1.h
diff --git a/src/arduino.cc/builder/test/sketch2/empty_2.h b/test/sketch2/empty_2.h
similarity index 100%
rename from src/arduino.cc/builder/test/sketch2/empty_2.h
rename to test/sketch2/empty_2.h
diff --git a/src/arduino.cc/builder/test/sketch3/Baladuino.ino b/test/sketch3/Baladuino.ino
similarity index 100%
rename from src/arduino.cc/builder/test/sketch3/Baladuino.ino
rename to test/sketch3/Baladuino.ino
diff --git a/src/arduino.cc/builder/test/sketch3/Baladuino.preprocessed.txt b/test/sketch3/Baladuino.preprocessed.txt
similarity index 100%
rename from src/arduino.cc/builder/test/sketch3/Baladuino.preprocessed.txt
rename to test/sketch3/Baladuino.preprocessed.txt
diff --git a/src/arduino.cc/builder/test/sketch4/CharWithEscapedDoubleQuote.ino b/test/sketch4/CharWithEscapedDoubleQuote.ino
similarity index 100%
rename from src/arduino.cc/builder/test/sketch4/CharWithEscapedDoubleQuote.ino
rename to test/sketch4/CharWithEscapedDoubleQuote.ino
diff --git a/src/arduino.cc/builder/test/sketch4/CharWithEscapedDoubleQuote.preprocessed.txt b/test/sketch4/CharWithEscapedDoubleQuote.preprocessed.txt
similarity index 100%
rename from src/arduino.cc/builder/test/sketch4/CharWithEscapedDoubleQuote.preprocessed.txt
rename to test/sketch4/CharWithEscapedDoubleQuote.preprocessed.txt
diff --git a/src/arduino.cc/builder/test/sketch5/IncludeBetweenMultilineComment.ino b/test/sketch5/IncludeBetweenMultilineComment.ino
similarity index 100%
rename from src/arduino.cc/builder/test/sketch5/IncludeBetweenMultilineComment.ino
rename to test/sketch5/IncludeBetweenMultilineComment.ino
diff --git a/src/arduino.cc/builder/test/sketch5/IncludeBetweenMultilineComment.preprocessed.txt b/test/sketch5/IncludeBetweenMultilineComment.preprocessed.txt
similarity index 100%
rename from src/arduino.cc/builder/test/sketch5/IncludeBetweenMultilineComment.preprocessed.txt
rename to test/sketch5/IncludeBetweenMultilineComment.preprocessed.txt
diff --git a/src/arduino.cc/builder/test/sketch6/LineContinuations.ino b/test/sketch6/LineContinuations.ino
similarity index 100%
rename from src/arduino.cc/builder/test/sketch6/LineContinuations.ino
rename to test/sketch6/LineContinuations.ino
diff --git a/src/arduino.cc/builder/test/sketch6/LineContinuations.preprocessed.txt b/test/sketch6/LineContinuations.preprocessed.txt
similarity index 100%
rename from src/arduino.cc/builder/test/sketch6/LineContinuations.preprocessed.txt
rename to test/sketch6/LineContinuations.preprocessed.txt
diff --git a/src/arduino.cc/builder/test/sketch7/StringWithComment.ino b/test/sketch7/StringWithComment.ino
similarity index 100%
rename from src/arduino.cc/builder/test/sketch7/StringWithComment.ino
rename to test/sketch7/StringWithComment.ino
diff --git a/src/arduino.cc/builder/test/sketch7/StringWithComment.preprocessed.txt b/test/sketch7/StringWithComment.preprocessed.txt
similarity index 100%
rename from src/arduino.cc/builder/test/sketch7/StringWithComment.preprocessed.txt
rename to test/sketch7/StringWithComment.preprocessed.txt
diff --git a/src/arduino.cc/builder/test/sketch8/SketchWithStruct.ino b/test/sketch8/SketchWithStruct.ino
similarity index 100%
rename from src/arduino.cc/builder/test/sketch8/SketchWithStruct.ino
rename to test/sketch8/SketchWithStruct.ino
diff --git a/src/arduino.cc/builder/test/sketch8/SketchWithStruct.preprocessed.txt b/test/sketch8/SketchWithStruct.preprocessed.txt
similarity index 100%
rename from src/arduino.cc/builder/test/sketch8/SketchWithStruct.preprocessed.txt
rename to test/sketch8/SketchWithStruct.preprocessed.txt
diff --git a/src/arduino.cc/builder/test/sketch9/sketch.ino b/test/sketch9/sketch.ino
similarity index 100%
rename from src/arduino.cc/builder/test/sketch9/sketch.ino
rename to test/sketch9/sketch.ino
diff --git a/src/arduino.cc/builder/test/sketch_class_function/sketch_class_function.ino b/test/sketch_class_function/sketch_class_function.ino
similarity index 100%
rename from src/arduino.cc/builder/test/sketch_class_function/sketch_class_function.ino
rename to test/sketch_class_function/sketch_class_function.ino
diff --git a/src/arduino.cc/builder/test/sketch_loader_test.go b/test/sketch_loader_test.go
similarity index 98%
rename from src/arduino.cc/builder/test/sketch_loader_test.go
rename to test/sketch_loader_test.go
index 5a9b0134..b524457c 100644
--- a/src/arduino.cc/builder/test/sketch_loader_test.go
+++ b/test/sketch_loader_test.go
@@ -33,8 +33,8 @@ import (
 	"path/filepath"
 	"testing"
 
-	"arduino.cc/builder"
-	"arduino.cc/builder/types"
+	"github.com/arduino/arduino-builder"
+	"github.com/arduino/arduino-builder/types"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/src/arduino.cc/builder/test/sketch_no_functions/main.ino b/test/sketch_no_functions/main.ino
similarity index 100%
rename from src/arduino.cc/builder/test/sketch_no_functions/main.ino
rename to test/sketch_no_functions/main.ino
diff --git a/src/arduino.cc/builder/test/sketch_no_functions_two_files/main.ino b/test/sketch_no_functions_two_files/main.ino
similarity index 100%
rename from src/arduino.cc/builder/test/sketch_no_functions_two_files/main.ino
rename to test/sketch_no_functions_two_files/main.ino
diff --git a/src/arduino.cc/builder/test/sketch_no_functions_two_files/partb.ino b/test/sketch_no_functions_two_files/partb.ino
similarity index 100%
rename from src/arduino.cc/builder/test/sketch_no_functions_two_files/partb.ino
rename to test/sketch_no_functions_two_files/partb.ino
diff --git a/src/arduino.cc/builder/test/sketch_source_merger_test.go b/test/sketch_source_merger_test.go
similarity index 96%
rename from src/arduino.cc/builder/test/sketch_source_merger_test.go
rename to test/sketch_source_merger_test.go
index 6cb68dc0..8708db7b 100644
--- a/src/arduino.cc/builder/test/sketch_source_merger_test.go
+++ b/test/sketch_source_merger_test.go
@@ -31,8 +31,8 @@
 package test
 
 import (
-	"arduino.cc/builder"
-	"arduino.cc/builder/types"
+	"github.com/arduino/arduino-builder"
+	"github.com/arduino/arduino-builder/types"
 	"github.com/stretchr/testify/require"
 	"path/filepath"
 	"strings"
diff --git a/src/arduino.cc/builder/test/sketch_that_checks_if_SPI_has_transactions/sketch.ino b/test/sketch_that_checks_if_SPI_has_transactions/sketch.ino
similarity index 100%
rename from src/arduino.cc/builder/test/sketch_that_checks_if_SPI_has_transactions/sketch.ino
rename to test/sketch_that_checks_if_SPI_has_transactions/sketch.ino
diff --git a/src/arduino.cc/builder/test/sketch_that_checks_if_SPI_has_transactions_and_includes_missing_Ethernet/sketch.ino b/test/sketch_that_checks_if_SPI_has_transactions_and_includes_missing_Ethernet/sketch.ino
similarity index 100%
rename from src/arduino.cc/builder/test/sketch_that_checks_if_SPI_has_transactions_and_includes_missing_Ethernet/sketch.ino
rename to test/sketch_that_checks_if_SPI_has_transactions_and_includes_missing_Ethernet/sketch.ino
diff --git a/src/arduino.cc/builder/test/sketch_that_includes_arduino_h/sketch_that_includes_arduino_h.ino b/test/sketch_that_includes_arduino_h/sketch_that_includes_arduino_h.ino
similarity index 100%
rename from src/arduino.cc/builder/test/sketch_that_includes_arduino_h/sketch_that_includes_arduino_h.ino
rename to test/sketch_that_includes_arduino_h/sketch_that_includes_arduino_h.ino
diff --git a/src/arduino.cc/builder/test/sketch_usbhost/sketch_usbhost.ino b/test/sketch_usbhost/sketch_usbhost.ino
similarity index 100%
rename from src/arduino.cc/builder/test/sketch_usbhost/sketch_usbhost.ino
rename to test/sketch_usbhost/sketch_usbhost.ino
diff --git a/src/arduino.cc/builder/test/sketch_with_backup_files/backup/sketch.ino b/test/sketch_with_backup_files/backup/sketch.ino
similarity index 100%
rename from src/arduino.cc/builder/test/sketch_with_backup_files/backup/sketch.ino
rename to test/sketch_with_backup_files/backup/sketch.ino
diff --git a/src/arduino.cc/builder/test/sketch_with_backup_files/sketch.ino b/test/sketch_with_backup_files/sketch.ino
similarity index 100%
rename from src/arduino.cc/builder/test/sketch_with_backup_files/sketch.ino
rename to test/sketch_with_backup_files/sketch.ino
diff --git a/src/arduino.cc/builder/test/sketch_with_class/sketch.ino b/test/sketch_with_class/sketch.ino
similarity index 100%
rename from src/arduino.cc/builder/test/sketch_with_class/sketch.ino
rename to test/sketch_with_class/sketch.ino
diff --git a/src/arduino.cc/builder/test/sketch_with_config/config.h b/test/sketch_with_config/config.h
similarity index 100%
rename from src/arduino.cc/builder/test/sketch_with_config/config.h
rename to test/sketch_with_config/config.h
diff --git a/src/arduino.cc/builder/test/sketch_with_config/sketch_with_config.ino b/test/sketch_with_config/sketch_with_config.ino
similarity index 100%
rename from src/arduino.cc/builder/test/sketch_with_config/sketch_with_config.ino
rename to test/sketch_with_config/sketch_with_config.ino
diff --git a/src/arduino.cc/builder/test/sketch_with_config/sketch_with_config.preprocessed.txt b/test/sketch_with_config/sketch_with_config.preprocessed.txt
similarity index 100%
rename from src/arduino.cc/builder/test/sketch_with_config/sketch_with_config.preprocessed.txt
rename to test/sketch_with_config/sketch_with_config.preprocessed.txt
diff --git a/src/arduino.cc/builder/test/sketch_with_config/src/includes/de bug.cpp b/test/sketch_with_config/src/includes/de bug.cpp
similarity index 100%
rename from src/arduino.cc/builder/test/sketch_with_config/src/includes/de bug.cpp
rename to test/sketch_with_config/src/includes/de bug.cpp
diff --git a/src/arduino.cc/builder/test/sketch_with_config/src/includes/de bug.h b/test/sketch_with_config/src/includes/de bug.h
similarity index 100%
rename from src/arduino.cc/builder/test/sketch_with_config/src/includes/de bug.h
rename to test/sketch_with_config/src/includes/de bug.h
diff --git a/src/arduino.cc/builder/test/sketch_with_const/sketch.ino b/test/sketch_with_const/sketch.ino
similarity index 100%
rename from src/arduino.cc/builder/test/sketch_with_const/sketch.ino
rename to test/sketch_with_const/sketch.ino
diff --git a/src/arduino.cc/builder/test/sketch_with_default_args/sketch.ino b/test/sketch_with_default_args/sketch.ino
similarity index 100%
rename from src/arduino.cc/builder/test/sketch_with_default_args/sketch.ino
rename to test/sketch_with_default_args/sketch.ino
diff --git a/src/arduino.cc/builder/test/sketch_with_dependend_libraries/sketch.ino b/test/sketch_with_dependend_libraries/sketch.ino
similarity index 100%
rename from src/arduino.cc/builder/test/sketch_with_dependend_libraries/sketch.ino
rename to test/sketch_with_dependend_libraries/sketch.ino
diff --git a/src/arduino.cc/builder/test/sketch_with_enum_class/sketch_with_enum_class.ino b/test/sketch_with_enum_class/sketch_with_enum_class.ino
similarity index 100%
rename from src/arduino.cc/builder/test/sketch_with_enum_class/sketch_with_enum_class.ino
rename to test/sketch_with_enum_class/sketch_with_enum_class.ino
diff --git a/src/arduino.cc/builder/test/sketch_with_externC/sketch_with_externC.ino b/test/sketch_with_externC/sketch_with_externC.ino
similarity index 100%
rename from src/arduino.cc/builder/test/sketch_with_externC/sketch_with_externC.ino
rename to test/sketch_with_externC/sketch_with_externC.ino
diff --git a/src/arduino.cc/builder/test/sketch_with_externC_multiline/sketch_with_externC_multiline.ino b/test/sketch_with_externC_multiline/sketch_with_externC_multiline.ino
similarity index 100%
rename from src/arduino.cc/builder/test/sketch_with_externC_multiline/sketch_with_externC_multiline.ino
rename to test/sketch_with_externC_multiline/sketch_with_externC_multiline.ino
diff --git a/src/arduino.cc/builder/test/sketch_with_fake_function_pointer/sketch_with_fake_function_pointer.ino b/test/sketch_with_fake_function_pointer/sketch_with_fake_function_pointer.ino
similarity index 100%
rename from src/arduino.cc/builder/test/sketch_with_fake_function_pointer/sketch_with_fake_function_pointer.ino
rename to test/sketch_with_fake_function_pointer/sketch_with_fake_function_pointer.ino
diff --git a/src/arduino.cc/builder/test/sketch_with_function_pointer/CallbackBug.h b/test/sketch_with_function_pointer/CallbackBug.h
similarity index 100%
rename from src/arduino.cc/builder/test/sketch_with_function_pointer/CallbackBug.h
rename to test/sketch_with_function_pointer/CallbackBug.h
diff --git a/src/arduino.cc/builder/test/sketch_with_function_pointer/sketch.ino b/test/sketch_with_function_pointer/sketch.ino
similarity index 100%
rename from src/arduino.cc/builder/test/sketch_with_function_pointer/sketch.ino
rename to test/sketch_with_function_pointer/sketch.ino
diff --git a/src/arduino.cc/builder/test/sketch_with_function_signature_inside_ifdef/sketch.ino b/test/sketch_with_function_signature_inside_ifdef/sketch.ino
similarity index 100%
rename from src/arduino.cc/builder/test/sketch_with_function_signature_inside_ifdef/sketch.ino
rename to test/sketch_with_function_signature_inside_ifdef/sketch.ino
diff --git a/src/arduino.cc/builder/test/sketch_with_ifdef/sketch.ino b/test/sketch_with_ifdef/sketch.ino
similarity index 100%
rename from src/arduino.cc/builder/test/sketch_with_ifdef/sketch.ino
rename to test/sketch_with_ifdef/sketch.ino
diff --git a/src/arduino.cc/builder/test/sketch_with_ifdef/sketch.preprocessed.SAM.txt b/test/sketch_with_ifdef/sketch.preprocessed.SAM.txt
similarity index 100%
rename from src/arduino.cc/builder/test/sketch_with_ifdef/sketch.preprocessed.SAM.txt
rename to test/sketch_with_ifdef/sketch.preprocessed.SAM.txt
diff --git a/src/arduino.cc/builder/test/sketch_with_ifdef/sketch.preprocessed.txt b/test/sketch_with_ifdef/sketch.preprocessed.txt
similarity index 100%
rename from src/arduino.cc/builder/test/sketch_with_ifdef/sketch.preprocessed.txt
rename to test/sketch_with_ifdef/sketch.preprocessed.txt
diff --git a/src/arduino.cc/builder/test/sketch_with_inline_function/sketch.ino b/test/sketch_with_inline_function/sketch.ino
similarity index 100%
rename from src/arduino.cc/builder/test/sketch_with_inline_function/sketch.ino
rename to test/sketch_with_inline_function/sketch.ino
diff --git a/src/arduino.cc/builder/test/sketch_with_macosx_garbage/.#sketch.ino b/test/sketch_with_macosx_garbage/.#sketch.ino
similarity index 100%
rename from src/arduino.cc/builder/test/sketch_with_macosx_garbage/.#sketch.ino
rename to test/sketch_with_macosx_garbage/.#sketch.ino
diff --git a/src/arduino.cc/builder/test/sketch_with_macosx_garbage/sketch.ino b/test/sketch_with_macosx_garbage/sketch.ino
similarity index 100%
rename from src/arduino.cc/builder/test/sketch_with_macosx_garbage/sketch.ino
rename to test/sketch_with_macosx_garbage/sketch.ino
diff --git a/src/arduino.cc/builder/test/sketch_with_multiline_prototypes/sketch_with_multiline_prototypes.ino b/test/sketch_with_multiline_prototypes/sketch_with_multiline_prototypes.ino
similarity index 100%
rename from src/arduino.cc/builder/test/sketch_with_multiline_prototypes/sketch_with_multiline_prototypes.ino
rename to test/sketch_with_multiline_prototypes/sketch_with_multiline_prototypes.ino
diff --git a/src/arduino.cc/builder/test/sketch_with_multiline_template/sketch_with_multiline_template.ino b/test/sketch_with_multiline_template/sketch_with_multiline_template.ino
similarity index 100%
rename from src/arduino.cc/builder/test/sketch_with_multiline_template/sketch_with_multiline_template.ino
rename to test/sketch_with_multiline_template/sketch_with_multiline_template.ino
diff --git a/src/arduino.cc/builder/test/sketch_with_namespace/sketch.ino b/test/sketch_with_namespace/sketch.ino
similarity index 100%
rename from src/arduino.cc/builder/test/sketch_with_namespace/sketch.ino
rename to test/sketch_with_namespace/sketch.ino
diff --git a/src/arduino.cc/builder/test/sketch_with_old_lib/sketch.ino b/test/sketch_with_old_lib/sketch.ino
similarity index 100%
rename from src/arduino.cc/builder/test/sketch_with_old_lib/sketch.ino
rename to test/sketch_with_old_lib/sketch.ino
diff --git a/src/arduino.cc/builder/test/sketch_with_static_asserts/sketch_with_static_asserts.ino b/test/sketch_with_static_asserts/sketch_with_static_asserts.ino
similarity index 100%
rename from src/arduino.cc/builder/test/sketch_with_static_asserts/sketch_with_static_asserts.ino
rename to test/sketch_with_static_asserts/sketch_with_static_asserts.ino
diff --git a/src/arduino.cc/builder/test/sketch_with_subfolders/sketch_with_subfolders.ino b/test/sketch_with_subfolders/sketch_with_subfolders.ino
similarity index 100%
rename from src/arduino.cc/builder/test/sketch_with_subfolders/sketch_with_subfolders.ino
rename to test/sketch_with_subfolders/sketch_with_subfolders.ino
diff --git a/src/arduino.cc/builder/test/sketch_with_subfolders/src/subfolder/dont_load_me.ino b/test/sketch_with_subfolders/src/subfolder/dont_load_me.ino
similarity index 100%
rename from src/arduino.cc/builder/test/sketch_with_subfolders/src/subfolder/dont_load_me.ino
rename to test/sketch_with_subfolders/src/subfolder/dont_load_me.ino
diff --git a/src/arduino.cc/builder/test/sketch_with_subfolders/src/subfolder/other.cpp b/test/sketch_with_subfolders/src/subfolder/other.cpp
similarity index 100%
rename from src/arduino.cc/builder/test/sketch_with_subfolders/src/subfolder/other.cpp
rename to test/sketch_with_subfolders/src/subfolder/other.cpp
diff --git a/src/arduino.cc/builder/test/sketch_with_subfolders/src/subfolder/other.h b/test/sketch_with_subfolders/src/subfolder/other.h
similarity index 100%
rename from src/arduino.cc/builder/test/sketch_with_subfolders/src/subfolder/other.h
rename to test/sketch_with_subfolders/src/subfolder/other.h
diff --git a/src/arduino.cc/builder/test/sketch_with_subfolders/subfolder/dont_load_me.cpp b/test/sketch_with_subfolders/subfolder/dont_load_me.cpp
similarity index 100%
rename from src/arduino.cc/builder/test/sketch_with_subfolders/subfolder/dont_load_me.cpp
rename to test/sketch_with_subfolders/subfolder/dont_load_me.cpp
diff --git a/src/arduino.cc/builder/test/sketch_with_subfolders/subfolder/dont_load_me.ino b/test/sketch_with_subfolders/subfolder/dont_load_me.ino
similarity index 100%
rename from src/arduino.cc/builder/test/sketch_with_subfolders/subfolder/dont_load_me.ino
rename to test/sketch_with_subfolders/subfolder/dont_load_me.ino
diff --git a/src/arduino.cc/builder/test/sketch_with_subfolders/subfolder/other.h b/test/sketch_with_subfolders/subfolder/other.h
similarity index 100%
rename from src/arduino.cc/builder/test/sketch_with_subfolders/subfolder/other.h
rename to test/sketch_with_subfolders/subfolder/other.h
diff --git a/src/arduino.cc/builder/test/sketch_with_templates_and_shift/template_and_shift.cpp b/test/sketch_with_templates_and_shift/template_and_shift.cpp
similarity index 100%
rename from src/arduino.cc/builder/test/sketch_with_templates_and_shift/template_and_shift.cpp
rename to test/sketch_with_templates_and_shift/template_and_shift.cpp
diff --git a/src/arduino.cc/builder/test/sketch_with_typename/sketch.ino b/test/sketch_with_typename/sketch.ino
similarity index 100%
rename from src/arduino.cc/builder/test/sketch_with_typename/sketch.ino
rename to test/sketch_with_typename/sketch.ino
diff --git a/src/arduino.cc/builder/test/sketch_with_usbcon/sketch.ino b/test/sketch_with_usbcon/sketch.ino
similarity index 100%
rename from src/arduino.cc/builder/test/sketch_with_usbcon/sketch.ino
rename to test/sketch_with_usbcon/sketch.ino
diff --git a/src/arduino.cc/builder/test/store_build_options_map_test.go b/test/store_build_options_map_test.go
similarity index 95%
rename from src/arduino.cc/builder/test/store_build_options_map_test.go
rename to test/store_build_options_map_test.go
index 5ff02564..31c20f1d 100644
--- a/src/arduino.cc/builder/test/store_build_options_map_test.go
+++ b/test/store_build_options_map_test.go
@@ -30,9 +30,9 @@
 package test
 
 import (
-	"arduino.cc/builder"
-	"arduino.cc/builder/constants"
-	"arduino.cc/builder/types"
+	"github.com/arduino/arduino-builder"
+	"github.com/arduino/arduino-builder/constants"
+	"github.com/arduino/arduino-builder/types"
 	"github.com/stretchr/testify/require"
 	"io/ioutil"
 	"os"
diff --git a/src/arduino.cc/builder/test/target_board_resolver_test.go b/test/target_board_resolver_test.go
similarity index 98%
rename from src/arduino.cc/builder/test/target_board_resolver_test.go
rename to test/target_board_resolver_test.go
index 274eb92c..49e0abea 100644
--- a/src/arduino.cc/builder/test/target_board_resolver_test.go
+++ b/test/target_board_resolver_test.go
@@ -30,9 +30,9 @@
 package test
 
 import (
-	"arduino.cc/builder"
-	"arduino.cc/builder/constants"
-	"arduino.cc/builder/types"
+	"github.com/arduino/arduino-builder"
+	"github.com/arduino/arduino-builder/constants"
+	"github.com/arduino/arduino-builder/types"
 	"github.com/stretchr/testify/require"
 	"path/filepath"
 	"testing"
diff --git a/src/arduino.cc/builder/test/tools_builtin/avr/builtin_tools_versions.txt b/test/tools_builtin/avr/builtin_tools_versions.txt
similarity index 100%
rename from src/arduino.cc/builder/test/tools_builtin/avr/builtin_tools_versions.txt
rename to test/tools_builtin/avr/builtin_tools_versions.txt
diff --git a/src/arduino.cc/builder/test/tools_loader_test.go b/test/tools_loader_test.go
similarity index 98%
rename from src/arduino.cc/builder/test/tools_loader_test.go
rename to test/tools_loader_test.go
index 4bd2d3b2..3507afe8 100644
--- a/src/arduino.cc/builder/test/tools_loader_test.go
+++ b/test/tools_loader_test.go
@@ -30,8 +30,8 @@
 package test
 
 import (
-	"arduino.cc/builder"
-	"arduino.cc/builder/types"
+	"github.com/arduino/arduino-builder"
+	"github.com/arduino/arduino-builder/types"
 	"github.com/stretchr/testify/require"
 	"sort"
 	"testing"
diff --git a/src/arduino.cc/builder/test/try_build_of_problematic_sketch_test.go b/test/try_build_of_problematic_sketch_test.go
similarity index 98%
rename from src/arduino.cc/builder/test/try_build_of_problematic_sketch_test.go
rename to test/try_build_of_problematic_sketch_test.go
index f78f20a2..b604d6e0 100644
--- a/src/arduino.cc/builder/test/try_build_of_problematic_sketch_test.go
+++ b/test/try_build_of_problematic_sketch_test.go
@@ -31,8 +31,8 @@
 package test
 
 import (
-	"arduino.cc/builder"
-	"arduino.cc/builder/types"
+	"github.com/arduino/arduino-builder"
+	"github.com/arduino/arduino-builder/types"
 	"os"
 	"path/filepath"
 	"testing"
diff --git a/src/arduino.cc/builder/test/unique_string_queue_test.go b/test/unique_string_queue_test.go
similarity index 97%
rename from src/arduino.cc/builder/test/unique_string_queue_test.go
rename to test/unique_string_queue_test.go
index a1fc60b5..e6e92bb4 100644
--- a/src/arduino.cc/builder/test/unique_string_queue_test.go
+++ b/test/unique_string_queue_test.go
@@ -30,7 +30,7 @@
 package test
 
 import (
-	"arduino.cc/builder/types"
+	"github.com/arduino/arduino-builder/types"
 	"github.com/stretchr/testify/require"
 	"testing"
 )
diff --git a/src/arduino.cc/builder/test/unquote_test.go b/test/unquote_test.go
similarity index 97%
rename from src/arduino.cc/builder/test/unquote_test.go
rename to test/unquote_test.go
index 6b459d75..88233424 100644
--- a/src/arduino.cc/builder/test/unquote_test.go
+++ b/test/unquote_test.go
@@ -30,7 +30,7 @@
 package test
 
 import (
-	"arduino.cc/builder/gohasissues"
+	"github.com/arduino/arduino-builder/gohasissues"
 	"github.com/stretchr/testify/require"
 	"testing"
 )
diff --git a/src/arduino.cc/builder/test/unused_compiled_libraries_remover_test.go b/test/unused_compiled_libraries_remover_test.go
similarity index 97%
rename from src/arduino.cc/builder/test/unused_compiled_libraries_remover_test.go
rename to test/unused_compiled_libraries_remover_test.go
index 98ca24a9..83847dee 100644
--- a/src/arduino.cc/builder/test/unused_compiled_libraries_remover_test.go
+++ b/test/unused_compiled_libraries_remover_test.go
@@ -30,8 +30,8 @@
 package test
 
 import (
-	"arduino.cc/builder"
-	"arduino.cc/builder/types"
+	"github.com/arduino/arduino-builder"
+	"github.com/arduino/arduino-builder/types"
 	"github.com/stretchr/testify/require"
 	"io/ioutil"
 	"os"
diff --git a/src/arduino.cc/builder/test/user_hardware/arduino/avr/.gitkeep b/test/user_hardware/arduino/avr/.gitkeep
similarity index 100%
rename from src/arduino.cc/builder/test/user_hardware/arduino/avr/.gitkeep
rename to test/user_hardware/arduino/avr/.gitkeep
diff --git a/src/arduino.cc/builder/test/user_hardware/my_avr_platform/avr/boards.txt b/test/user_hardware/my_avr_platform/avr/boards.txt
similarity index 100%
rename from src/arduino.cc/builder/test/user_hardware/my_avr_platform/avr/boards.txt
rename to test/user_hardware/my_avr_platform/avr/boards.txt
diff --git a/src/arduino.cc/builder/test/user_hardware/my_avr_platform/avr/bootloaders/stk500v2/stk500boot_v2_mega2560.hex b/test/user_hardware/my_avr_platform/avr/bootloaders/stk500v2/stk500boot_v2_mega2560.hex
similarity index 100%
rename from src/arduino.cc/builder/test/user_hardware/my_avr_platform/avr/bootloaders/stk500v2/stk500boot_v2_mega2560.hex
rename to test/user_hardware/my_avr_platform/avr/bootloaders/stk500v2/stk500boot_v2_mega2560.hex
diff --git a/src/arduino.cc/builder/test/user_hardware/my_avr_platform/avr/libraries/SPI/SPI.cpp b/test/user_hardware/my_avr_platform/avr/libraries/SPI/SPI.cpp
similarity index 100%
rename from src/arduino.cc/builder/test/user_hardware/my_avr_platform/avr/libraries/SPI/SPI.cpp
rename to test/user_hardware/my_avr_platform/avr/libraries/SPI/SPI.cpp
diff --git a/src/arduino.cc/builder/test/user_hardware/my_avr_platform/avr/libraries/SPI/SPI.h b/test/user_hardware/my_avr_platform/avr/libraries/SPI/SPI.h
similarity index 100%
rename from src/arduino.cc/builder/test/user_hardware/my_avr_platform/avr/libraries/SPI/SPI.h
rename to test/user_hardware/my_avr_platform/avr/libraries/SPI/SPI.h
diff --git a/src/arduino.cc/builder/test/user_hardware/my_avr_platform/avr/libraries/SPI/examples/BarometricPressureSensor/BarometricPressureSensor.ino b/test/user_hardware/my_avr_platform/avr/libraries/SPI/examples/BarometricPressureSensor/BarometricPressureSensor.ino
similarity index 100%
rename from src/arduino.cc/builder/test/user_hardware/my_avr_platform/avr/libraries/SPI/examples/BarometricPressureSensor/BarometricPressureSensor.ino
rename to test/user_hardware/my_avr_platform/avr/libraries/SPI/examples/BarometricPressureSensor/BarometricPressureSensor.ino
diff --git a/src/arduino.cc/builder/test/user_hardware/my_avr_platform/avr/libraries/SPI/examples/DigitalPotControl/DigitalPotControl.ino b/test/user_hardware/my_avr_platform/avr/libraries/SPI/examples/DigitalPotControl/DigitalPotControl.ino
similarity index 100%
rename from src/arduino.cc/builder/test/user_hardware/my_avr_platform/avr/libraries/SPI/examples/DigitalPotControl/DigitalPotControl.ino
rename to test/user_hardware/my_avr_platform/avr/libraries/SPI/examples/DigitalPotControl/DigitalPotControl.ino
diff --git a/src/arduino.cc/builder/test/user_hardware/my_avr_platform/avr/libraries/SPI/keywords.txt b/test/user_hardware/my_avr_platform/avr/libraries/SPI/keywords.txt
similarity index 100%
rename from src/arduino.cc/builder/test/user_hardware/my_avr_platform/avr/libraries/SPI/keywords.txt
rename to test/user_hardware/my_avr_platform/avr/libraries/SPI/keywords.txt
diff --git a/src/arduino.cc/builder/test/user_hardware/my_avr_platform/avr/libraries/SPI/library.properties b/test/user_hardware/my_avr_platform/avr/libraries/SPI/library.properties
similarity index 100%
rename from src/arduino.cc/builder/test/user_hardware/my_avr_platform/avr/libraries/SPI/library.properties
rename to test/user_hardware/my_avr_platform/avr/libraries/SPI/library.properties
diff --git a/src/arduino.cc/builder/test/user_hardware/my_avr_platform/avr/platform.txt b/test/user_hardware/my_avr_platform/avr/platform.txt
similarity index 100%
rename from src/arduino.cc/builder/test/user_hardware/my_avr_platform/avr/platform.txt
rename to test/user_hardware/my_avr_platform/avr/platform.txt
diff --git a/src/arduino.cc/builder/test/user_hardware/my_avr_platform/platform.txt b/test/user_hardware/my_avr_platform/platform.txt
similarity index 100%
rename from src/arduino.cc/builder/test/user_hardware/my_avr_platform/platform.txt
rename to test/user_hardware/my_avr_platform/platform.txt
diff --git a/src/arduino.cc/builder/test/user_hardware/my_symlinked_avr_platform b/test/user_hardware/my_symlinked_avr_platform
similarity index 100%
rename from src/arduino.cc/builder/test/user_hardware/my_symlinked_avr_platform
rename to test/user_hardware/my_symlinked_avr_platform
diff --git a/src/arduino.cc/builder/test/utils_test.go b/test/utils_test.go
similarity index 98%
rename from src/arduino.cc/builder/test/utils_test.go
rename to test/utils_test.go
index 81739415..da8395fa 100644
--- a/src/arduino.cc/builder/test/utils_test.go
+++ b/test/utils_test.go
@@ -30,8 +30,8 @@
 package test
 
 import (
-	"arduino.cc/builder/i18n"
-	"arduino.cc/builder/utils"
+	"github.com/arduino/arduino-builder/i18n"
+	"github.com/arduino/arduino-builder/utils"
 	"github.com/stretchr/testify/require"
 	"strings"
 	"testing"
diff --git a/src/arduino.cc/builder/test/wipeout_build_path_if_build_options_changed_test.go b/test/wipeout_build_path_if_build_options_changed_test.go
similarity index 94%
rename from src/arduino.cc/builder/test/wipeout_build_path_if_build_options_changed_test.go
rename to test/wipeout_build_path_if_build_options_changed_test.go
index f8fc520d..51bfe80d 100644
--- a/src/arduino.cc/builder/test/wipeout_build_path_if_build_options_changed_test.go
+++ b/test/wipeout_build_path_if_build_options_changed_test.go
@@ -34,10 +34,10 @@ import (
 	"path/filepath"
 	"testing"
 
-	"arduino.cc/builder"
-	"arduino.cc/builder/gohasissues"
-	"arduino.cc/builder/types"
-	"arduino.cc/builder/utils"
+	"github.com/arduino/arduino-builder"
+	"github.com/arduino/arduino-builder/gohasissues"
+	"github.com/arduino/arduino-builder/types"
+	"github.com/arduino/arduino-builder/utils"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/src/arduino.cc/builder/tools_loader.go b/tools_loader.go
similarity index 96%
rename from src/arduino.cc/builder/tools_loader.go
rename to tools_loader.go
index d7bed7aa..2d9ee00a 100644
--- a/src/arduino.cc/builder/tools_loader.go
+++ b/tools_loader.go
@@ -30,11 +30,11 @@
 package builder
 
 import (
-	"arduino.cc/builder/constants"
-	"arduino.cc/builder/gohasissues"
-	"arduino.cc/builder/i18n"
-	"arduino.cc/builder/types"
-	"arduino.cc/builder/utils"
+	"github.com/arduino/arduino-builder/constants"
+	"github.com/arduino/arduino-builder/gohasissues"
+	"github.com/arduino/arduino-builder/i18n"
+	"github.com/arduino/arduino-builder/types"
+	"github.com/arduino/arduino-builder/utils"
 	"os"
 	"path/filepath"
 	"strings"
diff --git a/src/arduino.cc/builder/types/accessories.go b/types/accessories.go
similarity index 100%
rename from src/arduino.cc/builder/types/accessories.go
rename to types/accessories.go
diff --git a/src/arduino.cc/builder/types/context.go b/types/context.go
similarity index 97%
rename from src/arduino.cc/builder/types/context.go
rename to types/context.go
index 5e4fc478..bc9491dd 100644
--- a/src/arduino.cc/builder/types/context.go
+++ b/types/context.go
@@ -3,8 +3,8 @@ package types
 import (
 	"strings"
 
-	"arduino.cc/builder/i18n"
-	"arduino.cc/properties"
+	"github.com/arduino/arduino-builder/i18n"
+	"github.com/arduino/go-properties-map"
 )
 
 // Context structure
diff --git a/src/arduino.cc/builder/types/types.go b/types/types.go
similarity index 98%
rename from src/arduino.cc/builder/types/types.go
rename to types/types.go
index a869ec6b..cff74014 100644
--- a/src/arduino.cc/builder/types/types.go
+++ b/types/types.go
@@ -34,8 +34,8 @@ import (
 	"path/filepath"
 	"strconv"
 
-	"arduino.cc/builder/constants"
-	"arduino.cc/properties"
+	"github.com/arduino/arduino-builder/constants"
+	"github.com/arduino/go-properties-map"
 )
 
 type SourceFile struct {
diff --git a/src/arduino.cc/builder/types/utils.go b/types/utils.go
similarity index 100%
rename from src/arduino.cc/builder/types/utils.go
rename to types/utils.go
diff --git a/src/arduino.cc/builder/unused_compiled_libraries_remover.go b/unused_compiled_libraries_remover.go
similarity index 94%
rename from src/arduino.cc/builder/unused_compiled_libraries_remover.go
rename to unused_compiled_libraries_remover.go
index 07b89da8..f163efbb 100644
--- a/src/arduino.cc/builder/unused_compiled_libraries_remover.go
+++ b/unused_compiled_libraries_remover.go
@@ -30,9 +30,9 @@
 package builder
 
 import (
-	"arduino.cc/builder/i18n"
-	"arduino.cc/builder/types"
-	"arduino.cc/builder/utils"
+	"github.com/arduino/arduino-builder/i18n"
+	"github.com/arduino/arduino-builder/types"
+	"github.com/arduino/arduino-builder/utils"
 	"io/ioutil"
 	"os"
 	"path/filepath"
diff --git a/src/arduino.cc/builder/utils/utils.go b/utils/utils.go
similarity index 98%
rename from src/arduino.cc/builder/utils/utils.go
rename to utils/utils.go
index 0aa2e811..318b3984 100644
--- a/src/arduino.cc/builder/utils/utils.go
+++ b/utils/utils.go
@@ -40,10 +40,10 @@ import (
 	"strings"
 	"unicode/utf8"
 
-	"arduino.cc/builder/constants"
-	"arduino.cc/builder/gohasissues"
-	"arduino.cc/builder/i18n"
-	"arduino.cc/builder/types"
+	"github.com/arduino/arduino-builder/constants"
+	"github.com/arduino/arduino-builder/gohasissues"
+	"github.com/arduino/arduino-builder/i18n"
+	"github.com/arduino/arduino-builder/types"
 )
 
 func KeysOfMapOfStringInterface(input map[string]interface{}) []string {
diff --git a/src/arduino.cc/builder/warn_about_arch_incompatible_libraries.go b/warn_about_arch_incompatible_libraries.go
similarity index 96%
rename from src/arduino.cc/builder/warn_about_arch_incompatible_libraries.go
rename to warn_about_arch_incompatible_libraries.go
index f052c12d..8d320717 100644
--- a/src/arduino.cc/builder/warn_about_arch_incompatible_libraries.go
+++ b/warn_about_arch_incompatible_libraries.go
@@ -30,8 +30,8 @@
 package builder
 
 import (
-	"arduino.cc/builder/constants"
-	"arduino.cc/builder/types"
+	"github.com/arduino/arduino-builder/constants"
+	"github.com/arduino/arduino-builder/types"
 	"os"
 	"strings"
 )
diff --git a/src/arduino.cc/builder/warn_about_platform_rewrites.go b/warn_about_platform_rewrites.go
similarity index 96%
rename from src/arduino.cc/builder/warn_about_platform_rewrites.go
rename to warn_about_platform_rewrites.go
index 123057a7..247e0256 100644
--- a/src/arduino.cc/builder/warn_about_platform_rewrites.go
+++ b/warn_about_platform_rewrites.go
@@ -30,8 +30,8 @@
 package builder
 
 import (
-	"arduino.cc/builder/constants"
-	"arduino.cc/builder/types"
+	"github.com/arduino/arduino-builder/constants"
+	"github.com/arduino/arduino-builder/types"
 	"os"
 )
 
diff --git a/src/arduino.cc/builder/wipeout_build_path_if_build_options_changed.go b/wipeout_build_path_if_build_options_changed.go
similarity index 90%
rename from src/arduino.cc/builder/wipeout_build_path_if_build_options_changed.go
rename to wipeout_build_path_if_build_options_changed.go
index e08e7807..0764345d 100644
--- a/src/arduino.cc/builder/wipeout_build_path_if_build_options_changed.go
+++ b/wipeout_build_path_if_build_options_changed.go
@@ -34,13 +34,13 @@ import (
 	"os"
 	"path/filepath"
 
-	"arduino.cc/builder/builder_utils"
-	"arduino.cc/builder/constants"
-	"arduino.cc/builder/gohasissues"
-	"arduino.cc/builder/i18n"
-	"arduino.cc/builder/types"
-	"arduino.cc/builder/utils"
-	"arduino.cc/properties"
+	"github.com/arduino/arduino-builder/builder_utils"
+	"github.com/arduino/arduino-builder/constants"
+	"github.com/arduino/arduino-builder/gohasissues"
+	"github.com/arduino/arduino-builder/i18n"
+	"github.com/arduino/arduino-builder/types"
+	"github.com/arduino/arduino-builder/utils"
+	"github.com/arduino/go-properties-map"
 )
 
 type WipeoutBuildPathIfBuildOptionsChanged struct{}