diff --git a/fpPS4.lpi b/fpPS4.lpi
index 30ae50f..caa0d89 100644
--- a/fpPS4.lpi
+++ b/fpPS4.lpi
@@ -31,174 +31,372 @@
         <PackageName Value="LCL"/>
       </Item1>
     </RequiredPackages>
-    <Units Count="39">
+    <Units Count="91">
       <Unit0>
         <Filename Value="fpPS4.lpr"/>
         <IsPartOfProject Value="True"/>
       </Unit0>
       <Unit1>
-        <Filename Value="ps4_elf_tls.pas"/>
+        <Filename Value="chip\ps4_gpu_regs.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit1>
       <Unit2>
-        <Filename Value="ps4_libkerenel\ps4_rwlock.pas"/>
+        <Filename Value="chip\shader_dump.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit2>
       <Unit3>
-        <Filename Value="ps4_libkerenel\ps4_time.pas"/>
+        <Filename Value="vulkan\vRender.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit3>
       <Unit4>
-        <Filename Value="ps4_libkerenel\ps4_pthread.pas"/>
+        <Filename Value="vulkan\vCmdBuffer.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit4>
       <Unit5>
-        <Filename Value="ps4_libsceuserservice.pas"/>
+        <Filename Value="vulkan\vBuffer.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="ps4_libSceUserService"/>
       </Unit5>
       <Unit6>
-        <Filename Value="ps4_libkerenel\ps4_kernel_file.pas"/>
+        <Filename Value="vulkan\vSampler.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit6>
       <Unit7>
-        <Filename Value="ps4_libscesavedata.pas"/>
+        <Filename Value="vulkan\vShaderManager.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="ps4_libSceSaveData"/>
       </Unit7>
       <Unit8>
-        <Filename Value="ps4_libscenptrophy.pas"/>
+        <Filename Value="vulkan\vImageTiling.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="ps4_libSceNpTrophy"/>
       </Unit8>
       <Unit9>
-        <Filename Value="ps4_libkerenel\ps4_queue.pas"/>
+        <Filename Value="sys\sys_time.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit9>
       <Unit10>
-        <Filename Value="chip\ps4_gpu_regs.pas"/>
+        <Filename Value="vulkan\vRenderPassManager.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit10>
       <Unit11>
-        <Filename Value="chip\shader_dump.pas"/>
+        <Filename Value="ps4_elf.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit11>
       <Unit12>
-        <Filename Value="ps4_libscehttp.pas"/>
+        <Filename Value="chip\ps4_videodrv.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="ps4_libSceHttp"/>
       </Unit12>
       <Unit13>
-        <Filename Value="ps4_libscenet.pas"/>
+        <Filename Value="vulkan\vFlip.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="ps4_libSceNet"/>
       </Unit13>
       <Unit14>
-        <Filename Value="vulkan\vRender.pas"/>
+        <Filename Value="vulkan\Vulkan.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit14>
       <Unit15>
-        <Filename Value="ps4_libkernel\ps4_event_flag.pas"/>
+        <Filename Value="vulkan\vDevice.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit15>
       <Unit16>
-        <Filename Value="shaderext.pas"/>
+        <Filename Value="vulkan\vShader.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="ShaderExt"/>
       </Unit16>
       <Unit17>
-        <Filename Value="vSetLayoutPool.pas"/>
+        <Filename Value="chip\ps4_tiling.pas"/>
         <IsPartOfProject Value="True"/>
+        <UnitName Value="ps4_Tiling"/>
       </Unit17>
       <Unit18>
-        <Filename Value="vpipelinelayoutpool.pas"/>
+        <Filename Value="chip\si_ci_vi_merged_enum.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="vPipelineLayoutPool"/>
       </Unit18>
       <Unit19>
-        <Filename Value="vulkan\vSetsPool.pas"/>
+        <Filename Value="vulkan\vPipeline.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit19>
       <Unit20>
-        <Filename Value="vulkan\vCmdBuffer.pas"/>
+        <Filename Value="chip\ps4_shader.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit20>
       <Unit21>
-        <Filename Value="vulkan\vHostBufferPool.pas"/>
+        <Filename Value="vulkan\vImage.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit21>
       <Unit22>
-        <Filename Value="vulkan\vImagePool.pas"/>
+        <Filename Value="vulkan\vShaderExt.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit22>
       <Unit23>
-        <Filename Value="vulkan\vBuffer.pas"/>
+        <Filename Value="vulkan\vMemory.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit23>
       <Unit24>
-        <Filename Value="vulkan\vSamplerPool.pas"/>
+        <Filename Value="chip\ps4_pssl.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit24>
       <Unit25>
