diff --git a/pkg/api/agentPoolOnlyApi/v20170831/const.go b/pkg/armhelpers/api/agentPoolOnlyApi/v20170831/const.go
similarity index 100%
rename from pkg/api/agentPoolOnlyApi/v20170831/const.go
rename to pkg/armhelpers/api/agentPoolOnlyApi/v20170831/const.go
diff --git a/pkg/api/agentPoolOnlyApi/v20170831/doc.go b/pkg/armhelpers/api/agentPoolOnlyApi/v20170831/doc.go
similarity index 100%
rename from pkg/api/agentPoolOnlyApi/v20170831/doc.go
rename to pkg/armhelpers/api/agentPoolOnlyApi/v20170831/doc.go
diff --git a/pkg/api/agentPoolOnlyApi/v20170831/types.go b/pkg/armhelpers/api/agentPoolOnlyApi/v20170831/types.go
similarity index 100%
rename from pkg/api/agentPoolOnlyApi/v20170831/types.go
rename to pkg/armhelpers/api/agentPoolOnlyApi/v20170831/types.go
diff --git a/pkg/api/agentPoolOnlyApi/v20170831/types_test.go b/pkg/armhelpers/api/agentPoolOnlyApi/v20170831/types_test.go
similarity index 100%
rename from pkg/api/agentPoolOnlyApi/v20170831/types_test.go
rename to pkg/armhelpers/api/agentPoolOnlyApi/v20170831/types_test.go
diff --git a/pkg/api/agentPoolOnlyApi/v20170831/validate.go b/pkg/armhelpers/api/agentPoolOnlyApi/v20170831/validate.go
similarity index 100%
rename from pkg/api/agentPoolOnlyApi/v20170831/validate.go
rename to pkg/armhelpers/api/agentPoolOnlyApi/v20170831/validate.go
diff --git a/pkg/api/agentPoolOnlyApi/vlabs/const.go b/pkg/armhelpers/api/agentPoolOnlyApi/vlabs/const.go
similarity index 100%
rename from pkg/api/agentPoolOnlyApi/vlabs/const.go
rename to pkg/armhelpers/api/agentPoolOnlyApi/vlabs/const.go
diff --git a/pkg/api/agentPoolOnlyApi/vlabs/doc.go b/pkg/armhelpers/api/agentPoolOnlyApi/vlabs/doc.go
similarity index 100%
rename from pkg/api/agentPoolOnlyApi/vlabs/doc.go
rename to pkg/armhelpers/api/agentPoolOnlyApi/vlabs/doc.go
diff --git a/pkg/api/agentPoolOnlyApi/vlabs/types.go b/pkg/armhelpers/api/agentPoolOnlyApi/vlabs/types.go
similarity index 100%
rename from pkg/api/agentPoolOnlyApi/vlabs/types.go
rename to pkg/armhelpers/api/agentPoolOnlyApi/vlabs/types.go
diff --git a/pkg/api/agentPoolOnlyApi/vlabs/types_test.go b/pkg/armhelpers/api/agentPoolOnlyApi/vlabs/types_test.go
similarity index 100%
rename from pkg/api/agentPoolOnlyApi/vlabs/types_test.go
rename to pkg/armhelpers/api/agentPoolOnlyApi/vlabs/types_test.go
diff --git a/pkg/api/agentPoolOnlyApi/vlabs/validate.go b/pkg/armhelpers/api/agentPoolOnlyApi/vlabs/validate.go
similarity index 100%
rename from pkg/api/agentPoolOnlyApi/vlabs/validate.go
rename to pkg/armhelpers/api/agentPoolOnlyApi/vlabs/validate.go
diff --git a/pkg/api/apiloader.go b/pkg/armhelpers/api/apiloader.go
similarity index 100%
rename from pkg/api/apiloader.go
rename to pkg/armhelpers/api/apiloader.go
diff --git a/pkg/api/common/const.go b/pkg/armhelpers/api/common/const.go
similarity index 100%
rename from pkg/api/common/const.go
rename to pkg/armhelpers/api/common/const.go
diff --git a/pkg/api/common/helper.go b/pkg/armhelpers/api/common/helper.go
similarity index 100%
rename from pkg/api/common/helper.go
rename to pkg/armhelpers/api/common/helper.go
diff --git a/pkg/api/common/helper_test.go b/pkg/armhelpers/api/common/helper_test.go
similarity index 100%
rename from pkg/api/common/helper_test.go
rename to pkg/armhelpers/api/common/helper_test.go
diff --git a/pkg/api/common/net.go b/pkg/armhelpers/api/common/net.go
similarity index 100%
rename from pkg/api/common/net.go
rename to pkg/armhelpers/api/common/net.go
diff --git a/pkg/api/common/net_test.go b/pkg/armhelpers/api/common/net_test.go
similarity index 100%
rename from pkg/api/common/net_test.go
rename to pkg/armhelpers/api/common/net_test.go
diff --git a/pkg/api/const.go b/pkg/armhelpers/api/const.go
similarity index 100%
rename from pkg/api/const.go
rename to pkg/armhelpers/api/const.go
diff --git a/pkg/api/converterfromagentpoolonlyapi.go b/pkg/armhelpers/api/converterfromagentpoolonlyapi.go
similarity index 100%
rename from pkg/api/converterfromagentpoolonlyapi.go
rename to pkg/armhelpers/api/converterfromagentpoolonlyapi.go
diff --git a/pkg/api/converterfromapi.go b/pkg/armhelpers/api/converterfromapi.go
similarity index 100%
rename from pkg/api/converterfromapi.go
rename to pkg/armhelpers/api/converterfromapi.go
diff --git a/pkg/api/convertertoagentpoolonlyapi.go b/pkg/armhelpers/api/convertertoagentpoolonlyapi.go
similarity index 100%
rename from pkg/api/convertertoagentpoolonlyapi.go
rename to pkg/armhelpers/api/convertertoagentpoolonlyapi.go
diff --git a/pkg/api/convertertoagentpoolonlyapi_test.go b/pkg/armhelpers/api/convertertoagentpoolonlyapi_test.go
similarity index 100%
rename from pkg/api/convertertoagentpoolonlyapi_test.go
rename to pkg/armhelpers/api/convertertoagentpoolonlyapi_test.go
diff --git a/pkg/api/convertertoapi.go b/pkg/armhelpers/api/convertertoapi.go
similarity index 100%
rename from pkg/api/convertertoapi.go
rename to pkg/armhelpers/api/convertertoapi.go
diff --git a/pkg/api/convertertoapi_test.go b/pkg/armhelpers/api/convertertoapi_test.go
similarity index 100%
rename from pkg/api/convertertoapi_test.go
rename to pkg/armhelpers/api/convertertoapi_test.go
diff --git a/pkg/api/doc.go b/pkg/armhelpers/api/doc.go
similarity index 100%
rename from pkg/api/doc.go
rename to pkg/armhelpers/api/doc.go
diff --git a/pkg/api/orchestrators.go b/pkg/armhelpers/api/orchestrators.go
similarity index 100%
rename from pkg/api/orchestrators.go
rename to pkg/armhelpers/api/orchestrators.go
diff --git a/pkg/api/orchestrators_test.go b/pkg/armhelpers/api/orchestrators_test.go
similarity index 100%
rename from pkg/api/orchestrators_test.go
rename to pkg/armhelpers/api/orchestrators_test.go
diff --git a/pkg/api/strictjson.go b/pkg/armhelpers/api/strictjson.go
similarity index 100%
rename from pkg/api/strictjson.go
rename to pkg/armhelpers/api/strictjson.go
diff --git a/pkg/api/strictjson_test.go b/pkg/armhelpers/api/strictjson_test.go
similarity index 100%
rename from pkg/api/strictjson_test.go
rename to pkg/armhelpers/api/strictjson_test.go
diff --git a/pkg/api/types.go b/pkg/armhelpers/api/types.go
similarity index 100%
rename from pkg/api/types.go
rename to pkg/armhelpers/api/types.go
diff --git a/pkg/api/types_test.go b/pkg/armhelpers/api/types_test.go
similarity index 100%
rename from pkg/api/types_test.go
rename to pkg/armhelpers/api/types_test.go
diff --git a/pkg/api/v20160330/const.go b/pkg/armhelpers/api/v20160330/const.go
similarity index 100%
rename from pkg/api/v20160330/const.go
rename to pkg/armhelpers/api/v20160330/const.go
diff --git a/pkg/api/v20160330/doc.go b/pkg/armhelpers/api/v20160330/doc.go
similarity index 100%
rename from pkg/api/v20160330/doc.go
rename to pkg/armhelpers/api/v20160330/doc.go
diff --git a/pkg/api/v20160330/merge.go b/pkg/armhelpers/api/v20160330/merge.go
similarity index 100%
rename from pkg/api/v20160330/merge.go
rename to pkg/armhelpers/api/v20160330/merge.go
diff --git a/pkg/api/v20160330/merge_test.go b/pkg/armhelpers/api/v20160330/merge_test.go
similarity index 100%
rename from pkg/api/v20160330/merge_test.go
rename to pkg/armhelpers/api/v20160330/merge_test.go
diff --git a/pkg/api/v20160330/types.go b/pkg/armhelpers/api/v20160330/types.go
similarity index 100%
rename from pkg/api/v20160330/types.go
rename to pkg/armhelpers/api/v20160330/types.go
diff --git a/pkg/api/v20160330/types_test.go b/pkg/armhelpers/api/v20160330/types_test.go
similarity index 100%
rename from pkg/api/v20160330/types_test.go
rename to pkg/armhelpers/api/v20160330/types_test.go
diff --git a/pkg/api/v20160330/validate.go b/pkg/armhelpers/api/v20160330/validate.go
similarity index 100%
rename from pkg/api/v20160330/validate.go
rename to pkg/armhelpers/api/v20160330/validate.go
diff --git a/pkg/api/v20160930/const.go b/pkg/armhelpers/api/v20160930/const.go
similarity index 100%
rename from pkg/api/v20160930/const.go
rename to pkg/armhelpers/api/v20160930/const.go
diff --git a/pkg/api/v20160930/doc.go b/pkg/armhelpers/api/v20160930/doc.go
similarity index 100%
rename from pkg/api/v20160930/doc.go
rename to pkg/armhelpers/api/v20160930/doc.go
diff --git a/pkg/api/v20160930/merge.go b/pkg/armhelpers/api/v20160930/merge.go
similarity index 100%
rename from pkg/api/v20160930/merge.go
rename to pkg/armhelpers/api/v20160930/merge.go
diff --git a/pkg/api/v20160930/merge_test.go b/pkg/armhelpers/api/v20160930/merge_test.go
similarity index 100%
rename from pkg/api/v20160930/merge_test.go
rename to pkg/armhelpers/api/v20160930/merge_test.go
diff --git a/pkg/api/v20160930/types.go b/pkg/armhelpers/api/v20160930/types.go
similarity index 100%
rename from pkg/api/v20160930/types.go
rename to pkg/armhelpers/api/v20160930/types.go
diff --git a/pkg/api/v20160930/types_test.go b/pkg/armhelpers/api/v20160930/types_test.go
similarity index 100%
rename from pkg/api/v20160930/types_test.go
rename to pkg/armhelpers/api/v20160930/types_test.go
diff --git a/pkg/api/v20160930/validate.go b/pkg/armhelpers/api/v20160930/validate.go
similarity index 100%
rename from pkg/api/v20160930/validate.go
rename to pkg/armhelpers/api/v20160930/validate.go
diff --git a/pkg/api/v20170131/const.go b/pkg/armhelpers/api/v20170131/const.go
similarity index 100%
rename from pkg/api/v20170131/const.go
rename to pkg/armhelpers/api/v20170131/const.go
diff --git a/pkg/api/v20170131/doc.go b/pkg/armhelpers/api/v20170131/doc.go
similarity index 100%
rename from pkg/api/v20170131/doc.go
rename to pkg/armhelpers/api/v20170131/doc.go
diff --git a/pkg/api/v20170131/merge.go b/pkg/armhelpers/api/v20170131/merge.go
similarity index 100%
rename from pkg/api/v20170131/merge.go
rename to pkg/armhelpers/api/v20170131/merge.go
diff --git a/pkg/api/v20170131/merge_test.go b/pkg/armhelpers/api/v20170131/merge_test.go
similarity index 100%
rename from pkg/api/v20170131/merge_test.go
rename to pkg/armhelpers/api/v20170131/merge_test.go
diff --git a/pkg/api/v20170131/types.go b/pkg/armhelpers/api/v20170131/types.go
similarity index 100%
rename from pkg/api/v20170131/types.go
rename to pkg/armhelpers/api/v20170131/types.go
diff --git a/pkg/api/v20170131/types_test.go b/pkg/armhelpers/api/v20170131/types_test.go
similarity index 100%
rename from pkg/api/v20170131/types_test.go
rename to pkg/armhelpers/api/v20170131/types_test.go
diff --git a/pkg/api/v20170131/validate.go b/pkg/armhelpers/api/v20170131/validate.go
similarity index 100%
rename from pkg/api/v20170131/validate.go
rename to pkg/armhelpers/api/v20170131/validate.go
diff --git a/pkg/api/v20170131/validate_test.go b/pkg/armhelpers/api/v20170131/validate_test.go
similarity index 100%
rename from pkg/api/v20170131/validate_test.go
rename to pkg/armhelpers/api/v20170131/validate_test.go
diff --git a/pkg/api/v20170701/const.go b/pkg/armhelpers/api/v20170701/const.go
similarity index 100%
rename from pkg/api/v20170701/const.go
rename to pkg/armhelpers/api/v20170701/const.go
diff --git a/pkg/api/v20170701/doc.go b/pkg/armhelpers/api/v20170701/doc.go
similarity index 100%
rename from pkg/api/v20170701/doc.go
rename to pkg/armhelpers/api/v20170701/doc.go
diff --git a/pkg/api/v20170701/merge.go b/pkg/armhelpers/api/v20170701/merge.go
similarity index 100%
rename from pkg/api/v20170701/merge.go
rename to pkg/armhelpers/api/v20170701/merge.go
diff --git a/pkg/api/v20170701/merge_test.go b/pkg/armhelpers/api/v20170701/merge_test.go
similarity index 100%
rename from pkg/api/v20170701/merge_test.go
rename to pkg/armhelpers/api/v20170701/merge_test.go
diff --git a/pkg/api/v20170701/types.go b/pkg/armhelpers/api/v20170701/types.go
similarity index 100%
rename from pkg/api/v20170701/types.go
rename to pkg/armhelpers/api/v20170701/types.go
diff --git a/pkg/api/v20170701/types_test.go b/pkg/armhelpers/api/v20170701/types_test.go
similarity index 100%
rename from pkg/api/v20170701/types_test.go
rename to pkg/armhelpers/api/v20170701/types_test.go
diff --git a/pkg/api/v20170701/validate.go b/pkg/armhelpers/api/v20170701/validate.go
similarity index 100%
rename from pkg/api/v20170701/validate.go
rename to pkg/armhelpers/api/v20170701/validate.go
diff --git a/pkg/api/v20170701/validate_test.go b/pkg/armhelpers/api/v20170701/validate_test.go
similarity index 100%
rename from pkg/api/v20170701/validate_test.go
rename to pkg/armhelpers/api/v20170701/validate_test.go
diff --git a/pkg/api/v20170930/const.go b/pkg/armhelpers/api/v20170930/const.go
similarity index 100%
rename from pkg/api/v20170930/const.go
rename to pkg/armhelpers/api/v20170930/const.go
diff --git a/pkg/api/v20170930/types.go b/pkg/armhelpers/api/v20170930/types.go
similarity index 100%
rename from pkg/api/v20170930/types.go
rename to pkg/armhelpers/api/v20170930/types.go
diff --git a/pkg/api/v20170930/validate.go b/pkg/armhelpers/api/v20170930/validate.go
similarity index 100%
rename from pkg/api/v20170930/validate.go
rename to pkg/armhelpers/api/v20170930/validate.go
diff --git a/pkg/api/vlabs/const.go b/pkg/armhelpers/api/vlabs/const.go
similarity index 100%
rename from pkg/api/vlabs/const.go
rename to pkg/armhelpers/api/vlabs/const.go
diff --git a/pkg/api/vlabs/doc.go b/pkg/armhelpers/api/vlabs/doc.go
similarity index 100%
rename from pkg/api/vlabs/doc.go
rename to pkg/armhelpers/api/vlabs/doc.go
diff --git a/pkg/api/vlabs/merge.go b/pkg/armhelpers/api/vlabs/merge.go
similarity index 100%
rename from pkg/api/vlabs/merge.go
rename to pkg/armhelpers/api/vlabs/merge.go
diff --git a/pkg/api/vlabs/merge_test.go b/pkg/armhelpers/api/vlabs/merge_test.go
similarity index 100%
rename from pkg/api/vlabs/merge_test.go
rename to pkg/armhelpers/api/vlabs/merge_test.go
diff --git a/pkg/api/vlabs/orchestratorversiontypes.go b/pkg/armhelpers/api/vlabs/orchestratorversiontypes.go
similarity index 100%
rename from pkg/api/vlabs/orchestratorversiontypes.go
rename to pkg/armhelpers/api/vlabs/orchestratorversiontypes.go
diff --git a/pkg/api/vlabs/types.go b/pkg/armhelpers/api/vlabs/types.go
similarity index 100%
rename from pkg/api/vlabs/types.go
rename to pkg/armhelpers/api/vlabs/types.go
diff --git a/pkg/api/vlabs/validate.go b/pkg/armhelpers/api/vlabs/validate.go
similarity index 100%
rename from pkg/api/vlabs/validate.go
rename to pkg/armhelpers/api/vlabs/validate.go
diff --git a/pkg/api/vlabs/validate_test.go b/pkg/armhelpers/api/vlabs/validate_test.go
similarity index 100%
rename from pkg/api/vlabs/validate_test.go
rename to pkg/armhelpers/api/vlabs/validate_test.go