diff --git a/assembly/Makefile b/assembly/bios/Makefile
similarity index 68%
rename from assembly/Makefile
rename to assembly/bios/Makefile
index f2da4c7..c2d7e4e 100644
--- a/assembly/Makefile
+++ b/assembly/bios/Makefile
@@ -1,5 +1,5 @@
 bios:
-	z80asm -i pat80_bios_0.1.asm -o rom.bin
+	z80asm -i main.asm -o rom.bin
 	dd if=/dev/zero of=rom.bin bs=1 count=0 seek=8192
 	minipro -w rom.bin -p "AT28C64B"
 	
\ No newline at end of file
diff --git a/assembly/pat80_bios_0.1.asm b/assembly/bios/driver_hd44780.asm
similarity index 62%
rename from assembly/pat80_bios_0.1.asm
rename to assembly/bios/driver_hd44780.asm
index 8e57195..e60d083 100644
--- a/assembly/pat80_bios_0.1.asm
+++ b/assembly/bios/driver_hd44780.asm
@@ -1,42 +1,8 @@
-; Pat80 BIOS v0.01
-; @author: Daniele Verducci
-; 
-; ROM is at 0x00
-; RAM is at 0x80
-; LCD is at I/O 0x00 and 0x01
-
-jp sysinit     ; Startup vector: DO NOT MOVE! Must be the first instruction
+; HD44780 20x4 characters LCD display driver
+; @author Daniele Verducci
 
 
-; SYSTEM CONFIGURATION
-LCD_INSTR_REG: EQU %00000000
-LCD_DATA_REG: EQU %00000001
-
-
-; CONSTANTS
-SYSINIT_GREETING:
-    DB "Pat80 BIOS v0.1     ",0  ; null terminated string
-
-
-
-
-
-
-
-
-
-
-; System initialization
-sysinit:
-    call lcd_init
-
-    ; write characters to display
-    ld bc, SYSINIT_GREETING
-    call lcd_write      ; write string to screen
-    call lcd_cls        ; clear screen
-
-    halt
-
+; functions
 
 lcd_init:
     ;reset procedure
@@ -57,13 +23,14 @@ lcd_init:
 
 ; Writes text starting from current cursor position
 ; @param BC Pointer to a null-terminated string first character
-lcd_write:
+lcd_print:
     ld a, (bc)  ; bc is the pointer to passed string's first char
     cp 0        ; compare A content with 0 (subtract 0 from value and set zero flag Z if result is 0)
     ret z       ; if prev compare is true (Z flag set), string is finished, return
     out (LCD_DATA_REG),a    ; output char
     inc bc ; increment bc to move to next char
-    jp lcd_write
+
+    jp lcd_print
 
 ; Set cursor position
 ; @param B X-axis position (0 to 19)
diff --git a/assembly/bios/main.asm b/assembly/bios/main.asm
new file mode 100644
index 0000000..d51b6a6
--- /dev/null
+++ b/assembly/bios/main.asm
@@ -0,0 +1,46 @@
+; Pat80 BIOS v0.01
+; @author: Daniele Verducci
+; 
+; ROM is at 0x00
+; RAM is at 0x80
+; LCD is at I/O 0x00 and 0x01
+
+
+
+jp sysinit     ; Startup vector: DO NOT MOVE! Must be the first instruction
+
+
+; SYSTEM CONFIGURATION
+LCD_INSTR_REG: EQU %00000000
+LCD_DATA_REG: EQU %00000001
+
+
+; CONSTANTS
+SYSINIT_GREETING:
+    DB "Pat80 BIOS v0.1",0  ; null terminated string
+LIPSUM:
+    DB "Lorem ipsum dolor sit amet, consectetur adipiscing elit.",0
+
+
+
+
+
+include 'driver_hd44780.asm'
+
+; System initialization
+sysinit:
+    call lcd_init
+
+    ; write characters to display
+    ld bc, SYSINIT_GREETING
+    call lcd_print      ; write string to screen
+
+    ld bc, LIPSUM
+    call lcd_print
+
+    ;call lcd_cls        ; clear screen
+
+    halt
+
+
+