-        <Filename Value="vulkan\vSampler.pas"/>
+        <Filename Value="vulkan\vImageManager.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit25>
       <Unit26>
-        <Filename Value="vulkan\vShaderManager.pas"/>
+        <Filename Value="vulkan\vSamplerManager.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit26>
       <Unit27>
-        <Filename Value="vulkan\vImageTiling.pas"/>
+        <Filename Value="vulkan\vHostBufferManager.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit27>
       <Unit28>
-        <Filename Value="trace_manager.pas"/>
+        <Filename Value="chip\pm4defs.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit28>
       <Unit29>
-        <Filename Value="ps4_libkernel\ps4_signal.pas"/>
+        <Filename Value="rtl\ntapi.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit29>
       <Unit30>
-        <Filename Value="ps4_libkernel\regs_context.pas"/>
+        <Filename Value="sys\errno.inc"/>
         <IsPartOfProject Value="True"/>
       </Unit30>
       <Unit31>
-        <Filename Value="ps4_libkernel\kernel.pas"/>
+        <Filename Value="sys\spinlock.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit31>
       <Unit32>
-        <Filename Value="ps4_libkernel\pthread.pas"/>
+        <Filename Value="rtl\LFQueue.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="sys_pthread"/>
       </Unit32>
       <Unit33>
-        <Filename Value="ps4_libkernel\sys_signal.pas"/>
+        <Filename Value="sys\sce_errno.inc"/>
         <IsPartOfProject Value="True"/>
       </Unit33>
       <Unit34>
-        <Filename Value="sys\sys_time.pas"/>
+        <Filename Value="rtl\g23tree.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit34>
       <Unit35>
-        <Filename Value="ps4_libsceime.pas"/>
+        <Filename Value="vulkan\vPipelineLayoutManager.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="ps4_libSceIme"/>
       </Unit35>
       <Unit36>
-        <Filename Value="ps4_libscediscmap.pas"/>
+        <Filename Value="vulkan\vSetsPoolManager.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="ps4_libSceDiscMap"/>
       </Unit36>
       <Unit37>
-        <Filename Value="ps4_libsceplaygo.pas"/>
+        <Filename Value="rtl\RWLock.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="ps4_libScePlayGo"/>
       </Unit37>
       <Unit38>
