diff --git a/stem-plugin/src/main/java/com/likethesalad/stem/ResolvePlaceholdersPlugin.kt b/stem-plugin/src/main/java/com/likethesalad/stem/ResolvePlaceholdersPlugin.kt
index 35b66e2..e657094 100644
--- a/stem-plugin/src/main/java/com/likethesalad/stem/ResolvePlaceholdersPlugin.kt
+++ b/stem-plugin/src/main/java/com/likethesalad/stem/ResolvePlaceholdersPlugin.kt
@@ -88,7 +88,7 @@ class ResolvePlaceholdersPlugin : BaseTemplatesProcessorPlugin(), AndroidExtensi
     }
 
     override fun getBuildDir(): File {
-        return project.buildDir
+        return project.layout.buildDirectory.get().asFile
     }
 
     @Suppress("UNCHECKED_CAST")
diff --git a/stem-plugin/src/main/java/com/likethesalad/stem/modules/common/Constants.kt b/stem-plugin/src/main/java/com/likethesalad/stem/modules/common/Constants.kt
index b2cb4a9..684adde 100644
--- a/stem-plugin/src/main/java/com/likethesalad/stem/modules/common/Constants.kt
+++ b/stem-plugin/src/main/java/com/likethesalad/stem/modules/common/Constants.kt
@@ -1,10 +1,8 @@
 package com.likethesalad.stem.modules.common
 
-class Constants {
-    companion object {
-        const val XML_STRING_TAG = "string"
-        const val XML_RESOURCES_TAG = "resources"
-        const val RESOLVED_FILE_NAME = "resolved.xml"
-        const val TEMPLATE_BASE_FILE_NAME = "templates"
-    }
+object Constants {
+    const val XML_STRING_TAG = "string"
+    const val XML_RESOURCES_TAG = "resources"
+    const val RESOLVED_FILE_NAME = "resolved.xml"
+    const val TEMPLATE_BASE_FILE_NAME = "templates"
 }
\ No newline at end of file
diff --git a/stem-plugin/src/main/java/com/likethesalad/stem/modules/common/helpers/files/AndroidXmlResDocument.kt b/stem-plugin/src/main/java/com/likethesalad/stem/modules/common/helpers/files/AndroidXmlResDocument.kt
index 46c7fd5..e481b6f 100644
--- a/stem-plugin/src/main/java/com/likethesalad/stem/modules/common/helpers/files/AndroidXmlResDocument.kt
+++ b/stem-plugin/src/main/java/com/likethesalad/stem/modules/common/helpers/files/AndroidXmlResDocument.kt
@@ -1,7 +1,7 @@
 package com.likethesalad.stem.modules.common.helpers.files
 
-import com.likethesalad.stem.modules.common.Constants.Companion.XML_RESOURCES_TAG
-import com.likethesalad.stem.modules.common.Constants.Companion.XML_STRING_TAG
+import com.likethesalad.stem.modules.common.Constants.XML_RESOURCES_TAG
+import com.likethesalad.stem.modules.common.Constants.XML_STRING_TAG
 import com.likethesalad.stem.modules.common.helpers.resources.utils.XmlUtils
 import com.likethesalad.tools.resource.api.android.modules.string.StringAndroidResource
 import org.w3c.dom.DOMException
diff --git a/stem-plugin/src/main/java/com/likethesalad/stem/modules/common/helpers/files/OutputStringFileResolver.kt b/stem-plugin/src/main/java/com/likethesalad/stem/modules/common/helpers/files/OutputStringFileResolver.kt
index 7c7b58e..05f6d84 100644
--- a/stem-plugin/src/main/java/com/likethesalad/stem/modules/common/helpers/files/OutputStringFileResolver.kt
+++ b/stem-plugin/src/main/java/com/likethesalad/stem/modules/common/helpers/files/OutputStringFileResolver.kt
@@ -1,7 +1,7 @@
 package com.likethesalad.stem.modules.common.helpers.files
 
-import com.likethesalad.stem.modules.common.Constants.Companion.RESOLVED_FILE_NAME
-import com.likethesalad.stem.modules.common.Constants.Companion.TEMPLATE_BASE_FILE_NAME
+import com.likethesalad.stem.modules.common.Constants.RESOLVED_FILE_NAME
+import com.likethesalad.stem.modules.common.Constants.TEMPLATE_BASE_FILE_NAME
 import java.io.File
 
 class OutputStringFileResolver {