From 751506408bac8b487186796dd886db35beaa2616 Mon Sep 17 00:00:00 2001
From: Jim Pivarski <jpivarski@users.noreply.github.com>
Date: Mon, 14 Oct 2019 08:19:12 -0500
Subject: [PATCH] Put all array classes in an 'array' directory ('include',
 'src', and '_numba'). (#17)

---
 CMakeLists.txt                                |  2 +-
 Doxyfile                                      |  2 +-
 VERSION_INFO                                  |  2 +-
 awkward1/_numba/__init__.py                   |  6 +--
 awkward1/_numba/array/__init__.py             |  1 +
 awkward1/_numba/{ => array}/listarray.py      | 14 ++---
 .../_numba/{ => array}/listoffsetarray.py     | 18 +++----
 awkward1/_numba/{ => array}/numpyarray.py     |  2 +-
 awkward1/_numba/util.py                       |  4 +-
 awkward1/signatures/Content_8cpp.xml          |  4 +-
 awkward1/signatures/ListArray_8cpp.xml        | 26 +++++-----
 awkward1/signatures/ListOffsetArray_8cpp.xml  | 42 +++++++--------
 awkward1/signatures/NumpyArray_8cpp.xml       | 18 +++----
 awkward1/signatures/getitem_8cpp.xml          | 52 +++++++++----------
 include/awkward/{ => array}/ListArray.h       |  0
 include/awkward/{ => array}/ListOffsetArray.h |  0
 include/awkward/{ => array}/NumpyArray.h      |  0
 include/awkward/{ => array}/RawArray.h        |  0
 src/libawkward/Content.cpp                    |  2 +-
 src/libawkward/{ => array}/ListArray.cpp      |  4 +-
 .../{ => array}/ListOffsetArray.cpp           |  4 +-
 src/libawkward/{ => array}/NumpyArray.cpp     |  2 +-
 src/pyawkward.cpp                             |  6 +--
 ...test_PR016_finish_getitem_for_rawarray.cpp |  6 +--
 24 files changed, 109 insertions(+), 108 deletions(-)
 create mode 100644 awkward1/_numba/array/__init__.py
 rename awkward1/_numba/{ => array}/listarray.py (97%)
 rename awkward1/_numba/{ => array}/listoffsetarray.py (97%)
 rename awkward1/_numba/{ => array}/numpyarray.py (99%)
 rename include/awkward/{ => array}/ListArray.h (100%)
 rename include/awkward/{ => array}/ListOffsetArray.h (100%)
 rename include/awkward/{ => array}/NumpyArray.h (100%)
 rename include/awkward/{ => array}/RawArray.h (100%)
 rename src/libawkward/{ => array}/ListArray.cpp (99%)
 rename src/libawkward/{ => array}/ListOffsetArray.cpp (99%)
 rename src/libawkward/{ => array}/NumpyArray.cpp (99%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7b1d712606..8dfafc9b4a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,7 +19,7 @@ add_definitions(-DVERSION_INFO="${VERSION_INFO}")
 set(CMAKE_MACOSX_RPATH 1)
 
 file(GLOB CPU_KERNEL_SOURCES "src/cpu-kernels/*.cpp")
-file(GLOB LIBAWKWARD_SOURCES "src/libawkward/*.cpp")
+file(GLOB LIBAWKWARD_SOURCES "src/libawkward/*.cpp" "src/libawkward/array/*.cpp")
 include_directories(include)
 
 add_subdirectory(pybind11)
diff --git a/Doxyfile b/Doxyfile
index 5452423570..f93ef45aa0 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -829,7 +829,7 @@ WARN_LOGFILE           =
 # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
 # Note: If this tag is empty the current directory is searched.
 
-INPUT                  = src/cpu-kernels src/libawkward
+INPUT                  = src/cpu-kernels src/libawkward src/libawkward/array
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
diff --git a/VERSION_INFO b/VERSION_INFO
index 7ac4e5e38f..71d6a66eda 100644
--- a/VERSION_INFO
+++ b/VERSION_INFO
@@ -1 +1 @@
-0.1.13
+0.1.14
diff --git a/awkward1/_numba/__init__.py b/awkward1/_numba/__init__.py
index dae1713042..ab50f5cb90 100644
--- a/awkward1/_numba/__init__.py
+++ b/awkward1/_numba/__init__.py
@@ -11,6 +11,6 @@
     import awkward1._numba.identity
     import awkward1._numba.content
     import awkward1._numba.iterator
-    import awkward1._numba.numpyarray
-    import awkward1._numba.listarray
-    import awkward1._numba.listoffsetarray
+    import awkward1._numba.array.numpyarray
+    import awkward1._numba.array.listarray
+    import awkward1._numba.array.listoffsetarray
diff --git a/awkward1/_numba/array/__init__.py b/awkward1/_numba/array/__init__.py
new file mode 100644
index 0000000000..76ca65bb4e
--- /dev/null
+++ b/awkward1/_numba/array/__init__.py
@@ -0,0 +1 @@
+# BSD 3-Clause License; see https://github.com/jpivarski/awkward-1.0/blob/master/LICENSE
diff --git a/awkward1/_numba/listarray.py b/awkward1/_numba/array/listarray.py
similarity index 97%
rename from awkward1/_numba/listarray.py
rename to awkward1/_numba/array/listarray.py
index 37ae7b81fa..2056d47b61 100644
--- a/awkward1/_numba/listarray.py
+++ b/awkward1/_numba/array/listarray.py
@@ -8,7 +8,7 @@
 import numba.typing.ctypes_utils
 
 import awkward1.layout
-from .._numba import cpu, util, content
+from ..._numba import cpu, util, content
 
 @numba.extending.typeof_impl.register(awkward1.layout.ListArray32)
 @numba.extending.typeof_impl.register(awkward1.layout.ListArray64)
@@ -47,7 +47,7 @@ def getitem_tuple(self, wheretpe):
         return outtpe.getitem_int()
 
     def getitem_next(self, wheretpe, isadvanced):
-        import awkward1._numba.listoffsetarray
+        import awkward1._numba.array.listoffsetarray
         if len(wheretpe.types) == 0:
             return self
         headtpe = wheretpe.types[0]
@@ -58,7 +58,7 @@ def getitem_next(self, wheretpe, isadvanced):
 
         elif isinstance(headtpe, numba.types.SliceType):
             contenttpe = self.contenttpe.carry().getitem_next(tailtpe, isadvanced)
-            return awkward1._numba.listoffsetarray.ListOffsetArrayType(util.indextpe(self.bitwidth), contenttpe, self.idtpe)
+            return awkward1._numba.array.listoffsetarray.ListOffsetArrayType(util.indextpe(self.bitwidth), contenttpe, self.idtpe)
 
         elif isinstance(headtpe, numba.types.EllipsisType):
             raise NotImplementedError("ellipsis")
@@ -71,7 +71,7 @@ def getitem_next(self, wheretpe, isadvanced):
                 raise NotImplementedError("array.ndim != 1")
             contenttpe = self.contenttpe.carry().getitem_next(tailtpe, True)
             if not isadvanced:
-                return awkward1._numba.listoffsetarray.ListOffsetArrayType(util.indextpe(self.bitwidth), contenttpe, self.idtpe)
+                return awkward1._numba.array.listoffsetarray.ListOffsetArrayType(util.indextpe(self.bitwidth), contenttpe, self.idtpe)
             else:
                 return contenttpe
 
@@ -238,7 +238,7 @@ def lower_getitem_other(context, builder, sig, args):
     return lower_getitem_tuple(context, builder, rettpe(arraytpe, wrappedtpe), (arrayval, wrappedval))
 
 def lower_getitem_next(context, builder, arraytpe, wheretpe, arrayval, whereval, advanced):
-    import awkward1._numba.listoffsetarray
+    import awkward1._numba.array.listoffsetarray
 
     if len(wheretpe.types) == 0:
         return arrayval
@@ -349,7 +349,7 @@ def lower_getitem_next(context, builder, arraytpe, wheretpe, arrayval, whereval,
             outcontenttpe = nextcontenttpe.getitem_next(tailtpe, True)
             outcontentval = nextcontenttpe.lower_getitem_next(context, builder, nextcontenttpe, tailtpe, nextcontentval, tailval, nextadvanced)
 
-        outtpe = awkward1._numba.listoffsetarray.ListOffsetArrayType(util.indextpe(arraytpe.bitwidth), outcontenttpe, arraytpe.idtpe)
+        outtpe = awkward1._numba.array.listoffsetarray.ListOffsetArrayType(util.indextpe(arraytpe.bitwidth), outcontenttpe, arraytpe.idtpe)
         proxyout = numba.cgutils.create_struct_proxy(outtpe)(context, builder)
         proxyout.offsets = nextoffsets
         proxyout.content = outcontentval
@@ -404,7 +404,7 @@ def lower_getitem_next(context, builder, arraytpe, wheretpe, arrayval, whereval,
             contenttpe = nexttpe.getitem_next(tailtpe, True)
             contentval = nexttpe.lower_getitem_next(context, builder, nexttpe, tailtpe, nextval, tailval, nextadvanced)
 
-            outtpe = awkward1._numba.listoffsetarray.ListOffsetArrayType(util.indextpe(arraytpe.bitwidth), contenttpe, arraytpe.idtpe)
+            outtpe = awkward1._numba.array.listoffsetarray.ListOffsetArrayType(util.indextpe(arraytpe.bitwidth), contenttpe, arraytpe.idtpe)
             proxyout = numba.cgutils.create_struct_proxy(outtpe)(context, builder)
             proxyout.offsets = nextoffsets
             proxyout.content = contentval
diff --git a/awkward1/_numba/listoffsetarray.py b/awkward1/_numba/array/listoffsetarray.py
similarity index 97%
rename from awkward1/_numba/listoffsetarray.py
rename to awkward1/_numba/array/listoffsetarray.py
index e6a1e21cd5..e6c3098f94 100644
--- a/awkward1/_numba/listoffsetarray.py
+++ b/awkward1/_numba/array/listoffsetarray.py
@@ -7,7 +7,7 @@
 import numba.typing.arraydecl
 
 import awkward1.layout
-from .._numba import cpu, util, content
+from ..._numba import cpu, util, content
 
 @numba.extending.typeof_impl.register(awkward1.layout.ListOffsetArray32)
 @numba.extending.typeof_impl.register(awkward1.layout.ListOffsetArray64)
@@ -36,8 +36,8 @@ def getitem_range(self):
         return self
 
     def getitem_tuple(self, wheretpe):
-        import awkward1._numba.listarray
-        nexttpe = awkward1._numba.listarray.ListArrayType(util.index64tpe, util.index64tpe, self, numba.none)
+        import awkward1._numba.array.listarray
+        nexttpe = awkward1._numba.array.listarray.ListArrayType(util.index64tpe, util.index64tpe, self, numba.none)
         out = nexttpe.getitem_next(wheretpe, False)
         return out.getitem_int()
 
@@ -73,8 +73,8 @@ def getitem_next(self, wheretpe, isadvanced):
             raise AssertionError(headtpe)
 
     def carry(self):
-        import awkward1._numba.listarray
-        return awkward1._numba.listarray.ListArrayType(self.offsetstpe, self.offsetstpe, self.contenttpe, self.idtpe)
+        import awkward1._numba.array.listarray
+        return awkward1._numba.array.listarray.ListArrayType(self.offsetstpe, self.offsetstpe, self.contenttpe, self.idtpe)
 
     @property
     def lower_len(self):
@@ -251,7 +251,7 @@ def starts_stops(context, builder, offsetstpe, offsetsval, lenstarts, lenoffsets
     return starts, stops
 
 def lower_getitem_next(context, builder, arraytpe, wheretpe, arrayval, whereval, advanced):
-    import awkward1._numba.listarray
+    import awkward1._numba.array.listarray
 
     if len(wheretpe.types) == 0:
         return arrayval
@@ -361,7 +361,7 @@ def lower_getitem_next(context, builder, arraytpe, wheretpe, arrayval, whereval,
             outcontenttpe = nextcontenttpe.getitem_next(tailtpe, True)
             outcontentval = nextcontenttpe.lower_getitem_next(context, builder, nextcontenttpe, tailtpe, nextcontentval, tailval, nextadvanced)
 
-        outtpe = awkward1._numba.listoffsetarray.ListOffsetArrayType(util.indextpe(arraytpe.bitwidth), outcontenttpe, arraytpe.idtpe)
+        outtpe = awkward1._numba.array.listoffsetarray.ListOffsetArrayType(util.indextpe(arraytpe.bitwidth), outcontenttpe, arraytpe.idtpe)
         proxyout = numba.cgutils.create_struct_proxy(outtpe)(context, builder)
         proxyout.offsets = nextoffsets
         proxyout.content = outcontentval
@@ -457,7 +457,7 @@ def lower_getitem_next(context, builder, arraytpe, wheretpe, arrayval, whereval,
         raise AssertionError(headtpe)
 
 def lower_carry(context, builder, arraytpe, carrytpe, arrayval, carryval):
-    import awkward1._numba.listarray
+    import awkward1._numba.array.listarray
 
     proxyin = numba.cgutils.create_struct_proxy(arraytpe)(context, builder, value=arrayval)
     lenoffsets = util.arraylen(context, builder, arraytpe.offsetstpe, proxyin.offsets, totpe=numba.int64)
@@ -465,7 +465,7 @@ def lower_carry(context, builder, arraytpe, carrytpe, arrayval, carryval):
 
     starts, stops = starts_stops(context, builder, arraytpe.offsetstpe, proxyin.offsets, lenstarts, lenoffsets)
 
-    proxyout = numba.cgutils.create_struct_proxy(awkward1._numba.listarray.ListArrayType(arraytpe.offsetstpe, arraytpe.offsetstpe, arraytpe.contenttpe, arraytpe.idtpe))(context, builder)
+    proxyout = numba.cgutils.create_struct_proxy(awkward1._numba.array.listarray.ListArrayType(arraytpe.offsetstpe, arraytpe.offsetstpe, arraytpe.contenttpe, arraytpe.idtpe))(context, builder)
     proxyout.starts = numba.targets.arrayobj.fancy_getitem_array(context, builder, arraytpe.offsetstpe(arraytpe.offsetstpe, carrytpe), (starts, carryval))
     proxyout.stops = numba.targets.arrayobj.fancy_getitem_array(context, builder, arraytpe.offsetstpe(arraytpe.offsetstpe, carrytpe), (stops, carryval))
 
diff --git a/awkward1/_numba/numpyarray.py b/awkward1/_numba/array/numpyarray.py
similarity index 99%
rename from awkward1/_numba/numpyarray.py
rename to awkward1/_numba/array/numpyarray.py
index 6aeebf6800..5e2776ae8e 100644
--- a/awkward1/_numba/numpyarray.py
+++ b/awkward1/_numba/array/numpyarray.py
@@ -8,7 +8,7 @@
 import numba.typing.ctypes_utils
 
 import awkward1.layout
-from .._numba import cpu, util, identity, content
+from ..._numba import cpu, util, identity, content
 
 @numba.extending.typeof_impl.register(awkward1.layout.NumpyArray)
 def typeof(val, c):
diff --git a/awkward1/_numba/util.py b/awkward1/_numba/util.py
index da9a854e31..c11852b1cc 100644
--- a/awkward1/_numba/util.py
+++ b/awkward1/_numba/util.py
@@ -222,10 +222,10 @@ def preprocess_slicetuple(context, builder, wheretpe, whereval):
     return wheretpe3, whereval3
 
 def wrap_for_slicetuple(context, builder, arraytpe, arrayval):
-    import awkward1._numba.listarray
+    import awkward1._numba.array.listarray
 
     length = arraylen(context, builder, arraytpe, arrayval, totpe=numba.int64)
-    nexttpe = awkward1._numba.listarray.ListArrayType(index64tpe, index64tpe, arraytpe, numba.types.none)
+    nexttpe = awkward1._numba.array.listarray.ListArrayType(index64tpe, index64tpe, arraytpe, numba.types.none)
     proxynext = numba.cgutils.create_struct_proxy(nexttpe)(context, builder)
     proxynext.starts = newindex64(context, builder, numba.int64, context.get_constant(numba.int64, 1))
     proxynext.stops = newindex64(context, builder, numba.int64, context.get_constant(numba.int64, 1))
diff --git a/awkward1/signatures/Content_8cpp.xml b/awkward1/signatures/Content_8cpp.xml
index 6d83197627..6df78d0b02 100644
--- a/awkward1/signatures/Content_8cpp.xml
+++ b/awkward1/signatures/Content_8cpp.xml
@@ -2,7 +2,7 @@
 <doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="1.8.16">
   <compounddef id="Content_8cpp" kind="file" language="C++">
     <compoundname>Content.cpp</compoundname>
-    <includes local="yes">awkward/ListArray.h</includes>
+    <includes local="yes">awkward/array/ListArray.h</includes>
     <includes local="yes">awkward/Content.h</includes>
     <incdepgraph>
       <node id="1">
@@ -17,7 +17,7 @@
         <label>awkward/Content.h</label>
       </node>
       <node id="2">
-        <label>awkward/ListArray.h</label>
+        <label>awkward/array/ListArray.h</label>
       </node>
     </incdepgraph>
     <innernamespace refid="namespaceawkward">awkward</innernamespace>
diff --git a/awkward1/signatures/ListArray_8cpp.xml b/awkward1/signatures/ListArray_8cpp.xml
index a3f0c35f85..de9e0bec3e 100644
--- a/awkward1/signatures/ListArray_8cpp.xml
+++ b/awkward1/signatures/ListArray_8cpp.xml
@@ -7,17 +7,14 @@
     <includes local="yes">awkward/cpu-kernels/identity.h</includes>
     <includes local="yes">awkward/cpu-kernels/getitem.h</includes>
     <includes local="yes">awkward/Slice.h</includes>
-    <includes local="yes">awkward/ListOffsetArray.h</includes>
-    <includes local="yes">awkward/ListArray.h</includes>
+    <includes local="yes">awkward/array/ListOffsetArray.h</includes>
+    <includes local="yes">awkward/array/ListArray.h</includes>
     <incdepgraph>
       <node id="5">
         <label>awkward/cpu-kernels/getitem.h</label>
       </node>
-      <node id="4">
-        <label>awkward/cpu-kernels/identity.h</label>
-      </node>
       <node id="1">
-        <label>src/libawkward/ListArray.cpp</label>
+        <label>src/libawkward/array/ListArray.cpp</label>
         <link refid="ListArray_8cpp"/>
         <childnode refid="2" relation="include">
         </childnode>
@@ -34,27 +31,30 @@
         <childnode refid="8" relation="include">
         </childnode>
       </node>
+      <node id="4">
+        <label>awkward/cpu-kernels/identity.h</label>
+      </node>
+      <node id="7">
+        <label>awkward/array/ListOffsetArray.h</label>
+      </node>
       <node id="2">
         <label>sstream</label>
       </node>
+      <node id="8">
+        <label>awkward/array/ListArray.h</label>
+      </node>
       <node id="6">
         <label>awkward/Slice.h</label>
       </node>
-      <node id="7">
-        <label>awkward/ListOffsetArray.h</label>
-      </node>
       <node id="3">
         <label>type_traits</label>
       </node>
-      <node id="8">
-        <label>awkward/ListArray.h</label>
-      </node>
     </incdepgraph>
     <innernamespace refid="namespaceawkward">awkward</innernamespace>
     <briefdescription>
     </briefdescription>
     <detaileddescription>
     </detaileddescription>
-    <location file="src/libawkward/ListArray.cpp"/>
+    <location file="src/libawkward/array/ListArray.cpp"/>
   </compounddef>
 </doxygen>
diff --git a/awkward1/signatures/ListOffsetArray_8cpp.xml b/awkward1/signatures/ListOffsetArray_8cpp.xml
index b364c480ee..865e812ee9 100644
--- a/awkward1/signatures/ListOffsetArray_8cpp.xml
+++ b/awkward1/signatures/ListOffsetArray_8cpp.xml
@@ -7,8 +7,8 @@
     <includes local="yes">awkward/cpu-kernels/identity.h</includes>
     <includes local="yes">awkward/cpu-kernels/getitem.h</includes>
     <includes local="yes">awkward/Slice.h</includes>
-    <includes local="yes">awkward/ListArray.h</includes>
-    <includes local="yes">awkward/ListOffsetArray.h</includes>
+    <includes local="yes">awkward/array/ListArray.h</includes>
+    <includes local="yes">awkward/array/ListOffsetArray.h</includes>
     <incdepgraph>
       <node id="5">
         <label>awkward/cpu-kernels/getitem.h</label>
@@ -16,23 +16,8 @@
       <node id="4">
         <label>awkward/cpu-kernels/identity.h</label>
       </node>
-      <node id="2">
-        <label>sstream</label>
-      </node>
-      <node id="6">
-        <label>awkward/Slice.h</label>
-      </node>
-      <node id="8">
-        <label>awkward/ListOffsetArray.h</label>
-      </node>
-      <node id="3">
-        <label>type_traits</label>
-      </node>
-      <node id="7">
-        <label>awkward/ListArray.h</label>
-      </node>
       <node id="1">
-        <label>src/libawkward/ListOffsetArray.cpp</label>
+        <label>src/libawkward/array/ListOffsetArray.cpp</label>
         <link refid="ListOffsetArray_8cpp"/>
         <childnode refid="2" relation="include">
         </childnode>
@@ -49,6 +34,21 @@
         <childnode refid="8" relation="include">
         </childnode>
       </node>
+      <node id="8">
+        <label>awkward/array/ListOffsetArray.h</label>
+      </node>
+      <node id="2">
+        <label>sstream</label>
+      </node>
+      <node id="7">
+        <label>awkward/array/ListArray.h</label>
+      </node>
+      <node id="6">
+        <label>awkward/Slice.h</label>
+      </node>
+      <node id="3">
+        <label>type_traits</label>
+      </node>
     </incdepgraph>
     <innernamespace refid="namespaceawkward">awkward</innernamespace>
       <sectiondef kind="func">
@@ -72,7 +72,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="src/libawkward/ListOffsetArray.cpp" line="28" column="11" bodyfile="src/libawkward/ListOffsetArray.cpp" bodystart="28" bodyend="30"/>
+        <location file="src/libawkward/array/ListOffsetArray.cpp" line="28" column="11" bodyfile="src/libawkward/array/ListOffsetArray.cpp" bodystart="28" bodyend="30"/>
       </memberdef>
       <memberdef kind="function" id="namespaceawkward_1aa3d73a21953e0578aa577329c38dc0ed" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
         <templateparamlist>
@@ -94,13 +94,13 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="src/libawkward/ListOffsetArray.cpp" line="33" column="11" bodyfile="src/libawkward/ListOffsetArray.cpp" bodystart="33" bodyend="35"/>
+        <location file="src/libawkward/array/ListOffsetArray.cpp" line="33" column="11" bodyfile="src/libawkward/array/ListOffsetArray.cpp" bodystart="33" bodyend="35"/>
       </memberdef>
       </sectiondef>
     <briefdescription>
     </briefdescription>
     <detaileddescription>
     </detaileddescription>
-    <location file="src/libawkward/ListOffsetArray.cpp"/>
+    <location file="src/libawkward/array/ListOffsetArray.cpp"/>
   </compounddef>
 </doxygen>
diff --git a/awkward1/signatures/NumpyArray_8cpp.xml b/awkward1/signatures/NumpyArray_8cpp.xml
index 91c7816f51..b291b6cf56 100644
--- a/awkward1/signatures/NumpyArray_8cpp.xml
+++ b/awkward1/signatures/NumpyArray_8cpp.xml
@@ -7,13 +7,13 @@
     <includes local="no">stdexcept</includes>
     <includes local="yes">awkward/cpu-kernels/identity.h</includes>
     <includes local="yes">awkward/cpu-kernels/getitem.h</includes>
-    <includes local="yes">awkward/NumpyArray.h</includes>
+    <includes local="yes">awkward/array/NumpyArray.h</includes>
     <incdepgraph>
       <node id="2">
         <label>iomanip</label>
       </node>
       <node id="1">
-        <label>src/libawkward/NumpyArray.cpp</label>
+        <label>src/libawkward/array/NumpyArray.cpp</label>
         <link refid="NumpyArray_8cpp"/>
         <childnode refid="2" relation="include">
         </childnode>
@@ -37,12 +37,12 @@
       <node id="5">
         <label>awkward/cpu-kernels/identity.h</label>
       </node>
+      <node id="7">
+        <label>awkward/array/NumpyArray.h</label>
+      </node>
       <node id="3">
         <label>sstream</label>
       </node>
-      <node id="7">
-        <label>awkward/NumpyArray.h</label>
-      </node>
     </incdepgraph>
     <innernamespace refid="namespaceawkward">awkward</innernamespace>
       <sectiondef kind="func">
@@ -74,7 +74,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="src/libawkward/NumpyArray.cpp" line="73" column="8" bodyfile="src/libawkward/NumpyArray.cpp" bodystart="73" bodyend="97"/>
+        <location file="src/libawkward/array/NumpyArray.cpp" line="73" column="8" bodyfile="src/libawkward/array/NumpyArray.cpp" bodystart="73" bodyend="97"/>
       </memberdef>
       <memberdef kind="function" id="namespaceawkward_1adf8a5960d7cc8e8447e7357e7416a1dd" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
         <type>const std::vector&lt; ssize_t &gt;</type>
@@ -91,7 +91,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="src/libawkward/NumpyArray.cpp" line="324" column="21" bodyfile="src/libawkward/NumpyArray.cpp" bodystart="324" bodyend="333"/>
+        <location file="src/libawkward/array/NumpyArray.cpp" line="324" column="21" bodyfile="src/libawkward/array/NumpyArray.cpp" bodystart="324" bodyend="333"/>
       </memberdef>
       <memberdef kind="function" id="namespaceawkward_1aadc1072e0733b797c5e796c493958e92" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
         <type>const std::vector&lt; ssize_t &gt;</type>
@@ -108,13 +108,13 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="src/libawkward/NumpyArray.cpp" line="335" column="21" bodyfile="src/libawkward/NumpyArray.cpp" bodystart="335" bodyend="342"/>
+        <location file="src/libawkward/array/NumpyArray.cpp" line="335" column="21" bodyfile="src/libawkward/array/NumpyArray.cpp" bodystart="335" bodyend="342"/>
       </memberdef>
       </sectiondef>
     <briefdescription>
     </briefdescription>
     <detaileddescription>
     </detaileddescription>
-    <location file="src/libawkward/NumpyArray.cpp"/>
+    <location file="src/libawkward/array/NumpyArray.cpp"/>
   </compounddef>
 </doxygen>
diff --git a/awkward1/signatures/getitem_8cpp.xml b/awkward1/signatures/getitem_8cpp.xml
index 4a89a4d236..34ea78f08e 100644
--- a/awkward1/signatures/getitem_8cpp.xml
+++ b/awkward1/signatures/getitem_8cpp.xml
@@ -1034,7 +1034,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="src/cpu-kernels/getitem.cpp" line="202" column="7" bodyfile="src/cpu-kernels/getitem.cpp" bodystart="202" bodyend="214"/>
+        <location file="src/cpu-kernels/getitem.cpp" line="202" column="7" bodyfile="src/cpu-kernels/getitem.cpp" bodystart="202" bodyend="207"/>
       </memberdef>
       <memberdef kind="function" id="getitem_8cpp_1a2e2cff26f34d5112a8e2a32450d573f3" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
         <type>Error</type>
@@ -1071,7 +1071,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="src/cpu-kernels/getitem.cpp" line="215" column="7" bodyfile="src/cpu-kernels/getitem.cpp" bodystart="215" bodyend="217"/>
+        <location file="src/cpu-kernels/getitem.cpp" line="208" column="7" bodyfile="src/cpu-kernels/getitem.cpp" bodystart="208" bodyend="210"/>
       </memberdef>
       <memberdef kind="function" id="getitem_8cpp_1a41b0955f91277fa11060d64364100d33" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
         <templateparamlist>
@@ -1120,7 +1120,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="src/cpu-kernels/getitem.cpp" line="220" column="7" bodyfile="src/cpu-kernels/getitem.cpp" bodystart="220" bodyend="233"/>
+        <location file="src/cpu-kernels/getitem.cpp" line="213" column="7" bodyfile="src/cpu-kernels/getitem.cpp" bodystart="213" bodyend="226"/>
       </memberdef>
       <memberdef kind="function" id="getitem_8cpp_1a489518e2b93f98620d5bd658630c0c80" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
         <type>Error</type>
@@ -1161,7 +1161,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="src/cpu-kernels/getitem.cpp" line="234" column="7" bodyfile="src/cpu-kernels/getitem.cpp" bodystart="234" bodyend="236"/>
+        <location file="src/cpu-kernels/getitem.cpp" line="227" column="7" bodyfile="src/cpu-kernels/getitem.cpp" bodystart="227" bodyend="229"/>
       </memberdef>
       <memberdef kind="function" id="getitem_8cpp_1abef2dff7eac65f5bef85d72727cc6c65" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
         <type>Error</type>
@@ -1202,7 +1202,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="src/cpu-kernels/getitem.cpp" line="237" column="7" bodyfile="src/cpu-kernels/getitem.cpp" bodystart="237" bodyend="239"/>
+        <location file="src/cpu-kernels/getitem.cpp" line="230" column="7" bodyfile="src/cpu-kernels/getitem.cpp" bodystart="230" bodyend="232"/>
       </memberdef>
       <memberdef kind="function" id="getitem_8cpp_1a67fcc2466389188bec7a742c565eca67" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
         <templateparamlist>
@@ -1256,7 +1256,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="src/cpu-kernels/getitem.cpp" line="242" column="7" bodyfile="src/cpu-kernels/getitem.cpp" bodystart="242" bodyend="261"/>
+        <location file="src/cpu-kernels/getitem.cpp" line="235" column="7" bodyfile="src/cpu-kernels/getitem.cpp" bodystart="235" bodyend="254"/>
       </memberdef>
       <memberdef kind="function" id="getitem_8cpp_1aa0abc977f8e0c544d255a49783e1d664" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
         <type>Error</type>
@@ -1305,7 +1305,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="src/cpu-kernels/getitem.cpp" line="262" column="7" bodyfile="src/cpu-kernels/getitem.cpp" bodystart="262" bodyend="264"/>
+        <location file="src/cpu-kernels/getitem.cpp" line="255" column="7" bodyfile="src/cpu-kernels/getitem.cpp" bodystart="255" bodyend="257"/>
       </memberdef>
       <memberdef kind="function" id="getitem_8cpp_1abaf47bc1a4f120752ad286eec1f1dbee" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
         <type>Error</type>
@@ -1354,7 +1354,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="src/cpu-kernels/getitem.cpp" line="265" column="7" bodyfile="src/cpu-kernels/getitem.cpp" bodystart="265" bodyend="267"/>
+        <location file="src/cpu-kernels/getitem.cpp" line="258" column="7" bodyfile="src/cpu-kernels/getitem.cpp" bodystart="258" bodyend="260"/>
       </memberdef>
       <memberdef kind="function" id="getitem_8cpp_1ac80be75daf4723aeee8aafeb459c3d46" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
         <templateparamlist>
@@ -1415,7 +1415,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="src/cpu-kernels/getitem.cpp" line="270" column="7" bodyfile="src/cpu-kernels/getitem.cpp" bodystart="270" bodyend="293"/>
+        <location file="src/cpu-kernels/getitem.cpp" line="263" column="7" bodyfile="src/cpu-kernels/getitem.cpp" bodystart="263" bodyend="286"/>
       </memberdef>
       <memberdef kind="function" id="getitem_8cpp_1a3ef2ac0d6a2162a9ee9a8349dd7438b6" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
         <type>Error</type>
@@ -1468,7 +1468,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="src/cpu-kernels/getitem.cpp" line="294" column="7" bodyfile="src/cpu-kernels/getitem.cpp" bodystart="294" bodyend="296"/>
+        <location file="src/cpu-kernels/getitem.cpp" line="287" column="7" bodyfile="src/cpu-kernels/getitem.cpp" bodystart="287" bodyend="289"/>
       </memberdef>
       <memberdef kind="function" id="getitem_8cpp_1a3431237f8ec2998fc70329a0bfc5628c" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
         <type>Error</type>
@@ -1521,7 +1521,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="src/cpu-kernels/getitem.cpp" line="297" column="7" bodyfile="src/cpu-kernels/getitem.cpp" bodystart="297" bodyend="299"/>
+        <location file="src/cpu-kernels/getitem.cpp" line="290" column="7" bodyfile="src/cpu-kernels/getitem.cpp" bodystart="290" bodyend="292"/>
       </memberdef>
       <memberdef kind="function" id="getitem_8cpp_1ac4011afba6025e590b6770224cb478cb" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
         <templateparamlist>
@@ -1554,7 +1554,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="src/cpu-kernels/getitem.cpp" line="302" column="7" bodyfile="src/cpu-kernels/getitem.cpp" bodystart="302" bodyend="308"/>
+        <location file="src/cpu-kernels/getitem.cpp" line="295" column="7" bodyfile="src/cpu-kernels/getitem.cpp" bodystart="295" bodyend="301"/>
       </memberdef>
       <memberdef kind="function" id="getitem_8cpp_1a3cd565be6eff29458da9cf4574e4aec5" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
         <type>Error</type>
@@ -1579,7 +1579,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="src/cpu-kernels/getitem.cpp" line="309" column="7" bodyfile="src/cpu-kernels/getitem.cpp" bodystart="309" bodyend="311"/>
+        <location file="src/cpu-kernels/getitem.cpp" line="302" column="7" bodyfile="src/cpu-kernels/getitem.cpp" bodystart="302" bodyend="304"/>
       </memberdef>
       <memberdef kind="function" id="getitem_8cpp_1af5bb9a4166dfa32d84fe73b8b827954e" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
         <type>Error</type>
@@ -1604,7 +1604,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="src/cpu-kernels/getitem.cpp" line="312" column="7" bodyfile="src/cpu-kernels/getitem.cpp" bodystart="312" bodyend="314"/>
+        <location file="src/cpu-kernels/getitem.cpp" line="305" column="7" bodyfile="src/cpu-kernels/getitem.cpp" bodystart="305" bodyend="307"/>
       </memberdef>
       <memberdef kind="function" id="getitem_8cpp_1abe238e91b03782866d7e5ab10d0f64ad" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
         <templateparamlist>
@@ -1641,7 +1641,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="src/cpu-kernels/getitem.cpp" line="317" column="7" bodyfile="src/cpu-kernels/getitem.cpp" bodystart="317" bodyend="325"/>
+        <location file="src/cpu-kernels/getitem.cpp" line="310" column="7" bodyfile="src/cpu-kernels/getitem.cpp" bodystart="310" bodyend="318"/>
       </memberdef>
       <memberdef kind="function" id="getitem_8cpp_1adfe3a5abb34822d626ceac8c65f19832" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
         <type>Error</type>
@@ -1670,7 +1670,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="src/cpu-kernels/getitem.cpp" line="326" column="7" bodyfile="src/cpu-kernels/getitem.cpp" bodystart="326" bodyend="328"/>
+        <location file="src/cpu-kernels/getitem.cpp" line="319" column="7" bodyfile="src/cpu-kernels/getitem.cpp" bodystart="319" bodyend="321"/>
       </memberdef>
       <memberdef kind="function" id="getitem_8cpp_1abe492091dc60f74c3df5a1c5abe50792" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
         <type>Error</type>
@@ -1699,7 +1699,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="src/cpu-kernels/getitem.cpp" line="329" column="7" bodyfile="src/cpu-kernels/getitem.cpp" bodystart="329" bodyend="331"/>
+        <location file="src/cpu-kernels/getitem.cpp" line="322" column="7" bodyfile="src/cpu-kernels/getitem.cpp" bodystart="322" bodyend="324"/>
       </memberdef>
       <memberdef kind="function" id="getitem_8cpp_1acc120c3c4a674e0dfceaf459c4d62252" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
         <templateparamlist>
@@ -1764,7 +1764,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="src/cpu-kernels/getitem.cpp" line="334" column="7" bodyfile="src/cpu-kernels/getitem.cpp" bodystart="334" bodyend="358"/>
+        <location file="src/cpu-kernels/getitem.cpp" line="327" column="7" bodyfile="src/cpu-kernels/getitem.cpp" bodystart="327" bodyend="351"/>
       </memberdef>
       <memberdef kind="function" id="getitem_8cpp_1a6ec7b77e680981f22bf083bb676ccc01" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
         <type>Error</type>
@@ -1821,7 +1821,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="src/cpu-kernels/getitem.cpp" line="359" column="7" bodyfile="src/cpu-kernels/getitem.cpp" bodystart="359" bodyend="361"/>
+        <location file="src/cpu-kernels/getitem.cpp" line="352" column="7" bodyfile="src/cpu-kernels/getitem.cpp" bodystart="352" bodyend="354"/>
       </memberdef>
       <memberdef kind="function" id="getitem_8cpp_1af35abdabe9c39d6fdd6ef1e9890dbd89" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
         <type>Error</type>
@@ -1878,7 +1878,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="src/cpu-kernels/getitem.cpp" line="362" column="7" bodyfile="src/cpu-kernels/getitem.cpp" bodystart="362" bodyend="364"/>
+        <location file="src/cpu-kernels/getitem.cpp" line="355" column="7" bodyfile="src/cpu-kernels/getitem.cpp" bodystart="355" bodyend="357"/>
       </memberdef>
       <memberdef kind="function" id="getitem_8cpp_1a05cedfd06e695d8370b8f9d3883867d7" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
         <templateparamlist>
@@ -1943,7 +1943,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="src/cpu-kernels/getitem.cpp" line="367" column="7" bodyfile="src/cpu-kernels/getitem.cpp" bodystart="367" bodyend="390"/>
+        <location file="src/cpu-kernels/getitem.cpp" line="360" column="7" bodyfile="src/cpu-kernels/getitem.cpp" bodystart="360" bodyend="383"/>
       </memberdef>
       <memberdef kind="function" id="getitem_8cpp_1a4e94a81c0bdae571db5f767aef52f1fc" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
         <type>Error</type>
@@ -2000,7 +2000,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="src/cpu-kernels/getitem.cpp" line="391" column="7" bodyfile="src/cpu-kernels/getitem.cpp" bodystart="391" bodyend="393"/>
+        <location file="src/cpu-kernels/getitem.cpp" line="384" column="7" bodyfile="src/cpu-kernels/getitem.cpp" bodystart="384" bodyend="386"/>
       </memberdef>
       <memberdef kind="function" id="getitem_8cpp_1a9168561c0b444beb08b7bf296e5ac899" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
         <type>Error</type>
@@ -2057,7 +2057,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="src/cpu-kernels/getitem.cpp" line="394" column="7" bodyfile="src/cpu-kernels/getitem.cpp" bodystart="394" bodyend="396"/>
+        <location file="src/cpu-kernels/getitem.cpp" line="387" column="7" bodyfile="src/cpu-kernels/getitem.cpp" bodystart="387" bodyend="389"/>
       </memberdef>
       <memberdef kind="function" id="getitem_8cpp_1a4224ccf010d94c447efb8f9bacd6986a" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
         <templateparamlist>
@@ -2114,7 +2114,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="src/cpu-kernels/getitem.cpp" line="399" column="7" bodyfile="src/cpu-kernels/getitem.cpp" bodystart="399" bodyend="408"/>
+        <location file="src/cpu-kernels/getitem.cpp" line="392" column="7" bodyfile="src/cpu-kernels/getitem.cpp" bodystart="392" bodyend="401"/>
       </memberdef>
       <memberdef kind="function" id="getitem_8cpp_1a8e6426aeb4b36351a5a2acbe0e8909e2" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
         <type>Error</type>
@@ -2163,7 +2163,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="src/cpu-kernels/getitem.cpp" line="409" column="7" bodyfile="src/cpu-kernels/getitem.cpp" bodystart="409" bodyend="411"/>
+        <location file="src/cpu-kernels/getitem.cpp" line="402" column="7" bodyfile="src/cpu-kernels/getitem.cpp" bodystart="402" bodyend="404"/>
       </memberdef>
       <memberdef kind="function" id="getitem_8cpp_1a36e50f491823e64a55c0dae418d60abf" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
         <type>Error</type>
@@ -2212,7 +2212,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="src/cpu-kernels/getitem.cpp" line="412" column="7" bodyfile="src/cpu-kernels/getitem.cpp" bodystart="412" bodyend="414"/>
+        <location file="src/cpu-kernels/getitem.cpp" line="405" column="7" bodyfile="src/cpu-kernels/getitem.cpp" bodystart="405" bodyend="407"/>
       </memberdef>
       </sectiondef>
     <briefdescription>
diff --git a/include/awkward/ListArray.h b/include/awkward/array/ListArray.h
similarity index 100%
rename from include/awkward/ListArray.h
rename to include/awkward/array/ListArray.h
diff --git a/include/awkward/ListOffsetArray.h b/include/awkward/array/ListOffsetArray.h
similarity index 100%
rename from include/awkward/ListOffsetArray.h
rename to include/awkward/array/ListOffsetArray.h
diff --git a/include/awkward/NumpyArray.h b/include/awkward/array/NumpyArray.h
similarity index 100%
rename from include/awkward/NumpyArray.h
rename to include/awkward/array/NumpyArray.h
diff --git a/include/awkward/RawArray.h b/include/awkward/array/RawArray.h
similarity index 100%
rename from include/awkward/RawArray.h
rename to include/awkward/array/RawArray.h
diff --git a/src/libawkward/Content.cpp b/src/libawkward/Content.cpp
index aa92c48a12..f3d5640366 100644
--- a/src/libawkward/Content.cpp
+++ b/src/libawkward/Content.cpp
@@ -1,6 +1,6 @@
 // BSD 3-Clause License; see https://github.com/jpivarski/awkward-1.0/blob/master/LICENSE
 
-#include "awkward/ListArray.h"
+#include "awkward/array/ListArray.h"
 
 #include "awkward/Content.h"
 
diff --git a/src/libawkward/ListArray.cpp b/src/libawkward/array/ListArray.cpp
similarity index 99%
rename from src/libawkward/ListArray.cpp
rename to src/libawkward/array/ListArray.cpp
index 70ca3593da..95530882da 100644
--- a/src/libawkward/ListArray.cpp
+++ b/src/libawkward/array/ListArray.cpp
@@ -6,9 +6,9 @@
 #include "awkward/cpu-kernels/identity.h"
 #include "awkward/cpu-kernels/getitem.h"
 #include "awkward/Slice.h"
-#include "awkward/ListOffsetArray.h"
+#include "awkward/array/ListOffsetArray.h"
 
-#include "awkward/ListArray.h"
+#include "awkward/array/ListArray.h"
 
 namespace awkward {
   template <typename T>
diff --git a/src/libawkward/ListOffsetArray.cpp b/src/libawkward/array/ListOffsetArray.cpp
similarity index 99%
rename from src/libawkward/ListOffsetArray.cpp
rename to src/libawkward/array/ListOffsetArray.cpp
index 11fb91e925..a2697fe199 100644
--- a/src/libawkward/ListOffsetArray.cpp
+++ b/src/libawkward/array/ListOffsetArray.cpp
@@ -6,9 +6,9 @@
 #include "awkward/cpu-kernels/identity.h"
 #include "awkward/cpu-kernels/getitem.h"
 #include "awkward/Slice.h"
-#include "awkward/ListArray.h"
+#include "awkward/array/ListArray.h"
 
-#include "awkward/ListOffsetArray.h"
+#include "awkward/array/ListOffsetArray.h"
 
 namespace awkward {
   template <typename T>
diff --git a/src/libawkward/NumpyArray.cpp b/src/libawkward/array/NumpyArray.cpp
similarity index 99%
rename from src/libawkward/NumpyArray.cpp
rename to src/libawkward/array/NumpyArray.cpp
index fa3ca8e679..b3402ac8c6 100644
--- a/src/libawkward/NumpyArray.cpp
+++ b/src/libawkward/array/NumpyArray.cpp
@@ -7,7 +7,7 @@
 #include "awkward/cpu-kernels/identity.h"
 #include "awkward/cpu-kernels/getitem.h"
 
-#include "awkward/NumpyArray.h"
+#include "awkward/array/NumpyArray.h"
 
 namespace awkward {
   ssize_t NumpyArray::ndim() const {
diff --git a/src/pyawkward.cpp b/src/pyawkward.cpp
index 9678477688..4b7c78b7dd 100644
--- a/src/pyawkward.cpp
+++ b/src/pyawkward.cpp
@@ -11,9 +11,9 @@
 #include "awkward/Identity.h"
 #include "awkward/Content.h"
 #include "awkward/Iterator.h"
-#include "awkward/NumpyArray.h"
-#include "awkward/ListArray.h"
-#include "awkward/ListOffsetArray.h"
+#include "awkward/array/NumpyArray.h"
+#include "awkward/array/ListArray.h"
+#include "awkward/array/ListOffsetArray.h"
 
 namespace py = pybind11;
 namespace ak = awkward;
diff --git a/tests/test_PR016_finish_getitem_for_rawarray.cpp b/tests/test_PR016_finish_getitem_for_rawarray.cpp
index ab262d6939..d572bd0767 100644
--- a/tests/test_PR016_finish_getitem_for_rawarray.cpp
+++ b/tests/test_PR016_finish_getitem_for_rawarray.cpp
@@ -3,9 +3,9 @@
 #include <sstream>
 
 #include "awkward/Identity.h"
-#include "awkward/RawArray.h"
-#include "awkward/ListArray.h"
-#include "awkward/ListOffsetArray.h"
+#include "awkward/array/RawArray.h"
+#include "awkward/array/ListArray.h"
+#include "awkward/array/ListOffsetArray.h"
 #include "awkward/Slice.h"
 
 using namespace awkward;