-        <Filename Value="vulkan\vRenderPassManager.pas"/>
+        <Filename Value="chip\si_ci_vi_merged_registers.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit38>
+      <Unit39>
+        <Filename Value="chip\si_ci_vi_merged_offset.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit39>
+      <Unit40>
+        <Filename Value="vulkan\vSetLayoutManager.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit40>
+      <Unit41>
+        <Filename Value="sys\sys_crt.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit41>
+      <Unit42>
+        <Filename Value="rtl\stub_manager.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit42>
+      <Unit43>
+        <Filename Value="kernel\libsysmodule.inc"/>
+        <IsPartOfProject Value="True"/>
+      </Unit43>
+      <Unit44>
+        <Filename Value="kernel\StopNotificationReason.inc"/>
+        <IsPartOfProject Value="True"/>
+      </Unit44>
+      <Unit45>
+        <Filename Value="kernel\ps4_barrier.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit45>
+      <Unit46>
+        <Filename Value="kernel\ps4_cond.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit46>
+      <Unit47>
+        <Filename Value="kernel\ps4_event_flag.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit47>
+      <Unit48>
+        <Filename Value="kernel\ps4_kernel_file.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit48>
+      <Unit49>
+        <Filename Value="kernel\ps4_libkernel.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit49>
+      <Unit50>
+        <Filename Value="kernel\ps4_map_mm.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit50>
+      <Unit51>
+        <Filename Value="kernel\ps4_mutex.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit51>
+      <Unit52>
+        <Filename Value="kernel\ps4_pthread.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit52>
+      <Unit53>
+        <Filename Value="kernel\ps4_queue.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit53>
+      <Unit54>
+        <Filename Value="kernel\ps4_rwlock.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit54>
+      <Unit55>
+        <Filename Value="kernel\ps4_sema.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit55>
+      <Unit56>
+        <Filename Value="kernel\ps4_signal.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit56>
+      <Unit57>
+        <Filename Value="kernel\ps4_time.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit57>
+      <Unit58>
+        <Filename Value="rtl\atomic.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit58>
+      <Unit59>
+        <Filename Value="rtl\bittype.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit59>
+      <Unit60>
+        <Filename Value="rtl\hamt.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit60>
+      <Unit61>
+        <Filename Value="rtl\ps4_elf_tls.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit61>
+      <Unit62>
+        <Filename Value="rtl\ps4_handles.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit62>
+      <Unit63>
+        <Filename Value="rtl\seh64.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit63>
+      <Unit64>
+        <Filename Value="src\ps4_libsceappcontent.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit64>
+      <Unit65>
+        <Filename Value="src\ps4_libscedialogs.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit65>
+      <Unit66>
+        <Filename Value="src\ps4_libscediscmap.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit66>
+      <Unit67>
+        <Filename Value="src\ps4_libscegnmdriver.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit67>
+      <Unit68>
+        <Filename Value="src\ps4_libscehttp.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit68>
+      <Unit69>
+        <Filename Value="src\ps4_libsceime.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit69>
+      <Unit70>
+        <Filename Value="src\ps4_libscemouse.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit70>
+      <Unit71>
+        <Filename Value="src\ps4_libscenet.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit71>
+      <Unit72>
+        <Filename Value="src\ps4_libscepad.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit72>
+      <Unit73>
+        <Filename Value="src\ps4_libsceplaygo.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit73>
+      <Unit74>
+        <Filename Value="src\ps4_libsceremoteplay.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit74>
+      <Unit75>
+        <Filename Value="src\ps4_libscertc.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit75>
+      <Unit76>
+        <Filename Value="src\ps4_libscesavedata.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit76>
+      <Unit77>
+        <Filename Value="src\ps4_libscesystemservice.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit77>
+      <Unit78>
+        <Filename Value="src\ps4_libsceuserservice.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit78>
+      <Unit79>
+        <Filename Value="src\ps4_libscevideoout.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit79>
+      <Unit80>
+        <Filename Value="src\ajm\ajm_error.inc"/>
+        <IsPartOfProject Value="True"/>
+      </Unit80>
+      <Unit81>
+        <Filename Value="src\ajm\ps4_libsceajm.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit81>
+      <Unit82>
+        <Filename Value="src\audio\libportaudio.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit82>
+      <Unit83>
+        <Filename Value="src\audio\ps4_libsceaudioout.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit83>
+      <Unit84>
+        <Filename Value="src\np\ps4_libscenpmanager.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit84>
+      <Unit85>
+        <Filename Value="src\np\ps4_libscenpmatching2.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit85>
+      <Unit86>
+        <Filename Value="src\np\ps4_libscenpscore.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit86>
+      <Unit87>
+        <Filename Value="src\np\ps4_libscenpsignaling.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit87>
+      <Unit88>
+        <Filename Value="src\np\ps4_libscenptrophy.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit88>
+      <Unit89>
+        <Filename Value="sys\signal.inc"/>
+        <IsPartOfProject Value="True"/>
+      </Unit89>
+      <Unit90>
+        <Filename Value="sys\sys_context.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit90>
     </Units>
   </ProjectOptions>
   <CompilerOptions>
@@ -208,9 +406,9 @@
       <Filename Value="fpPS4"/>
     </Target>
     <SearchPaths>
-      <IncludeFiles Value="$(ProjOutDir)"/>
+      <IncludeFiles Value="$(ProjOutDir);kernel;src\ajm;sys"/>
       <Libraries Value="static"/>
-      <OtherUnitFiles Value="rtl;sys;ps4_libkernel;vulkan;chip;spirv"/>
+      <OtherUnitFiles Value="rtl;sys;vulkan;chip;spirv;kernel;src;src\ajm;src\audio;src\np"/>
       <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Parsing>
