diff --git a/README b/README
index 38848ce..fffb00d 100644
--- a/README
+++ b/README
@@ -6,18 +6,18 @@ NFC tag reader. The I2C is software bit-banged by the kernel, drivers for both
 the IO expander and the PN532 are written in Lua.
 
 Files:
-    hslockmk2/                       - this directory
-             /main.lua               - main Lua script
-             /i2c.lua                - I2C functions
-             /nfc.lua                - NFC/PN532 functions
-             /auth.lua               - auth API functions
+    hslockmk2/                                    - this directory
+             software/
+                      main/                       - code for the central unit of the lock
+                           main.lua               - main Lua script
+                           lua-libs/              - other Lua libraries
+                                   mips-bin/      - C libraries compiled for MIPS/OpenWRT
+                                   luai2c.tar.gz  - C i2c library source
+                                   luasha2.tar.gz - C sha2 library source
 
-             /lua-libs/              - other Lua libraries
-                      /mips-bin/     - C libraries compiled for MIPS/OpenWRT
-                      luai2c.tar.gz  - C i2c library
-                      luasha2.tar.gz - C sha2 library
-                      JSON.lua       - JSON library
-                      bit.lua        - bitwise operations for Lua 5.1
+                      keypad/                     - AVR code for the keypad               
+             hardware/
+                     keypad/                      - KiCAD files for the keypad PCB
 
 You will additonally need luasec, luaposix and luasocket. But you can easily
 find these in your favourite distribution, or even the OpenWRT source tree.
diff --git a/auth.lua b/software/main/auth.lua
similarity index 100%
rename from auth.lua
rename to software/main/auth.lua
diff --git a/i2c.lua b/software/main/i2c.lua
similarity index 100%
rename from i2c.lua
rename to software/main/i2c.lua
diff --git a/lua-libs/JSON.lua b/software/main/lua-libs/JSON.lua
similarity index 100%
rename from lua-libs/JSON.lua
rename to software/main/lua-libs/JSON.lua
diff --git a/lua-libs/bit.lua b/software/main/lua-libs/bit.lua
similarity index 100%
rename from lua-libs/bit.lua
rename to software/main/lua-libs/bit.lua
diff --git a/lua-libs/luai2c.tar.bz2 b/software/main/lua-libs/luai2c.tar.bz2
similarity index 100%
rename from lua-libs/luai2c.tar.bz2
rename to software/main/lua-libs/luai2c.tar.bz2
diff --git a/lua-libs/luasha2-0.1.tar.gz b/software/main/lua-libs/luasha2-0.1.tar.gz
similarity index 100%
rename from lua-libs/luasha2-0.1.tar.gz
rename to software/main/lua-libs/luasha2-0.1.tar.gz
diff --git a/lua-libs/mips-bin/libluai2c.so b/software/main/lua-libs/mips-bin/libluai2c.so
similarity index 100%
rename from lua-libs/mips-bin/libluai2c.so
rename to software/main/lua-libs/mips-bin/libluai2c.so
diff --git a/lua-libs/mips-bin/libsha2.so b/software/main/lua-libs/mips-bin/libsha2.so
similarity index 100%
rename from lua-libs/mips-bin/libsha2.so
rename to software/main/lua-libs/mips-bin/libsha2.so
diff --git a/main.lua b/software/main/main.lua
similarity index 100%
rename from main.lua
rename to software/main/main.lua
diff --git a/nfc.lua b/software/main/nfc.lua
similarity index 100%
rename from nfc.lua
rename to software/main/nfc.lua