diff --git a/crypto/goolm/cipher/main.go b/crypto/goolm/cipher/cipher.go
similarity index 85%
rename from crypto/goolm/cipher/main.go
rename to crypto/goolm/cipher/cipher.go
index a8664702..43580b0b 100644
--- a/crypto/goolm/cipher/main.go
+++ b/crypto/goolm/cipher/cipher.go
@@ -1,4 +1,5 @@
-// cipher provides the methods and structs to do encryptions for olm/megolm.
+// Package cipher provides the methods and structs to do encryptions for
+// olm/megolm.
 package cipher
 
 // Cipher defines a valid cipher.
diff --git a/crypto/goolm/crypto/doc.go b/crypto/goolm/crypto/doc.go
new file mode 100644
index 00000000..5bdb01d8
--- /dev/null
+++ b/crypto/goolm/crypto/doc.go
@@ -0,0 +1,2 @@
+// Package crpyto provides the nessesary encryption methods for olm/megolm
+package crypto
diff --git a/crypto/goolm/crypto/main.go b/crypto/goolm/crypto/main.go
deleted file mode 100644
index 509d44a5..00000000
--- a/crypto/goolm/crypto/main.go
+++ /dev/null
@@ -1,2 +0,0 @@
-// crpyto provides the nessesary encryption methods for olm/megolm
-package crypto
diff --git a/crypto/goolm/sas/main.go b/crypto/goolm/sas/sas.go
similarity index 97%
rename from crypto/goolm/sas/main.go
rename to crypto/goolm/sas/sas.go
index 7337d5f9..e34ba41c 100644
--- a/crypto/goolm/sas/main.go
+++ b/crypto/goolm/sas/sas.go
@@ -1,4 +1,4 @@
-// sas provides the means to do SAS between keys
+// Package sas provides the means to do SAS between keys
 package sas
 
 import (
diff --git a/crypto/goolm/sas/main_test.go b/crypto/goolm/sas/sas_test.go
similarity index 100%
rename from crypto/goolm/sas/main_test.go
rename to crypto/goolm/sas/sas_test.go
diff --git a/crypto/goolm/session/doc.go b/crypto/goolm/session/doc.go
new file mode 100644
index 00000000..bc2e8f46
--- /dev/null
+++ b/crypto/goolm/session/doc.go
@@ -0,0 +1,3 @@
+// Package session provides the different types of sessions for en/decrypting
+// of messages
+package session
diff --git a/crypto/goolm/session/main.go b/crypto/goolm/session/main.go
deleted file mode 100644
index 0caf8045..00000000
--- a/crypto/goolm/session/main.go
+++ /dev/null
@@ -1,2 +0,0 @@
-// session provides the different types of sessions for en/decrypting of messages
-package session