diff --git a/assembler/assemble.go b/asm/assemble.go
similarity index 99%
rename from assembler/assemble.go
rename to asm/assemble.go
index fa16132..ae83928 100644
--- a/assembler/assemble.go
+++ b/asm/assemble.go
@@ -1,4 +1,4 @@
-package assembler
+package asm
 
 import "fmt"
 import "strconv"
diff --git a/assembler/parse.go b/asm/parse.go
similarity index 94%
rename from assembler/parse.go
rename to asm/parse.go
index 098690e..039829f 100644
--- a/assembler/parse.go
+++ b/asm/parse.go
@@ -1,4 +1,4 @@
-package assembler
+package asm
 
 import "gopkg.in/yaml.v2"
 
diff --git a/assembler/assemble_test.go b/test/integration_test.go
similarity index 79%
rename from assembler/assemble_test.go
rename to test/integration_test.go
index 7fda311..79eeb1f 100644
--- a/assembler/assemble_test.go
+++ b/test/integration_test.go
@@ -1,11 +1,12 @@
-package assembler
+package test
 
 import "testing"
 
+import "github.com/firestuff/subcoding/asm"
 import "github.com/firestuff/subcoding/vm"
 
-func TestAssembleExecute(t *testing.T) {
-	prog, err := AssembleString(`
+func TestLoop(t *testing.T) {
+	prog, err := asm.AssembleString(`
 functions:
 - - [add, f0, 1]
   - [call, +1]