Restructure modules

src/caffeine/alias_s.f90

@@ -1,6 +1,6 @@
 ! Copyright (c), The Regents of the University of California
 ! Terms of use are as specified in LICENSE.txt
-submodule(alias_m) alias_s
+submodule(prif:prif_private_s) alias_s
 
   implicit none
 

src/caffeine/allocation_s.f90

@@ -1,21 +1,15 @@
 ! Copyright (c), The Regents of the University of California
 ! Terms of use are as specified in LICENSE.txt
-submodule(allocation_m) allocation_s
+submodule(prif:prif_private_s) allocation_s
   use iso_c_binding, only: &
       c_sizeof, &
       c_f_pointer, &
       c_f_procpointer, &
       c_loc, &
       c_associated, &
       c_null_ptr, &
-      c_null_funptr, &
-      c_bool, &
-      c_ptrdiff_t
+      c_null_funptr
   use caffeine_h_m, only: caf_allocate, caf_deallocate, caf_this_image, as_int, as_c_ptr
-  use collective_subroutines_m, only: prif_co_sum
-  use program_termination_m, only: prif_error_stop
-  use synchronization_m, only: prif_sync_all
-  use teams_m, only: prif_team_type, current_team
 
   implicit none
 

src/caffeine/assert/assert_s.f90

@@ -12,8 +12,7 @@
 
   module procedure assert
     use caffeine_characterizable_m, only : characterizable_t
-    use program_termination_m, only: prif_error_stop
-    use image_queries_m, only: this_image => prif_this_image
+    use prif, only: prif_error_stop, this_image => prif_this_image
 
     character(len=:), allocatable :: header, trailer
     integer :: me

src/caffeine/assert/intrinsic_array_s.F90

@@ -1,6 +1,6 @@
 submodule(caffeine_intrinsic_array_m) caffeine_intrinsic_array_s
   use iso_c_binding, only: c_bool
-  use program_termination_m, only: prif_error_stop
+  use prif, only: prif_error_stop
   implicit none
 
 contains

src/caffeine/atomic_s.f90

@@ -1,6 +1,6 @@
 ! Copyright (c), The Regents of the University of California
 ! Terms of use are as specified in LICENSE.txt
-submodule(atomic_m) atomic_s
+submodule(prif:prif_private_s) atomic_s
 
   implicit none