diff --git a/Makefile.mak b/Makefile.mak
index a9083d5a..3fae868d 100644
--- a/Makefile.mak
+++ b/Makefile.mak
@@ -170,7 +170,7 @@ bin\th05\res_kso.com: th05\res_kso.cpp
 $**
 | masters.lib
 
-bin\th05\op.exe: th05\op010.cpp bin\th05\op.obj th05\op011.cpp th05\m_char.cpp bin\th04\cdg_p_na.obj bin\th04\snd_se_r.obj bin\th04\snd_se.obj bin\th04\bgimage.obj bin\th05\cdg_put.obj bin\th04\exit.obj bin\th05\vector.obj bin\th05\musicp_c.obj bin\th05\musicp_a.obj bin\th05\bgimager.obj bin\th05\snd_load.obj bin\th05\snd_kaja.obj bin\th05\pi_cpp_1.obj bin\th05\pi_asm_1.obj bin\th05\pi_cpp_2.obj bin\th05\pi_asm_2.obj bin\th05\initop.obj bin\th05\input_s.obj bin\th05\inp_h_w.obj bin\th05\snd_dlym.obj th05\cdg_p_nc.cpp bin\th05\frmdelay.obj bin\th04\cdg_load.obj bin\th05\egcrect.obj bin\th03\hfliplut.obj bin\th04\snd_pmdr.obj bin\th04\snd_mmdr.obj bin\th04\snd_mode.obj bin\th02\exit_dos.obj
+bin\th05\op.exe: th05\op_start.cpp bin\th05\op.obj th05\hi_view.cpp th05\m_char.cpp bin\th04\cdg_p_na.obj bin\th04\snd_se_r.obj bin\th04\snd_se.obj bin\th04\bgimage.obj bin\th05\cdg_put.obj bin\th04\exit.obj bin\th05\vector.obj bin\th05\musicp_c.obj bin\th05\musicp_a.obj bin\th05\bgimager.obj bin\th05\snd_load.obj bin\th05\snd_kaja.obj bin\th05\pi_cpp_1.obj bin\th05\pi_asm_1.obj bin\th05\pi_cpp_2.obj bin\th05\pi_asm_2.obj bin\th05\initop.obj bin\th05\input_s.obj bin\th05\inp_h_w.obj bin\th05\snd_dlym.obj th05\cdg_p_nc.cpp bin\th05\frmdelay.obj bin\th04\cdg_load.obj bin\th05\egcrect.obj bin\th03\hfliplut.obj bin\th04\snd_pmdr.obj bin\th04\snd_mmdr.obj bin\th04\snd_mode.obj bin\th02\exit_dos.obj
 	$(CC) $(CFLAGS) $(LARGE_LFLAGS) -DGAME=5 -DBINARY='O' -3 -Z -nbin\th05\ -eOP.EXE @&&|
 $**
 |
diff --git a/th05/hi_view.cpp b/th05/hi_view.cpp
new file mode 100644
index 00000000..e10ffe10
--- /dev/null
+++ b/th05/hi_view.cpp
@@ -0,0 +1 @@
+#include "th05/hiscore/view.cpp"
diff --git a/th05/op011.cpp b/th05/hiscore/view.cpp
similarity index 93%
rename from th05/op011.cpp
rename to th05/hiscore/view.cpp
index bb2b2399..fcddb21c 100644
--- a/th05/op011.cpp
+++ b/th05/hiscore/view.cpp
@@ -1,10 +1,3 @@
-/* ReC98
- * -----
- * 2nd part of code segment #1 of TH05's OP.EXE
- */
-
-#pragma option -zCop_01_TEXT
-
 extern "C" {
 #include "platform.h"
 #include "master.hpp"
diff --git a/th05/m_char.cpp b/th05/m_char.cpp
index 5a348f91..de13d524 100644
--- a/th05/m_char.cpp
+++ b/th05/m_char.cpp
@@ -3,7 +3,7 @@
  * TH05 player character selection menu
  */
 
-#pragma option -zCop_01_TEXT
+#pragma option -zPop_01
 
 #include "platform.h"
 #include "x86real.h"
diff --git a/th05/op010.cpp b/th05/op/start.cpp
similarity index 96%
rename from th05/op010.cpp
rename to th05/op/start.cpp
index 2497d7f2..ff553f45 100644
--- a/th05/op010.cpp
+++ b/th05/op/start.cpp
@@ -1,9 +1,4 @@
-/* ReC98
- * -----
- * 1st part of code segment #1 of TH05's OP.EXE
- */
-
-#pragma option -zCop_01_TEXT
+#pragma option -zPop_01
 
 #include <process.h>
 #include "platform.h"
diff --git a/th05/op_start.cpp b/th05/op_start.cpp
new file mode 100644
index 00000000..736e3734
--- /dev/null
+++ b/th05/op_start.cpp
@@ -0,0 +1 @@
+#include "th05/op/start.cpp"
diff --git a/th05_op.asm b/th05_op.asm
index 30bf0aba..2c2caf75 100644
--- a/th05_op.asm
+++ b/th05_op.asm
@@ -28,6 +28,7 @@ include th05/op/piano.inc
 	extern _getch:proc
 	extern _strlen:proc
 
+op_01 group OP_START_TEXT, op_01_TEXT, HI_VIEW_TEXT, M_CHAR_TEXT
 g_SHARED group SHARED, SHARED_
 
 ; ===========================================================================
@@ -146,16 +147,17 @@ _TEXT		ends
 
 ; ===========================================================================
 
+OP_START_TEXT segment byte public 'CODE' use16
+	_start_game procdesc near
+	_start_extra procdesc near
+	_start_demo procdesc near
+OP_START_TEXT ends
+
 ; Segment type:	Pure code
 op_01_TEXT	segment	byte public 'CODE' use16
-		assume cs:op_01_TEXT
-		; org 0Ch
+		assume cs:op_01
 		assume es:nothing, ss:nothing, ds:_DATA, fs:nothing, gs:nothing
 
-		_start_game procdesc near
-		_start_extra procdesc near
-		_start_demo procdesc near
-
 ; =============== S U B	R O U T	I N E =======================================
 
 ; Attributes: bp-based frame
@@ -2505,9 +2507,14 @@ loc_CD64:
 		pop	bp
 		retn
 _regist_view_menu endp
+op_01_TEXT ends
 
+HI_VIEW_TEXT segment byte public 'CODE' use16
 	_cleardata_and_regist_view_sprite procdesc near
-op_01_TEXT	ends
+HI_VIEW_TEXT ends
+
+M_CHAR_TEXT segment byte public 'CODE' use16
+M_CHAR_TEXT ends
 
 ; ===========================================================================