diff --git a/.gitattributes b/.gitattributes
index 479ea9b..52e14cd 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,3 @@
 bouncycastle/* linguist-vendored
 boot_signer/*  linguist-vendored
+mkbootfs/*     linguist-vendored
diff --git a/avbtool.diff b/avb/avbtool.diff
similarity index 100%
rename from avbtool.diff
rename to avb/avbtool.diff
diff --git a/avbtool.diff.2 b/avb/avbtool.diff.2
similarity index 100%
rename from avbtool.diff.2
rename to avb/avbtool.diff.2
diff --git a/bbootimg/src/main/kotlin/Packer.kt b/bbootimg/src/main/kotlin/Packer.kt
index 7bb304e..ec2bf3e 100644
--- a/bbootimg/src/main/kotlin/Packer.kt
+++ b/bbootimg/src/main/kotlin/Packer.kt
@@ -11,7 +11,6 @@ import java.nio.ByteOrder
 import java.security.MessageDigest
 import java.util.regex.Pattern
 import org.junit.Assert.*
-import sun.nio.fs.UnixFileSystemProvider
 
 class Packer {
     private val log = LoggerFactory.getLogger("Packer")