diff --git a/ps4_libkernel/StopNotificationReason.inc b/kernel/StopNotificationReason.inc
similarity index 100%
rename from ps4_libkernel/StopNotificationReason.inc
rename to kernel/StopNotificationReason.inc
diff --git a/ps4_libkernel/libsysmodule.inc b/kernel/libsysmodule.inc
similarity index 100%
rename from ps4_libkernel/libsysmodule.inc
rename to kernel/libsysmodule.inc
diff --git a/ps4_libkernel/ps4_barrier.pas b/kernel/ps4_barrier.pas
similarity index 100%
rename from ps4_libkernel/ps4_barrier.pas
rename to kernel/ps4_barrier.pas
diff --git a/ps4_libkernel/ps4_cond.pas b/kernel/ps4_cond.pas
similarity index 100%
rename from ps4_libkernel/ps4_cond.pas
rename to kernel/ps4_cond.pas
diff --git a/ps4_libkernel/ps4_event_flag.pas b/kernel/ps4_event_flag.pas
similarity index 100%
rename from ps4_libkernel/ps4_event_flag.pas
rename to kernel/ps4_event_flag.pas
diff --git a/ps4_libkernel/ps4_kernel_file.pas b/kernel/ps4_kernel_file.pas
similarity index 100%
rename from ps4_libkernel/ps4_kernel_file.pas
rename to kernel/ps4_kernel_file.pas
diff --git a/ps4_libkernel/ps4_libkernel.pas b/kernel/ps4_libkernel.pas
similarity index 100%
rename from ps4_libkernel/ps4_libkernel.pas
rename to kernel/ps4_libkernel.pas
diff --git a/ps4_libkernel/ps4_map_mm.pas b/kernel/ps4_map_mm.pas
similarity index 100%
rename from ps4_libkernel/ps4_map_mm.pas
rename to kernel/ps4_map_mm.pas
diff --git a/ps4_libkernel/ps4_mutex.pas b/kernel/ps4_mutex.pas
similarity index 100%
rename from ps4_libkernel/ps4_mutex.pas
rename to kernel/ps4_mutex.pas
diff --git a/ps4_libkernel/ps4_pthread.pas b/kernel/ps4_pthread.pas
similarity index 100%
rename from ps4_libkernel/ps4_pthread.pas
rename to kernel/ps4_pthread.pas
diff --git a/ps4_libkernel/ps4_queue.pas b/kernel/ps4_queue.pas
similarity index 100%
rename from ps4_libkernel/ps4_queue.pas
rename to kernel/ps4_queue.pas
diff --git a/ps4_libkernel/ps4_rwlock.pas b/kernel/ps4_rwlock.pas
similarity index 100%
rename from ps4_libkernel/ps4_rwlock.pas
rename to kernel/ps4_rwlock.pas
diff --git a/ps4_libkernel/ps4_sema.pas b/kernel/ps4_sema.pas
similarity index 100%
rename from ps4_libkernel/ps4_sema.pas
rename to kernel/ps4_sema.pas
diff --git a/ps4_libkernel/ps4_signal.pas b/kernel/ps4_signal.pas
similarity index 100%
rename from ps4_libkernel/ps4_signal.pas
rename to kernel/ps4_signal.pas
diff --git a/ps4_libkernel/ps4_time.pas b/kernel/ps4_time.pas
similarity index 100%
rename from ps4_libkernel/ps4_time.pas
rename to kernel/ps4_time.pas
diff --git a/ps4_elf_tls.pas b/rtl/ps4_elf_tls.pas
similarity index 100%
rename from ps4_elf_tls.pas
rename to rtl/ps4_elf_tls.pas
diff --git a/ps4_handles.pas b/rtl/ps4_handles.pas
similarity index 100%
rename from ps4_handles.pas
rename to rtl/ps4_handles.pas
diff --git a/seh64.pas b/rtl/seh64.pas
similarity index 100%
rename from seh64.pas
rename to rtl/seh64.pas
diff --git a/trace_manager.pas b/rtl/trace_manager.pas
similarity index 100%
rename from trace_manager.pas
rename to rtl/trace_manager.pas
diff --git a/ajm_error.inc b/src/ajm/ajm_error.inc
similarity index 100%
rename from ajm_error.inc
rename to src/ajm/ajm_error.inc
diff --git a/ps4_libsceajm.pas b/src/ajm/ps4_libsceajm.pas
similarity index 100%
rename from ps4_libsceajm.pas
rename to src/ajm/ps4_libsceajm.pas
diff --git a/libportaudio.pas b/src/audio/libportaudio.pas
similarity index 100%
rename from libportaudio.pas
rename to src/audio/libportaudio.pas
diff --git a/ps4_libsceaudioout.pas b/src/audio/ps4_libsceaudioout.pas
similarity index 100%
rename from ps4_libsceaudioout.pas
rename to src/audio/ps4_libsceaudioout.pas
diff --git a/ps4_libscenpmanager.pas b/src/np/ps4_libscenpmanager.pas
similarity index 100%
rename from ps4_libscenpmanager.pas
rename to src/np/ps4_libscenpmanager.pas
diff --git a/ps4_libscenpmatching2.pas b/src/np/ps4_libscenpmatching2.pas
similarity index 100%
rename from ps4_libscenpmatching2.pas
rename to src/np/ps4_libscenpmatching2.pas
diff --git a/ps4_libscenpscore.pas b/src/np/ps4_libscenpscore.pas
similarity index 100%
rename from ps4_libscenpscore.pas
rename to src/np/ps4_libscenpscore.pas
diff --git a/ps4_libscenpsignaling.pas b/src/np/ps4_libscenpsignaling.pas
similarity index 100%
rename from ps4_libscenpsignaling.pas
rename to src/np/ps4_libscenpsignaling.pas
diff --git a/ps4_libscenptrophy.pas b/src/np/ps4_libscenptrophy.pas
similarity index 100%
rename from ps4_libscenptrophy.pas
rename to src/np/ps4_libscenptrophy.pas
diff --git a/ps4_libsceappcontent.pas b/src/ps4_libsceappcontent.pas
similarity index 100%
rename from ps4_libsceappcontent.pas
rename to src/ps4_libsceappcontent.pas
diff --git a/ps4_libscedialogs.pas b/src/ps4_libscedialogs.pas
similarity index 100%
rename from ps4_libscedialogs.pas
rename to src/ps4_libscedialogs.pas
diff --git a/ps4_libscediscmap.pas b/src/ps4_libscediscmap.pas
similarity index 100%
rename from ps4_libscediscmap.pas
rename to src/ps4_libscediscmap.pas
diff --git a/ps4_libscegnmdriver.pas b/src/ps4_libscegnmdriver.pas
similarity index 100%
rename from ps4_libscegnmdriver.pas
rename to src/ps4_libscegnmdriver.pas
diff --git a/ps4_libscehttp.pas b/src/ps4_libscehttp.pas
similarity index 100%
rename from ps4_libscehttp.pas
rename to src/ps4_libscehttp.pas
diff --git a/ps4_libsceime.pas b/src/ps4_libsceime.pas
similarity index 100%
rename from ps4_libsceime.pas
rename to src/ps4_libsceime.pas
diff --git a/ps4_libscemouse.pas b/src/ps4_libscemouse.pas
similarity index 100%
rename from ps4_libscemouse.pas
rename to src/ps4_libscemouse.pas
diff --git a/ps4_libscenet.pas b/src/ps4_libscenet.pas
similarity index 100%
rename from ps4_libscenet.pas
rename to src/ps4_libscenet.pas
diff --git a/ps4_libscepad.pas b/src/ps4_libscepad.pas
similarity index 100%
rename from ps4_libscepad.pas
rename to src/ps4_libscepad.pas
diff --git a/ps4_libsceplaygo.pas b/src/ps4_libsceplaygo.pas
similarity index 100%
rename from ps4_libsceplaygo.pas
rename to src/ps4_libsceplaygo.pas
diff --git a/ps4_libsceremoteplay.pas b/src/ps4_libsceremoteplay.pas
similarity index 100%
rename from ps4_libsceremoteplay.pas
rename to src/ps4_libsceremoteplay.pas
diff --git a/ps4_libscertc.pas b/src/ps4_libscertc.pas
similarity index 100%
rename from ps4_libscertc.pas
rename to src/ps4_libscertc.pas
diff --git a/ps4_libscesavedata.pas b/src/ps4_libscesavedata.pas
similarity index 100%
rename from ps4_libscesavedata.pas
rename to src/ps4_libscesavedata.pas
diff --git a/ps4_libscesystemservice.pas b/src/ps4_libscesystemservice.pas
similarity index 100%
rename from ps4_libscesystemservice.pas
rename to src/ps4_libscesystemservice.pas
diff --git a/ps4_libsceuserservice.pas b/src/ps4_libsceuserservice.pas
similarity index 100%
rename from ps4_libsceuserservice.pas
rename to src/ps4_libsceuserservice.pas
diff --git a/ps4_libscevideoout.pas b/src/ps4_libscevideoout.pas
similarity index 100%
rename from ps4_libscevideoout.pas
rename to src/ps4_libscevideoout.pas
diff --git a/tools/elf_sym/elf_sym.lpi b/tools/elf_sym/elf_sym.lpi
index 12121d2..2c59e25 100644
--- a/tools/elf_sym/elf_sym.lpi
+++ b/tools/elf_sym/elf_sym.lpi
@@ -47,7 +47,7 @@
     </Target>
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)"/>
-      <OtherUnitFiles Value="..\.."/>
+      <OtherUnitFiles Value="..\..\sys"/>
       <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <CodeGeneration>
diff --git a/tools/elf_sym/elf_sym.lpr b/tools/elf_sym/elf_sym.lpr
index 78b9a12..3d9356d 100644
--- a/tools/elf_sym/elf_sym.lpr
+++ b/tools/elf_sym/elf_sym.lpr
@@ -4,10 +4,11 @@ uses
  cmem,
  cthreads,
  {$ENDIF}
- Classes,sysutils,
+ Classes,
+ sysutils,
  gset,
  sha1,
- ps4_types,
+ sys_types,
  uarch;
 
 type