diff --git a/common/Android.bp b/common/Android.bp
index 3107a5f..159ceee 100644
--- a/common/Android.bp
+++ b/common/Android.bp
@@ -29,82 +29,78 @@
 
 // The following files took too much time to compile with clang-tidy.
 tidy_disabled_common_operations_files = [
-    "operations/ActivationExecution.cpp",
-    "operations/BroadcastExecution.cpp",
-    "operations/ConcatenationExecution.cpp",
-    "operations/Conv2DExecution.cpp",
-    "operations/FullyConnectedExecution.cpp",
-    "operations/L2NormalizationExecution.cpp",
-    "operations/LocalResponseNormalizationExecution.cpp",
-    "operations/PReluExecution.cpp",
-    "operations/PoolingExecution.cpp",
-    "operations/ReshapeExecution.cpp",
-    "operations/SimpleMathExecution.cpp",
-    "operations/SoftmaxExecution.cpp",
-    "operations/TransposeExecution.cpp",
+    "cpu_operations/Activation.cpp",
+    "cpu_operations/Broadcast.cpp",
+    "cpu_operations/Concatenation.cpp",
+    "cpu_operations/Conv2D.cpp",
+    "cpu_operations/FullyConnected.cpp",
+    "cpu_operations/L2Normalization.cpp",
+    "cpu_operations/LocalResponseNormalization.cpp",
+    "cpu_operations/PRelu.cpp",
+    "cpu_operations/Pooling.cpp",
+    "cpu_operations/Reshape.cpp",
+    "cpu_operations/SimpleMath.cpp",
+    "cpu_operations/Softmax.cpp",
+    "cpu_operations/Transpose.cpp",
 ]
 
 cc_defaults {
     name: "neuralnetworks_operations",
     host_supported: true,
+    local_include_dirs: ["types/operations/include"],
     srcs: [
         "OperationResolver.cpp",
-        "operations/ActivationExecution.cpp",
-        "operations/BatchMatmulExecution.cpp",
-        "operations/BidirectionalSequenceRNNExecution.cpp",
-        "operations/BroadcastExecution.cpp",
-        "operations/ChannelShuffleExecution.cpp",
-        "operations/ComparisonsExecution.cpp",
-        "operations/ConcatenationExecution.cpp",
-        "operations/Conv2DExecution.cpp",
-        "operations/DensifyExecution.cpp",
-        "operations/DepthwiseConv2DExecution.cpp",
-        "operations/DequantizeExecution.cpp",
-        "operations/ElementwiseExecution.cpp",
-        "operations/EluExecution.cpp",
-        "operations/FillExecution.cpp",
-        "operations/FullyConnectedExecution.cpp",
-        "operations/GatherExecution.cpp",
-        "operations/GenerateProposalsExecution.cpp",
-        "operations/HeatmapMaxKeypointExecution.cpp",
-        "operations/InstanceNormalizationExecution.cpp",
-        "operations/L2NormalizationExecution.cpp",
-        "operations/LocalResponseNormalizationExecution.cpp",
-        "operations/LogSoftmaxExecution.cpp",
-        "operations/LogicalAndOrExecution.cpp",
-        "operations/LogicalNotExecution.cpp",
-        "operations/MirrorPadExecution.cpp",
-        "operations/NegExecution.cpp",
-        "operations/PReluExecution.cpp",
-        "operations/PackExecution.cpp",
-        "operations/PoolingExecution.cpp",
-        "operations/QLSTMExecution.cpp",
-        "operations/QuantizeExecution.cpp",
-        "operations/RankExecution.cpp",
-        "operations/ReduceExecution.cpp",
-        "operations/ResizeImageOpsExecution.cpp",
-        "operations/ReverseExecution.cpp",
-        "operations/RoiAlignExecution.cpp",
-        "operations/RoiPoolingExecution.cpp",
-        "operations/SelectExecution.cpp",
-        "operations/SliceExecution.cpp",
-        "operations/SoftmaxExecution.cpp",
-        "operations/SqueezeExecution.cpp",
-        "operations/StridedSliceExecution.cpp",
-        "operations/TopK_V2Execution.cpp",
-        "operations/TransposeConv2DExecution.cpp",
-        "operations/TransposeExecution.cpp",
-        "operations/UnidirectionalSequenceLSTMExecution.cpp",
-        "operations/UnidirectionalSequenceRNNExecution.cpp",
+        "cpu_operations/Activation.cpp",
+        "cpu_operations/BatchMatmul.cpp",
+        "cpu_operations/BidirectionalSequenceRNN.cpp",
+        "cpu_operations/Broadcast.cpp",
+        "cpu_operations/ChannelShuffle.cpp",
+        "cpu_operations/Comparisons.cpp",
+        "cpu_operations/Concatenation.cpp",
+        "cpu_operations/Conv2D.cpp",
+        "cpu_operations/Densify.cpp",
+        "cpu_operations/DepthwiseConv2D.cpp",
+        "cpu_operations/Dequantize.cpp",
+        "cpu_operations/Elementwise.cpp",
+        "cpu_operations/Elu.cpp",
+        "cpu_operations/Fill.cpp",
+        "cpu_operations/FullyConnected.cpp",
+        "cpu_operations/Gather.cpp",
+        "cpu_operations/GenerateProposals.cpp",
+        "cpu_operations/HeatmapMaxKeypoint.cpp",
+        "cpu_operations/InstanceNormalization.cpp",
+        "cpu_operations/L2Normalization.cpp",
+        "cpu_operations/LocalResponseNormalization.cpp",
+        "cpu_operations/LogSoftmax.cpp",
+        "cpu_operations/LogicalAndOr.cpp",
+        "cpu_operations/LogicalNot.cpp",
+        "cpu_operations/MirrorPad.cpp",
+        "cpu_operations/Neg.cpp",
+        "cpu_operations/PRelu.cpp",
+        "cpu_operations/Pack.cpp",
+        "cpu_operations/Pooling.cpp",
+        "cpu_operations/QLSTM.cpp",
+        "cpu_operations/Quantize.cpp",
+        "cpu_operations/Rank.cpp",
+        "cpu_operations/Reduce.cpp",
+        "cpu_operations/ResizeImageOps.cpp",
+        "cpu_operations/Reverse.cpp",
+        "cpu_operations/RoiAlign.cpp",
+        "cpu_operations/RoiPooling.cpp",
+        "cpu_operations/Select.cpp",
+        "cpu_operations/Slice.cpp",
+        "cpu_operations/Softmax.cpp",
+        "cpu_operations/Squeeze.cpp",
+        "cpu_operations/StridedSlice.cpp",
+        "cpu_operations/TopK_V2.cpp",
+        "cpu_operations/Transpose.cpp",
+        "cpu_operations/TransposeConv2D.cpp",
+        "cpu_operations/UnidirectionalSequenceLSTM.cpp",
+        "cpu_operations/UnidirectionalSequenceRNN.cpp",
     ],
     tidy_disabled_srcs: tidy_disabled_common_operations_files,
 }
 
-filegroup {
-    name: "neuralnetworks_operations_validation",
-    srcs: ["operations/*Validation.cpp"],
-}
-
 // libneuralnetworks_common* provides common utilities for the NNAPI runtime, drivers, and tests to
 // use. Two variants of the common library are provided:
 // - libneuralnetworks_common: the common library, used by NNAPI runtime and tests.
@@ -150,25 +146,25 @@
         "QuantUtils.cpp",
         "TokenHasher.cpp",
         "ValidateHal.cpp",
-        "operations/ArgMinMaxExecution.cpp",
-        "operations/BidirectionalSequenceLSTMExecution.cpp",
-        "operations/CastExecution.cpp",
-        "operations/EmbeddingLookupExecution.cpp",
-        "operations/ExpandDimsExecution.cpp",
-        "operations/GroupedConv2DExecution.cpp",
-        "operations/HashtableLookupExecution.cpp",
-        "operations/LSHProjectionExecution.cpp",
-        "operations/LSTMExecution.cpp",
-        "operations/MaximumMinimumExecution.cpp",
-        "operations/MultinomialExecution.cpp",
-        "operations/PowExecution.cpp",
-        "operations/QuantizedLSTMExecution.cpp",
-        "operations/RNNExecution.cpp",
-        "operations/ReshapeExecution.cpp",
-        "operations/SVDFExecution.cpp",
-        "operations/SimpleMathExecution.cpp",
-        "operations/SplitExecution.cpp",
-        "operations/TileExecution.cpp",
+        "cpu_operations/ArgMinMax.cpp",
+        "cpu_operations/BidirectionalSequenceLSTM.cpp",
+        "cpu_operations/Cast.cpp",
+        "cpu_operations/EmbeddingLookup.cpp",
+        "cpu_operations/ExpandDims.cpp",
+        "cpu_operations/GroupedConv2D.cpp",
+        "cpu_operations/HashtableLookup.cpp",
+        "cpu_operations/LSHProjection.cpp",
+        "cpu_operations/LSTM.cpp",
+        "cpu_operations/MaximumMinimum.cpp",
+        "cpu_operations/Multinomial.cpp",
+        "cpu_operations/Pow.cpp",
+        "cpu_operations/QuantizedLSTM.cpp",
+        "cpu_operations/RNN.cpp",
+        "cpu_operations/Reshape.cpp",
+        "cpu_operations/SVDF.cpp",
+        "cpu_operations/SimpleMath.cpp",
+        "cpu_operations/Split.cpp",
+        "cpu_operations/Tile.cpp",
     ],
     shared_libs: [
         "android.hardware.neuralnetworks@1.0",
@@ -316,6 +312,7 @@
 cc_library_static {
     name: "libneuralnetworks_common_cl_cpu",
     defaults: ["libneuralnetworks_common_cl_defaults"],
+    local_include_dirs: ["types/operations/include"],
     header_libs: [
         "gemmlowp_headers",
         "libeigen",
@@ -334,25 +331,25 @@
     srcs: [
         "ActivationFunctor.cpp",
         "QuantUtils.cpp",
-        "operations/ArgMinMaxExecution.cpp",
-        "operations/BidirectionalSequenceLSTMExecution.cpp",
-        "operations/CastExecution.cpp",
-        "operations/EmbeddingLookupExecution.cpp",
-        "operations/ExpandDimsExecution.cpp",
-        "operations/GroupedConv2DExecution.cpp",
-        "operations/HashtableLookupExecution.cpp",
-        "operations/LSHProjectionExecution.cpp",
-        "operations/LSTMExecution.cpp",
-        "operations/MaximumMinimumExecution.cpp",
-        "operations/MultinomialExecution.cpp",
-        "operations/PowExecution.cpp",
-        "operations/QuantizedLSTMExecution.cpp",
-        "operations/RNNExecution.cpp",
-        "operations/ReshapeExecution.cpp",
-        "operations/SVDFExecution.cpp",
-        "operations/SimpleMathExecution.cpp",
-        "operations/SplitExecution.cpp",
-        "operations/TileExecution.cpp",
+        "cpu_operations/ArgMinMax.cpp",
+        "cpu_operations/BidirectionalSequenceLSTM.cpp",
+        "cpu_operations/Cast.cpp",
+        "cpu_operations/EmbeddingLookup.cpp",
+        "cpu_operations/ExpandDims.cpp",
+        "cpu_operations/GroupedConv2D.cpp",
+        "cpu_operations/HashtableLookup.cpp",
+        "cpu_operations/LSHProjection.cpp",
+        "cpu_operations/LSTM.cpp",
+        "cpu_operations/MaximumMinimum.cpp",
+        "cpu_operations/Multinomial.cpp",
+        "cpu_operations/Pow.cpp",
+        "cpu_operations/QuantizedLSTM.cpp",
+        "cpu_operations/RNN.cpp",
+        "cpu_operations/Reshape.cpp",
+        "cpu_operations/SVDF.cpp",
+        "cpu_operations/SimpleMath.cpp",
+        "cpu_operations/Split.cpp",
+        "cpu_operations/Tile.cpp",
     ],
     cflags: [
         "-DNAMESPACE_FOR_HASH_FUNCTIONS=farmhash",
@@ -409,8 +406,9 @@
 cc_test {
     name: "NeuralNetworksTest_operations",
     defaults: ["NeuralNetworksTest_common"],
+    local_include_dirs: ["types/operations/include"],
     srcs: [
-        "operations/*Test.cpp",
+        "cpu_operations/*Test.cpp",
     ],
     header_libs: [
         "gemmlowp_headers",
diff --git a/common/CpuExecutor.cpp b/common/CpuExecutor.cpp
index 1ba991c..15bffc4 100644
--- a/common/CpuExecutor.cpp
+++ b/common/CpuExecutor.cpp
@@ -42,20 +42,20 @@
 #endif  // NNAPI_OPENMP
 
 #ifdef NN_INCLUDE_CPU_IMPLEMENTATION
-#include "operations/BidirectionalSequenceLSTM.h"
-#include "operations/Cast.h"
-#include "operations/EmbeddingLookup.h"
-#include "operations/ExpandDims.h"
-#include "operations/HashtableLookup.h"
-#include "operations/LSHProjection.h"
-#include "operations/LSTM.h"
-#include "operations/MaximumMinimum.h"
-#include "operations/Multinomial.h"
-#include "operations/Pow.h"
-#include "operations/QuantizedLSTM.h"
-#include "operations/RNN.h"
-#include "operations/SVDF.h"
-#include "operations/Tile.h"
+#include "BidirectionalSequenceLSTM.h"
+#include "Cast.h"
+#include "EmbeddingLookup.h"
+#include "ExpandDims.h"
+#include "HashtableLookup.h"
+#include "LSHProjection.h"
+#include "LSTM.h"
+#include "MaximumMinimum.h"
+#include "Multinomial.h"
+#include "Pow.h"
+#include "QuantizedLSTM.h"
+#include "RNN.h"
+#include "SVDF.h"
+#include "Tile.h"
 #endif  // NN_INCLUDE_CPU_IMPLEMENTATION
 
 namespace android {
diff --git a/common/operations/ActivationExecution.cpp b/common/cpu_operations/Activation.cpp
similarity index 99%
rename from common/operations/ActivationExecution.cpp
rename to common/cpu_operations/Activation.cpp
index 78086ea..f8206e5 100644
--- a/common/operations/ActivationExecution.cpp
+++ b/common/cpu_operations/Activation.cpp
@@ -16,11 +16,12 @@
 
 #define LOG_TAG "Operations"
 
+#include "Activation.h"
+
 #include <algorithm>
 #include <limits>
 #include <vector>
 
-#include "Activation.h"
 #include "ActivationFunctor.h"
 #include "OperationResolver.h"
 #include "OperationsExecutionUtils.h"
diff --git a/common/operations/ArgMinMaxExecution.cpp b/common/cpu_operations/ArgMinMax.cpp
similarity index 99%
rename from common/operations/ArgMinMaxExecution.cpp
rename to common/cpu_operations/ArgMinMax.cpp
index 7896ff1..301b69a 100644
--- a/common/operations/ArgMinMaxExecution.cpp
+++ b/common/cpu_operations/ArgMinMax.cpp
@@ -19,6 +19,7 @@
 #define LOG_TAG "Operations"
 
 #include "ArgMinMax.h"
+
 #include "CpuOperationUtils.h"
 #include "Operations.h"
 #include "Tracing.h"
diff --git a/common/operations/BatchMatmulExecution.cpp b/common/cpu_operations/BatchMatmul.cpp
similarity index 100%
rename from common/operations/BatchMatmulExecution.cpp
rename to common/cpu_operations/BatchMatmul.cpp
diff --git a/common/operations/BidirectionalSequenceLSTMExecution.cpp b/common/cpu_operations/BidirectionalSequenceLSTM.cpp
similarity index 99%
rename from common/operations/BidirectionalSequenceLSTMExecution.cpp
rename to common/cpu_operations/BidirectionalSequenceLSTM.cpp
index c84a190..140289f 100644
--- a/common/operations/BidirectionalSequenceLSTMExecution.cpp
+++ b/common/cpu_operations/BidirectionalSequenceLSTM.cpp
@@ -16,12 +16,13 @@
 
 #define LOG_TAG "Operations"
 
+#include "BidirectionalSequenceLSTM.h"
+
 #include <tensorflow/lite/kernels/internal/tensor_utils.h>
 
 #include <algorithm>
 #include <vector>
 
-#include "BidirectionalSequenceLSTM.h"
 #include "CpuExecutor.h"
 #include "CpuOperationUtils.h"
 #include "OperationsExecutionUtils.h"
diff --git a/common/operations/BidirectionalSequenceRNNExecution.cpp b/common/cpu_operations/BidirectionalSequenceRNN.cpp
similarity index 99%
rename from common/operations/BidirectionalSequenceRNNExecution.cpp
rename to common/cpu_operations/BidirectionalSequenceRNN.cpp
index 3dbc86b..5ec7132 100644
--- a/common/operations/BidirectionalSequenceRNNExecution.cpp
+++ b/common/cpu_operations/BidirectionalSequenceRNN.cpp
@@ -16,11 +16,12 @@
 
 #define LOG_TAG "Operations"
 
+#include "BidirectionalSequenceRNN.h"
+
 #include <algorithm>
 #include <utility>
 #include <vector>
 
-#include "BidirectionalSequenceRNN.h"
 #include "OperationResolver.h"
 #include "RNN.h"
 
diff --git a/common/operations/BroadcastExecution.cpp b/common/cpu_operations/Broadcast.cpp
similarity index 99%
rename from common/operations/BroadcastExecution.cpp
rename to common/cpu_operations/Broadcast.cpp
index 9c29026..eee103f 100644
--- a/common/operations/BroadcastExecution.cpp
+++ b/common/cpu_operations/Broadcast.cpp
@@ -18,10 +18,11 @@
 
 #define LOG_TAG "Operations"
 
+#include "Broadcast.h"
+
 #include <algorithm>
 #include <vector>
 
-#include "Broadcast.h"
 #include "IndexedShapeWrapper.h"
 #include "OperationResolver.h"
 #include "Tracing.h"
diff --git a/common/operations/CastExecution.cpp b/common/cpu_operations/Cast.cpp
similarity index 99%
rename from common/operations/CastExecution.cpp
rename to common/cpu_operations/Cast.cpp
index f9dc803..aef3baf 100644
--- a/common/operations/CastExecution.cpp
+++ b/common/cpu_operations/Cast.cpp
@@ -16,9 +16,10 @@
 
 #define LOG_TAG "Operations"
 
+#include "Cast.h"
+
 #include <algorithm>
 
-#include "Cast.h"
 #include "Operations.h"
 #include "Tracing.h"
 
diff --git a/common/operations/ChannelShuffleExecution.cpp b/common/cpu_operations/ChannelShuffle.cpp
similarity index 99%
rename from common/operations/ChannelShuffleExecution.cpp
rename to common/cpu_operations/ChannelShuffle.cpp
index 9540a8a..e8e59aa 100644
--- a/common/operations/ChannelShuffleExecution.cpp
+++ b/common/cpu_operations/ChannelShuffle.cpp
@@ -17,6 +17,7 @@
 #define LOG_TAG "Operations"
 
 #include "ChannelShuffle.h"
+
 #include "OperationResolver.h"
 #include "OperationsExecutionUtils.h"
 #include "Tracing.h"
diff --git a/common/operations/ComparisonsExecution.cpp b/common/cpu_operations/Comparisons.cpp
similarity index 99%
rename from common/operations/ComparisonsExecution.cpp
rename to common/cpu_operations/Comparisons.cpp
index 6f57358..9f14363 100644
--- a/common/operations/ComparisonsExecution.cpp
+++ b/common/cpu_operations/Comparisons.cpp
@@ -16,10 +16,11 @@
 
 #define LOG_TAG "Operations"
 
+#include "Comparisons.h"
+
 #include <functional>
 #include <vector>
 
-#include "Comparisons.h"
 #include "IndexedShapeWrapper.h"
 #include "OperationResolver.h"
 #include "OperationsExecutionUtils.h"
diff --git a/common/operations/ConcatenationExecution.cpp b/common/cpu_operations/Concatenation.cpp
similarity index 99%
rename from common/operations/ConcatenationExecution.cpp
rename to common/cpu_operations/Concatenation.cpp
index 2502ee1..15aa3ea 100644
--- a/common/operations/ConcatenationExecution.cpp
+++ b/common/cpu_operations/Concatenation.cpp
@@ -16,11 +16,12 @@
 
 #define LOG_TAG "Operations"
 
+#include "Concatenation.h"
+
 #include <algorithm>
 #include <iterator>
 #include <vector>
 
-#include "Concatenation.h"
 #include "OperationResolver.h"
 #include "OperationsExecutionUtils.h"
 #include "Tracing.h"
diff --git a/common/operations/Conv2DExecution.cpp b/common/cpu_operations/Conv2D.cpp
similarity index 99%
rename from common/operations/Conv2DExecution.cpp
rename to common/cpu_operations/Conv2D.cpp
index a3e01c0..ac4a67e 100644
--- a/common/operations/Conv2DExecution.cpp
+++ b/common/cpu_operations/Conv2D.cpp
@@ -16,12 +16,13 @@
 
 #define LOG_TAG "Operations"
 
+#include "Conv2D.h"
+
 #include <algorithm>
 #include <iterator>
 #include <memory>
 #include <vector>
 
-#include "Conv2D.h"
 #include "LegacyUtils.h"
 #include "OperationResolver.h"
 #include "Operations.h"
diff --git a/common/operations/DensifyExecution.cpp b/common/cpu_operations/Densify.cpp
similarity index 99%
rename from common/operations/DensifyExecution.cpp
rename to common/cpu_operations/Densify.cpp
index 2f40ed6..c576281 100644
--- a/common/operations/DensifyExecution.cpp
+++ b/common/cpu_operations/Densify.cpp
@@ -16,6 +16,8 @@
 
 #ifdef NN_EXPERIMENTAL_FEATURE
 
+#include "Densify.h"
+
 #include <cstddef>
 #include <cstdint>
 #include <functional>
@@ -23,7 +25,6 @@
 #include <numeric>
 #include <vector>
 
-#include "Densify.h"
 #include "OperationResolver.h"
 #include "OperationsExecutionUtils.h"
 #include "OperationsValidationUtils.h"
diff --git a/common/operations/DepthwiseConv2DExecution.cpp b/common/cpu_operations/DepthwiseConv2D.cpp
similarity index 99%
rename from common/operations/DepthwiseConv2DExecution.cpp
rename to common/cpu_operations/DepthwiseConv2D.cpp
index 8b1e1ab..d241397 100644
--- a/common/operations/DepthwiseConv2DExecution.cpp
+++ b/common/cpu_operations/DepthwiseConv2D.cpp
@@ -16,10 +16,11 @@
 
 #define LOG_TAG "Operations"
 
+#include "DepthwiseConv2D.h"
+
 #include <algorithm>
 #include <vector>
 
-#include "DepthwiseConv2D.h"
 #include "OperationResolver.h"
 #include "Operations.h"
 #include "Tracing.h"
diff --git a/common/operations/DequantizeExecution.cpp b/common/cpu_operations/Dequantize.cpp
similarity index 99%
rename from common/operations/DequantizeExecution.cpp
rename to common/cpu_operations/Dequantize.cpp
index 73a9c5a..1074816 100644
--- a/common/operations/DequantizeExecution.cpp
+++ b/common/cpu_operations/Dequantize.cpp
@@ -17,6 +17,7 @@
 #define LOG_TAG "Operations"
 
 #include "Dequantize.h"
+
 #include "IndexedShapeWrapper.h"
 #include "OperationResolver.h"
 #include "OperationsExecutionUtils.h"
diff --git a/common/operations/ElementwiseExecution.cpp b/common/cpu_operations/Elementwise.cpp
similarity index 99%
rename from common/operations/ElementwiseExecution.cpp
rename to common/cpu_operations/Elementwise.cpp
index 2238f5e..e3bc7ee 100644
--- a/common/operations/ElementwiseExecution.cpp
+++ b/common/cpu_operations/Elementwise.cpp
@@ -16,12 +16,13 @@
 
 #define LOG_TAG "Operations"
 
+#include "Elementwise.h"
+
 #include <algorithm>
 #include <cmath>
 #include <functional>
 #include <limits>
 
-#include "Elementwise.h"
 #include "OperationResolver.h"
 #include "OperationsExecutionUtils.h"
 #include "Tracing.h"
diff --git a/common/operations/EluExecution.cpp b/common/cpu_operations/Elu.cpp
similarity index 99%
rename from common/operations/EluExecution.cpp
rename to common/cpu_operations/Elu.cpp
index 00d2135..54dab8f 100644
--- a/common/operations/EluExecution.cpp
+++ b/common/cpu_operations/Elu.cpp
@@ -16,11 +16,12 @@
 
 #define LOG_TAG "Operations"
 
+#include "Elu.h"
+
 #include <algorithm>
 #include <cmath>
 #include <vector>
 
-#include "Elu.h"
 #include "IndexedShapeWrapper.h"
 #include "OperationResolver.h"
 #include "OperationsExecutionUtils.h"
diff --git a/common/operations/EmbeddingLookupExecution.cpp b/common/cpu_operations/EmbeddingLookup.cpp
similarity index 99%
rename from common/operations/EmbeddingLookupExecution.cpp
rename to common/cpu_operations/EmbeddingLookup.cpp
index e62a7ea..b967f1f 100644
--- a/common/operations/EmbeddingLookupExecution.cpp
+++ b/common/cpu_operations/EmbeddingLookup.cpp
@@ -16,8 +16,9 @@
 
 #define LOG_TAG "Operations"
 
-#include "CpuExecutor.h"
 #include "EmbeddingLookup.h"
+
+#include "CpuExecutor.h"
 #include "Operations.h"
 #include "Tracing.h"
 
diff --git a/common/operations/EmbeddingLookupTest.cpp b/common/cpu_operations/EmbeddingLookupTest.cpp
similarity index 100%
rename from common/operations/EmbeddingLookupTest.cpp
rename to common/cpu_operations/EmbeddingLookupTest.cpp
diff --git a/common/operations/ExpandDimsExecution.cpp b/common/cpu_operations/ExpandDims.cpp
similarity index 99%
rename from common/operations/ExpandDimsExecution.cpp
rename to common/cpu_operations/ExpandDims.cpp
index eba4b98..5fe1791 100644
--- a/common/operations/ExpandDimsExecution.cpp
+++ b/common/cpu_operations/ExpandDims.cpp
@@ -17,6 +17,7 @@
 #define LOG_TAG "Operations"
 
 #include "ExpandDims.h"
+
 #include "LegacyUtils.h"
 
 namespace android {
diff --git a/common/operations/FillExecution.cpp b/common/cpu_operations/Fill.cpp
similarity index 99%
rename from common/operations/FillExecution.cpp
rename to common/cpu_operations/Fill.cpp
index e294058..539f0f2 100644
--- a/common/operations/FillExecution.cpp
+++ b/common/cpu_operations/Fill.cpp
@@ -17,6 +17,7 @@
 #define LOG_TAG "Operations"
 
 #include "Fill.h"
+
 #include "OperationResolver.h"
 #include "OperationsExecutionUtils.h"
 
diff --git a/common/operations/FullyConnectedExecution.cpp b/common/cpu_operations/FullyConnected.cpp
similarity index 99%
rename from common/operations/FullyConnectedExecution.cpp
rename to common/cpu_operations/FullyConnected.cpp
index dfd1755..12f2770 100644
--- a/common/operations/FullyConnectedExecution.cpp
+++ b/common/cpu_operations/FullyConnected.cpp
@@ -16,9 +16,10 @@
 
 #define LOG_TAG "Operations"
 
+#include "FullyConnected.h"
+
 #include <vector>
 
-#include "FullyConnected.h"
 #include "OperationResolver.h"
 #include "Tracing.h"
 
diff --git a/common/operations/GatherExecution.cpp b/common/cpu_operations/Gather.cpp
similarity index 99%
rename from common/operations/GatherExecution.cpp
rename to common/cpu_operations/Gather.cpp
index 5182434..65ed434 100644
--- a/common/operations/GatherExecution.cpp
+++ b/common/cpu_operations/Gather.cpp
@@ -17,6 +17,7 @@
 #define LOG_TAG "Operations"
 
 #include "Gather.h"
+
 #include "OperationResolver.h"
 #include "OperationsExecutionUtils.h"
 #include "Tracing.h"
diff --git a/common/operations/GenerateProposalsExecution.cpp b/common/cpu_operations/GenerateProposals.cpp
similarity index 99%
rename from common/operations/GenerateProposalsExecution.cpp
rename to common/cpu_operations/GenerateProposals.cpp
index 12823f4..7bb95c3 100644
--- a/common/operations/GenerateProposalsExecution.cpp
+++ b/common/cpu_operations/GenerateProposals.cpp
@@ -16,6 +16,8 @@
 
 #define LOG_TAG "Operations"
 
+#include "GenerateProposals.h"
+
 #include <algorithm>
 #include <cfloat>
 #include <cmath>
@@ -23,7 +25,6 @@
 #include <utility>
 #include <vector>
 
-#include "GenerateProposals.h"
 #include "OperationResolver.h"
 #include "OperationsExecutionUtils.h"
 #include "Tracing.h"
diff --git a/common/operations/GroupedConv2DExecution.cpp b/common/cpu_operations/GroupedConv2D.cpp
similarity index 100%
rename from common/operations/GroupedConv2DExecution.cpp
rename to common/cpu_operations/GroupedConv2D.cpp
diff --git a/common/operations/HashtableLookupExecution.cpp b/common/cpu_operations/HashtableLookup.cpp
similarity index 99%
rename from common/operations/HashtableLookupExecution.cpp
rename to common/cpu_operations/HashtableLookup.cpp
index 68a6738..4773a17 100644
--- a/common/operations/HashtableLookupExecution.cpp
+++ b/common/cpu_operations/HashtableLookup.cpp
@@ -16,8 +16,9 @@
 
 #define LOG_TAG "Operations"
 
-#include "CpuExecutor.h"
 #include "HashtableLookup.h"
+
+#include "CpuExecutor.h"
 #include "Operations.h"
 #include "Tracing.h"
 
diff --git a/common/operations/HashtableLookupTest.cpp b/common/cpu_operations/HashtableLookupTest.cpp
similarity index 100%
rename from common/operations/HashtableLookupTest.cpp
rename to common/cpu_operations/HashtableLookupTest.cpp
diff --git a/common/operations/HeatmapMaxKeypointExecution.cpp b/common/cpu_operations/HeatmapMaxKeypoint.cpp
similarity index 99%
rename from common/operations/HeatmapMaxKeypointExecution.cpp
rename to common/cpu_operations/HeatmapMaxKeypoint.cpp
index 80f8165..c5ef98a 100644
--- a/common/operations/HeatmapMaxKeypointExecution.cpp
+++ b/common/cpu_operations/HeatmapMaxKeypoint.cpp
@@ -16,12 +16,13 @@
 
 #define LOG_TAG "Operations"
 
+#include "HeatmapMaxKeypoint.h"
+
 #include <algorithm>
 #include <cfloat>
 #include <cmath>
 #include <vector>
 
-#include "HeatmapMaxKeypoint.h"
 #include "OperationResolver.h"
 #include "OperationsExecutionUtils.h"
 #include "Tracing.h"
diff --git a/common/operations/InstanceNormalizationExecution.cpp b/common/cpu_operations/InstanceNormalization.cpp
similarity index 99%
rename from common/operations/InstanceNormalizationExecution.cpp
rename to common/cpu_operations/InstanceNormalization.cpp
index 60d190f..ab29947 100644
--- a/common/operations/InstanceNormalizationExecution.cpp
+++ b/common/cpu_operations/InstanceNormalization.cpp
@@ -16,10 +16,11 @@
 
 #define LOG_TAG "Operations"
 
+#include "InstanceNormalization.h"
+
 #include <cmath>
 #include <vector>
 
-#include "InstanceNormalization.h"
 #include "OperationResolver.h"
 #include "Tracing.h"
 
diff --git a/common/operations/L2NormalizationExecution.cpp b/common/cpu_operations/L2Normalization.cpp
similarity index 99%
rename from common/operations/L2NormalizationExecution.cpp
rename to common/cpu_operations/L2Normalization.cpp
index 94ebf63..bff7242 100644
--- a/common/operations/L2NormalizationExecution.cpp
+++ b/common/cpu_operations/L2Normalization.cpp
@@ -16,10 +16,11 @@
 
 #define LOG_TAG "Operations"
 
+#include "L2Normalization.h"
+
 #include <algorithm>
 #include <vector>
 
-#include "L2Normalization.h"
 #include "OperationResolver.h"
 #include "Tracing.h"
 
diff --git a/common/operations/LSHProjectionExecution.cpp b/common/cpu_operations/LSHProjection.cpp
similarity index 99%
rename from common/operations/LSHProjectionExecution.cpp
rename to common/cpu_operations/LSHProjection.cpp
index 512fc03..6ca91be 100644
--- a/common/operations/LSHProjectionExecution.cpp
+++ b/common/cpu_operations/LSHProjection.cpp
@@ -16,12 +16,13 @@
 
 #define LOG_TAG "Operations"
 
+#include "LSHProjection.h"
+
 #include <utils/hash/farmhash.h>
 
 #include <memory>
 
 #include "CpuExecutor.h"
-#include "LSHProjection.h"
 #include "LegacyUtils.h"
 #include "Tracing.h"
 #include "nnapi/Types.h"
diff --git a/common/operations/LSHProjectionTest.cpp b/common/cpu_operations/LSHProjectionTest.cpp
similarity index 100%
rename from common/operations/LSHProjectionTest.cpp
rename to common/cpu_operations/LSHProjectionTest.cpp
diff --git a/common/operations/LSTMExecution.cpp b/common/cpu_operations/LSTM.cpp
similarity index 100%
rename from common/operations/LSTMExecution.cpp
rename to common/cpu_operations/LSTM.cpp
diff --git a/common/operations/LSTMTest.cpp b/common/cpu_operations/LSTMTest.cpp
similarity index 100%
rename from common/operations/LSTMTest.cpp
rename to common/cpu_operations/LSTMTest.cpp
diff --git a/common/operations/LayerNormLSTMTest.cpp b/common/cpu_operations/LayerNormLSTMTest.cpp
similarity index 100%
rename from common/operations/LayerNormLSTMTest.cpp
rename to common/cpu_operations/LayerNormLSTMTest.cpp
diff --git a/common/operations/LocalResponseNormalizationExecution.cpp b/common/cpu_operations/LocalResponseNormalization.cpp
similarity index 99%
rename from common/operations/LocalResponseNormalizationExecution.cpp
rename to common/cpu_operations/LocalResponseNormalization.cpp
index 92413cb..d3283bc 100644
--- a/common/operations/LocalResponseNormalizationExecution.cpp
+++ b/common/cpu_operations/LocalResponseNormalization.cpp
@@ -16,10 +16,11 @@
 
 #define LOG_TAG "Operations"
 
+#include "LocalResponseNormalization.h"
+
 #include <algorithm>
 #include <vector>
 
-#include "LocalResponseNormalization.h"
 #include "OperationResolver.h"
 #include "Tracing.h"
 
diff --git a/common/operations/LogSoftmaxExecution.cpp b/common/cpu_operations/LogSoftmax.cpp
similarity index 99%
rename from common/operations/LogSoftmaxExecution.cpp
rename to common/cpu_operations/LogSoftmax.cpp
index d6fcfaf..9353c39 100644
--- a/common/operations/LogSoftmaxExecution.cpp
+++ b/common/cpu_operations/LogSoftmax.cpp
@@ -16,11 +16,12 @@
 
 #define LOG_TAG "Operations"
 
+#include "LogSoftmax.h"
+
 #include <algorithm>
 #include <cmath>
 #include <vector>
 
-#include "LogSoftmax.h"
 #include "OperationResolver.h"
 #include "OperationsExecutionUtils.h"
 #include "Tracing.h"
diff --git a/common/operations/LogicalAndOrExecution.cpp b/common/cpu_operations/LogicalAndOr.cpp
similarity index 99%
rename from common/operations/LogicalAndOrExecution.cpp
rename to common/cpu_operations/LogicalAndOr.cpp
index e0980d3..ee47992 100644
--- a/common/operations/LogicalAndOrExecution.cpp
+++ b/common/cpu_operations/LogicalAndOr.cpp
@@ -16,11 +16,12 @@
 
 #define LOG_TAG "Operations"
 
+#include "LogicalAndOr.h"
+
 #include <functional>
 #include <vector>
 
 #include "IndexedShapeWrapper.h"
-#include "LogicalAndOr.h"
 #include "OperationResolver.h"
 #include "OperationsExecutionUtils.h"
 
diff --git a/common/operations/LogicalNotExecution.cpp b/common/cpu_operations/LogicalNot.cpp
similarity index 99%
rename from common/operations/LogicalNotExecution.cpp
rename to common/cpu_operations/LogicalNot.cpp
index dfc17b4..b498ce0 100644
--- a/common/operations/LogicalNotExecution.cpp
+++ b/common/cpu_operations/LogicalNot.cpp
@@ -17,6 +17,7 @@
 #define LOG_TAG "Operations"
 
 #include "LogicalNot.h"
+
 #include "OperationResolver.h"
 #include "OperationsExecutionUtils.h"
 
diff --git a/common/operations/MaximumMinimumExecution.cpp b/common/cpu_operations/MaximumMinimum.cpp
similarity index 99%
rename from common/operations/MaximumMinimumExecution.cpp
rename to common/cpu_operations/MaximumMinimum.cpp
index 03a8bb1..9f6c840 100644
--- a/common/operations/MaximumMinimumExecution.cpp
+++ b/common/cpu_operations/MaximumMinimum.cpp
@@ -16,11 +16,12 @@
 
 #define LOG_TAG "Operations"
 
+#include "MaximumMinimum.h"
+
 #include <algorithm>
 #include <vector>
 
 #include "IndexedShapeWrapper.h"
-#include "MaximumMinimum.h"
 #include "OperationsExecutionUtils.h"
 #include "Tracing.h"
 
diff --git a/common/operations/MirrorPadExecution.cpp b/common/cpu_operations/MirrorPad.cpp
similarity index 99%
rename from common/operations/MirrorPadExecution.cpp
rename to common/cpu_operations/MirrorPad.cpp
index 5b7df64..6ae34d8 100644
--- a/common/operations/MirrorPadExecution.cpp
+++ b/common/cpu_operations/MirrorPad.cpp
@@ -16,10 +16,11 @@
 
 #define LOG_TAG "Operations"
 
+#include "MirrorPad.h"
+
 #include <algorithm>
 #include <utility>
 
-#include "MirrorPad.h"
 #include "OperationResolver.h"
 #include "OperationsExecutionUtils.h"
 
diff --git a/common/operations/MultinomialExecution.cpp b/common/cpu_operations/Multinomial.cpp
similarity index 99%
rename from common/operations/MultinomialExecution.cpp
rename to common/cpu_operations/Multinomial.cpp
index f54b98d..b057658 100644
--- a/common/operations/MultinomialExecution.cpp
+++ b/common/cpu_operations/Multinomial.cpp
@@ -16,12 +16,13 @@
 
 #define LOG_TAG "Operations"
 
+#include "Multinomial.h"
+
 #include <algorithm>
 #include <limits>
 #include <vector>
 
 #include "CpuExecutor.h"
-#include "Multinomial.h"
 #include "Tracing.h"
 
 #ifdef NN_INCLUDE_CPU_IMPLEMENTATION
diff --git a/common/operations/MultinomialTest.cpp b/common/cpu_operations/MultinomialTest.cpp
similarity index 100%
rename from common/operations/MultinomialTest.cpp
rename to common/cpu_operations/MultinomialTest.cpp
diff --git a/common/operations/NegExecution.cpp b/common/cpu_operations/Neg.cpp
similarity index 99%
rename from common/operations/NegExecution.cpp
rename to common/cpu_operations/Neg.cpp
index 661a95a..e48f08b 100644
--- a/common/operations/NegExecution.cpp
+++ b/common/cpu_operations/Neg.cpp
@@ -16,9 +16,10 @@
 
 #define LOG_TAG "Operations"
 
+#include "Neg.h"
+
 #include <cmath>
 
-#include "Neg.h"
 #include "OperationResolver.h"
 #include "OperationsExecutionUtils.h"
 #include "Tracing.h"
diff --git a/common/operations/PReluExecution.cpp b/common/cpu_operations/PRelu.cpp
similarity index 99%
rename from common/operations/PReluExecution.cpp
rename to common/cpu_operations/PRelu.cpp
index ee61807..e6e4dac 100644
--- a/common/operations/PReluExecution.cpp
+++ b/common/cpu_operations/PRelu.cpp
@@ -16,13 +16,14 @@
 
 #define LOG_TAG "Operations"
 
+#include "PRelu.h"
+
 #include <algorithm>
 #include <vector>
 
 #include "IndexedShapeWrapper.h"
 #include "OperationResolver.h"
 #include "OperationsExecutionUtils.h"
-#include "PRelu.h"
 #include "Tracing.h"
 
 #ifdef NN_INCLUDE_CPU_IMPLEMENTATION
diff --git a/common/operations/PackExecution.cpp b/common/cpu_operations/Pack.cpp
similarity index 99%
rename from common/operations/PackExecution.cpp
rename to common/cpu_operations/Pack.cpp
index bb8ffdf..fc718c2 100644
--- a/common/operations/PackExecution.cpp
+++ b/common/cpu_operations/Pack.cpp
@@ -16,9 +16,10 @@
 
 #define LOG_TAG "Operations"
 
+#include "Pack.h"
+
 #include "OperationResolver.h"
 #include "OperationsExecutionUtils.h"
-#include "Pack.h"
 
 #ifdef NN_INCLUDE_CPU_IMPLEMENTATION
 #include <limits>
diff --git a/common/operations/PoolingExecution.cpp b/common/cpu_operations/Pooling.cpp
similarity index 99%
rename from common/operations/PoolingExecution.cpp
rename to common/cpu_operations/Pooling.cpp
index 069ef41..08374fe 100644
--- a/common/operations/PoolingExecution.cpp
+++ b/common/cpu_operations/Pooling.cpp
@@ -16,10 +16,11 @@
 
 #define LOG_TAG "Operations"
 
+#include "Pooling.h"
+
 #include <vector>
 
 #include "OperationResolver.h"
-#include "Pooling.h"
 #include "Tracing.h"
 #include "nnapi/Validation.h"
 
diff --git a/common/operations/PowExecution.cpp b/common/cpu_operations/Pow.cpp
similarity index 99%
rename from common/operations/PowExecution.cpp
rename to common/cpu_operations/Pow.cpp
index 4f27ca1..9774488 100644
--- a/common/operations/PowExecution.cpp
+++ b/common/cpu_operations/Pow.cpp
@@ -16,12 +16,13 @@
 
 #define LOG_TAG "Operations"
 
+#include "Pow.h"
+
 #include <cmath>
 #include <vector>
 
 #include "IndexedShapeWrapper.h"
 #include "OperationsExecutionUtils.h"
-#include "Pow.h"
 
 namespace android {
 namespace nn {
diff --git a/common/operations/QLSTMExecution.cpp b/common/cpu_operations/QLSTM.cpp
similarity index 99%
rename from common/operations/QLSTMExecution.cpp
rename to common/cpu_operations/QLSTM.cpp
index 972875c..639ec0b 100644
--- a/common/operations/QLSTMExecution.cpp
+++ b/common/cpu_operations/QLSTM.cpp
@@ -14,13 +14,14 @@
  * limitations under the License.
  */
 
+#include "QLSTM.h"
+
 #include <algorithm>
 #include <memory>
 #include <vector>
 
 #include "CpuExecutor.h"
 #include "OperationsExecutionUtils.h"
-#include "QLSTM.h"
 
 #ifdef NN_INCLUDE_CPU_IMPLEMENTATION
 #include "QuantUtils.h"
diff --git a/common/operations/QuantizeExecution.cpp b/common/cpu_operations/Quantize.cpp
similarity index 99%
rename from common/operations/QuantizeExecution.cpp
rename to common/cpu_operations/Quantize.cpp
index a83930b..7aeb10d 100644
--- a/common/operations/QuantizeExecution.cpp
+++ b/common/cpu_operations/Quantize.cpp
@@ -16,13 +16,14 @@
 
 #define LOG_TAG "Operations"
 
+#include "Quantize.h"
+
 #include <algorithm>
 #include <cmath>
 
 #include "IndexedShapeWrapper.h"
 #include "OperationResolver.h"
 #include "OperationsExecutionUtils.h"
-#include "Quantize.h"
 #include "Tracing.h"
 
 namespace android {
diff --git a/common/operations/QuantizedLSTMExecution.cpp b/common/cpu_operations/QuantizedLSTM.cpp
similarity index 100%
rename from common/operations/QuantizedLSTMExecution.cpp
rename to common/cpu_operations/QuantizedLSTM.cpp
diff --git a/common/operations/QuantizedLSTMTest.cpp b/common/cpu_operations/QuantizedLSTMTest.cpp
similarity index 100%
rename from common/operations/QuantizedLSTMTest.cpp
rename to common/cpu_operations/QuantizedLSTMTest.cpp
diff --git a/common/operations/RNNExecution.cpp b/common/cpu_operations/RNN.cpp
similarity index 99%
rename from common/operations/RNNExecution.cpp
rename to common/cpu_operations/RNN.cpp
index e78f6cb..bc5a819 100644
--- a/common/operations/RNNExecution.cpp
+++ b/common/cpu_operations/RNN.cpp
@@ -16,11 +16,12 @@
 
 #define LOG_TAG "Operations"
 
+#include "RNN.h"
+
 #include <vector>
 
 #include "CpuExecutor.h"
 #include "CpuOperationUtils.h"
-#include "RNN.h"
 #include "Tracing.h"
 
 namespace android {
diff --git a/common/operations/RNNTest.cpp b/common/cpu_operations/RNNTest.cpp
similarity index 100%
rename from common/operations/RNNTest.cpp
rename to common/cpu_operations/RNNTest.cpp
diff --git a/common/operations/RankExecution.cpp b/common/cpu_operations/Rank.cpp
similarity index 99%
rename from common/operations/RankExecution.cpp
rename to common/cpu_operations/Rank.cpp
index 3b850c0..9003797 100644
--- a/common/operations/RankExecution.cpp
+++ b/common/cpu_operations/Rank.cpp
@@ -16,10 +16,11 @@
 
 #define LOG_TAG "Operations"
 
+#include "Rank.h"
+
 #include "LegacyUtils.h"
 #include "OperationResolver.h"
 #include "OperationsExecutionUtils.h"
-#include "Rank.h"
 
 namespace android {
 namespace nn {
diff --git a/common/operations/ReduceExecution.cpp b/common/cpu_operations/Reduce.cpp
similarity index 99%
rename from common/operations/ReduceExecution.cpp
rename to common/cpu_operations/Reduce.cpp
index 8e14a5e..66cab69 100644
--- a/common/operations/ReduceExecution.cpp
+++ b/common/cpu_operations/Reduce.cpp
@@ -16,13 +16,14 @@
 
 #define LOG_TAG "Operations"
 
+#include "Reduce.h"
+
 #include <algorithm>
 #include <limits>
 #include <vector>
 
 #include "OperationResolver.h"
 #include "OperationsExecutionUtils.h"
-#include "Reduce.h"
 #include "Tracing.h"
 
 #ifdef NN_INCLUDE_CPU_IMPLEMENTATION
diff --git a/common/operations/ReshapeExecution.cpp b/common/cpu_operations/Reshape.cpp
similarity index 100%
rename from common/operations/ReshapeExecution.cpp
rename to common/cpu_operations/Reshape.cpp
diff --git a/common/operations/ResizeImageOpsExecution.cpp b/common/cpu_operations/ResizeImageOps.cpp
similarity index 99%
rename from common/operations/ResizeImageOpsExecution.cpp
rename to common/cpu_operations/ResizeImageOps.cpp
index 1bd46b1..c3f6316 100644
--- a/common/operations/ResizeImageOpsExecution.cpp
+++ b/common/cpu_operations/ResizeImageOps.cpp
@@ -16,12 +16,13 @@
 
 #define LOG_TAG "Operations"
 
+#include "ResizeImageOps.h"
+
 #include <algorithm>
 #include <functional>
 #include <vector>
 
 #include "OperationResolver.h"
-#include "ResizeImageOps.h"
 #include "Tracing.h"
 #include "nnapi/Validation.h"
 
diff --git a/common/operations/ReverseExecution.cpp b/common/cpu_operations/Reverse.cpp
similarity index 99%
rename from common/operations/ReverseExecution.cpp
rename to common/cpu_operations/Reverse.cpp
index 0f5c806..1e75b47 100644
--- a/common/operations/ReverseExecution.cpp
+++ b/common/cpu_operations/Reverse.cpp
@@ -16,9 +16,10 @@
 
 #define LOG_TAG "Operations"
 
+#include "Reverse.h"
+
 #include "OperationResolver.h"
 #include "OperationsExecutionUtils.h"
-#include "Reverse.h"
 
 #ifdef NN_INCLUDE_CPU_IMPLEMENTATION
 
diff --git a/common/operations/RoiAlignExecution.cpp b/common/cpu_operations/RoiAlign.cpp
similarity index 99%
rename from common/operations/RoiAlignExecution.cpp
rename to common/cpu_operations/RoiAlign.cpp
index 96d7ef1..a276f24 100644
--- a/common/operations/RoiAlignExecution.cpp
+++ b/common/cpu_operations/RoiAlign.cpp
@@ -16,6 +16,8 @@
 
 #define LOG_TAG "Operations"
 
+#include "RoiAlign.h"
+
 #include <algorithm>
 #include <cfloat>
 #include <cmath>
@@ -23,7 +25,6 @@
 
 #include "OperationResolver.h"
 #include "OperationsExecutionUtils.h"
-#include "RoiAlign.h"
 #include "Tracing.h"
 
 #ifdef NN_INCLUDE_CPU_IMPLEMENTATION
diff --git a/common/operations/RoiPoolingExecution.cpp b/common/cpu_operations/RoiPooling.cpp
similarity index 99%
rename from common/operations/RoiPoolingExecution.cpp
rename to common/cpu_operations/RoiPooling.cpp
index 772a8f7..3549073 100644
--- a/common/operations/RoiPoolingExecution.cpp
+++ b/common/cpu_operations/RoiPooling.cpp
@@ -16,6 +16,8 @@
 
 #define LOG_TAG "Operations"
 
+#include "RoiPooling.h"
+
 #include <algorithm>
 #include <cfloat>
 #include <cmath>
@@ -23,7 +25,6 @@
 
 #include "OperationResolver.h"
 #include "OperationsExecutionUtils.h"
-#include "RoiPooling.h"
 #include "Tracing.h"
 
 #ifdef NN_INCLUDE_CPU_IMPLEMENTATION
diff --git a/common/operations/SVDFExecution.cpp b/common/cpu_operations/SVDF.cpp
similarity index 99%
rename from common/operations/SVDFExecution.cpp
rename to common/cpu_operations/SVDF.cpp
index 3308596..1d54542 100644
--- a/common/operations/SVDFExecution.cpp
+++ b/common/cpu_operations/SVDF.cpp
@@ -16,6 +16,8 @@
 
 #define LOG_TAG "Operations"
 
+#include "SVDF.h"
+
 #include <tensorflow/lite/kernels/internal/tensor_utils.h>
 
 #include <algorithm>
@@ -23,7 +25,6 @@
 
 #include "CpuExecutor.h"
 #include "CpuOperationUtils.h"
-#include "SVDF.h"
 #include "Tracing.h"
 
 namespace android {
diff --git a/common/operations/SVDFTest.cpp b/common/cpu_operations/SVDFTest.cpp
similarity index 100%
rename from common/operations/SVDFTest.cpp
rename to common/cpu_operations/SVDFTest.cpp
diff --git a/common/operations/SelectExecution.cpp b/common/cpu_operations/Select.cpp
similarity index 99%
rename from common/operations/SelectExecution.cpp
rename to common/cpu_operations/Select.cpp
index bbcbb92..0321618 100644
--- a/common/operations/SelectExecution.cpp
+++ b/common/cpu_operations/Select.cpp
@@ -16,10 +16,11 @@
 
 #define LOG_TAG "Operations"
 
+#include "Select.h"
+
 #include "IndexedShapeWrapper.h"
 #include "OperationResolver.h"
 #include "OperationsExecutionUtils.h"
-#include "Select.h"
 
 namespace android {
 namespace nn {
diff --git a/common/operations/SimpleMathExecution.cpp b/common/cpu_operations/SimpleMath.cpp
similarity index 100%
rename from common/operations/SimpleMathExecution.cpp
rename to common/cpu_operations/SimpleMath.cpp
diff --git a/common/operations/SliceExecution.cpp b/common/cpu_operations/Slice.cpp
similarity index 99%
rename from common/operations/SliceExecution.cpp
rename to common/cpu_operations/Slice.cpp
index 1ca665c..590fba2 100644
--- a/common/operations/SliceExecution.cpp
+++ b/common/cpu_operations/Slice.cpp
@@ -16,11 +16,12 @@
 
 #define LOG_TAG "Operations"
 
+#include "Slice.h"
+
 #include <vector>
 
 #include "IndexedShapeWrapper.h"
 #include "OperationResolver.h"
-#include "Slice.h"
 
 #ifdef NN_INCLUDE_CPU_IMPLEMENTATION
 #include "CpuOperationUtils.h"
diff --git a/common/operations/SoftmaxExecution.cpp b/common/cpu_operations/Softmax.cpp
similarity index 99%
rename from common/operations/SoftmaxExecution.cpp
rename to common/cpu_operations/Softmax.cpp
index ca474c2..fbc46ed 100644
--- a/common/operations/SoftmaxExecution.cpp
+++ b/common/cpu_operations/Softmax.cpp
@@ -16,13 +16,14 @@
 
 #define LOG_TAG "Operations"
 
+#include "Softmax.h"
+
 #include <algorithm>
 #include <cfloat>
 #include <limits>
 #include <vector>
 
 #include "OperationResolver.h"
-#include "Softmax.h"
 #include "Tracing.h"
 #include "nnapi/Validation.h"
 
diff --git a/common/operations/SplitExecution.cpp b/common/cpu_operations/Split.cpp
similarity index 99%
rename from common/operations/SplitExecution.cpp
rename to common/cpu_operations/Split.cpp
index 3d5b2dc..479f842 100644
--- a/common/operations/SplitExecution.cpp
+++ b/common/cpu_operations/Split.cpp
@@ -16,11 +16,12 @@
 
 #define LOG_TAG "Operations"
 
+#include "Split.h"
+
 #include <vector>
 
 #include "Operations.h"
 #include "OperationsExecutionUtils.h"
-#include "Split.h"
 #include "Tracing.h"
 
 namespace android {
diff --git a/common/operations/SqueezeExecution.cpp b/common/cpu_operations/Squeeze.cpp
similarity index 99%
rename from common/operations/SqueezeExecution.cpp
rename to common/cpu_operations/Squeeze.cpp
index 61b38ba..98edffe 100644
--- a/common/operations/SqueezeExecution.cpp
+++ b/common/cpu_operations/Squeeze.cpp
@@ -18,11 +18,12 @@
 
 #define LOG_TAG "Operations"
 
+#include "Squeeze.h"
+
 #include <vector>
 
 #include "OperationResolver.h"
 #include "Operations.h"
-#include "Squeeze.h"
 #include "Tracing.h"
 
 namespace android {
diff --git a/common/operations/StridedSliceExecution.cpp b/common/cpu_operations/StridedSlice.cpp
similarity index 99%
rename from common/operations/StridedSliceExecution.cpp
rename to common/cpu_operations/StridedSlice.cpp
index c819626..1abf247 100644
--- a/common/operations/StridedSliceExecution.cpp
+++ b/common/cpu_operations/StridedSlice.cpp
@@ -18,11 +18,12 @@
 
 #define LOG_TAG "Operations"
 
+#include "StridedSlice.h"
+
 #include <vector>
 
 #include "OperationResolver.h"
 #include "Operations.h"
-#include "StridedSlice.h"
 #include "Tracing.h"
 
 #ifdef NN_INCLUDE_CPU_IMPLEMENTATION
diff --git a/common/operations/TileExecution.cpp b/common/cpu_operations/Tile.cpp
similarity index 99%
rename from common/operations/TileExecution.cpp
rename to common/cpu_operations/Tile.cpp
index bcc4a9d..5135c8a 100644
--- a/common/operations/TileExecution.cpp
+++ b/common/cpu_operations/Tile.cpp
@@ -16,10 +16,11 @@
 
 #define LOG_TAG "Operations"
 
+#include "Tile.h"
+
 #include <algorithm>
 #include <utility>
 
-#include "Tile.h"
 #include "Tracing.h"
 
 namespace android {
diff --git a/common/operations/TopK_V2Execution.cpp b/common/cpu_operations/TopK_V2.cpp
similarity index 99%
rename from common/operations/TopK_V2Execution.cpp
rename to common/cpu_operations/TopK_V2.cpp
index 2f57c32..a47f89c 100644
--- a/common/operations/TopK_V2Execution.cpp
+++ b/common/cpu_operations/TopK_V2.cpp
@@ -16,13 +16,14 @@
 
 #define LOG_TAG "Operations"
 
+#include "TopK_V2.h"
+
 #include <algorithm>
 #include <utility>
 #include <vector>
 
 #include "OperationResolver.h"
 #include "OperationsExecutionUtils.h"
-#include "TopK_V2.h"
 
 namespace android {
 namespace nn {
diff --git a/common/operations/TransposeExecution.cpp b/common/cpu_operations/Transpose.cpp
similarity index 99%
rename from common/operations/TransposeExecution.cpp
rename to common/cpu_operations/Transpose.cpp
index 7da440a..1fff5bd 100644
--- a/common/operations/TransposeExecution.cpp
+++ b/common/cpu_operations/Transpose.cpp
@@ -16,11 +16,12 @@
 
 #define LOG_TAG "Operations"
 
+#include "Transpose.h"
+
 #include <vector>
 
 #include "OperationResolver.h"
 #include "Tracing.h"
-#include "Transpose.h"
 
 #ifdef NN_INCLUDE_CPU_IMPLEMENTATION
 #pragma clang diagnostic push
diff --git a/common/operations/TransposeConv2DExecution.cpp b/common/cpu_operations/TransposeConv2D.cpp
similarity index 99%
rename from common/operations/TransposeConv2DExecution.cpp
rename to common/cpu_operations/TransposeConv2D.cpp
index fd626ed..9262c2f 100644
--- a/common/operations/TransposeConv2DExecution.cpp
+++ b/common/cpu_operations/TransposeConv2D.cpp
@@ -16,6 +16,8 @@
 
 #define LOG_TAG "Operations"
 
+#include "TransposeConv2D.h"
+
 #include <algorithm>
 #include <cfloat>
 #include <cmath>
@@ -24,7 +26,6 @@
 
 #include "OperationResolver.h"
 #include "Tracing.h"
-#include "TransposeConv2D.h"
 
 #ifdef NN_INCLUDE_CPU_IMPLEMENTATION
 #pragma clang diagnostic push
diff --git a/common/operations/UnidirectionalSequenceLSTMExecution.cpp b/common/cpu_operations/UnidirectionalSequenceLSTM.cpp
similarity index 99%
rename from common/operations/UnidirectionalSequenceLSTMExecution.cpp
rename to common/cpu_operations/UnidirectionalSequenceLSTM.cpp
index 93f4d65..f949090 100644
--- a/common/operations/UnidirectionalSequenceLSTMExecution.cpp
+++ b/common/cpu_operations/UnidirectionalSequenceLSTM.cpp
@@ -16,12 +16,13 @@
 
 #define LOG_TAG "Operations"
 
+#include "UnidirectionalSequenceLSTM.h"
+
 #include <vector>
 
 #include "IndexedShapeWrapper.h"
 #include "OperationResolver.h"
 #include "OperationsExecutionUtils.h"
-#include "UnidirectionalSequenceLSTM.h"
 
 #ifdef NN_INCLUDE_CPU_IMPLEMENTATION
 #include <tensorflow/lite/kernels/internal/tensor_utils.h>
diff --git a/common/operations/UnidirectionalSequenceRNNExecution.cpp b/common/cpu_operations/UnidirectionalSequenceRNN.cpp
similarity index 99%
rename from common/operations/UnidirectionalSequenceRNNExecution.cpp
rename to common/cpu_operations/UnidirectionalSequenceRNN.cpp
index 6751126..d3078b5 100644
--- a/common/operations/UnidirectionalSequenceRNNExecution.cpp
+++ b/common/cpu_operations/UnidirectionalSequenceRNN.cpp
@@ -16,13 +16,14 @@
 
 #define LOG_TAG "Operations"
 
+#include "UnidirectionalSequenceRNN.h"
+
 #include <algorithm>
 #include <utility>
 #include <vector>
 
 #include "OperationResolver.h"
 #include "RNN.h"
-#include "UnidirectionalSequenceRNN.h"
 #include "nnapi/TypeUtils.h"
 
 namespace android {
diff --git a/common/include/Operations.h b/common/include/Operations.h
index 066cb31..bb70610 100644
--- a/common/include/Operations.h
+++ b/common/include/Operations.h
@@ -24,23 +24,6 @@
 
 #include "ActivationFunctor.h"
 
-#ifndef NN_COMPATIBILITY_LIBRARY_BUILD
-#include "operations/BidirectionalSequenceLSTM.h"
-#include "operations/Cast.h"
-#include "operations/EmbeddingLookup.h"
-#include "operations/ExpandDims.h"
-#include "operations/HashtableLookup.h"
-#include "operations/LSHProjection.h"
-#include "operations/LSTM.h"
-#include "operations/MaximumMinimum.h"
-#include "operations/Multinomial.h"
-#include "operations/Pow.h"
-#include "operations/QuantizedLSTM.h"
-#include "operations/RNN.h"
-#include "operations/SVDF.h"
-#include "operations/Tile.h"
-#endif  // NN_COMPATIBILITY_LIBRARY_BUILD
-
 namespace android {
 namespace nn {
 
@@ -180,4 +163,5 @@
                            int32_t axis, uint8_t* outputData, const Shape& outputShape);
 }  // namespace nn
 }  // namespace android
+
 #endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_H
diff --git a/common/types/Android.bp b/common/types/Android.bp
index 5035dd8..48342e5 100644
--- a/common/types/Android.bp
+++ b/common/types/Android.bp
@@ -51,7 +51,7 @@
     name: "neuralnetworks_types_defaults",
     defaults: ["neuralnetworks_utils_defaults"],
     srcs: [
-        ":neuralnetworks_operations_validation",
+        "operations/src/*.cpp",
         "src/OperationsUtils.cpp",
         "src/OperationsValidationUtils.cpp",
         "src/SharedMemory.cpp",
@@ -68,7 +68,10 @@
             static_libs: ["libarect"],
         },
     },
-    local_include_dirs: ["include/nnapi"],
+    local_include_dirs: [
+        "include/nnapi",
+        "operations/include",
+    ],
     export_include_dirs: ["include"],
     shared_libs: [
         "libbase",
@@ -101,7 +104,7 @@
         "neuralnetworks_utils_defaults",
     ],
     srcs: [
-        ":neuralnetworks_operations_validation",
+        "operations/src/*.cpp",
         "src/DynamicCLDeps.cpp",
         "src/OperationsUtils.cpp",
         "src/OperationsValidationUtils.cpp",
@@ -111,7 +114,10 @@
         "src/Types.cpp",
         "src/Validation.cpp",
     ],
-    local_include_dirs: ["include/nnapi"],
+    local_include_dirs: [
+        "include/nnapi",
+        "operations/include",
+    ],
     export_include_dirs: ["include"],
     static_libs: [
         "libbase_ndk",
diff --git a/common/operations/Activation.h b/common/types/operations/include/Activation.h
similarity index 77%
rename from common/operations/Activation.h
rename to common/types/operations/include/Activation.h
index 6612a59..cad144b 100644
--- a/common/operations/Activation.h
+++ b/common/types/operations/include/Activation.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_ACTIVATION_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_ACTIVATION_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_ACTIVATION_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_ACTIVATION_H
 
 #include "OperationsValidationUtils.h"
 
@@ -29,4 +29,4 @@
 
 }  // namespace android::nn::activation
 
-#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_ACTIVATION_H
+#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_ACTIVATION_H
diff --git a/common/operations/ArgMinMax.h b/common/types/operations/include/ArgMinMax.h
similarity index 74%
rename from common/operations/ArgMinMax.h
rename to common/types/operations/include/ArgMinMax.h
index 756e168..0cfdb52 100644
--- a/common/operations/ArgMinMax.h
+++ b/common/types/operations/include/ArgMinMax.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_ARG_MINMAX_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_ARG_MINMAX_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_ARG_MINMAX_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_ARG_MINMAX_H
 
 #include "OperationsValidationUtils.h"
 
@@ -25,4 +25,4 @@
 
 }  // namespace android::nn::arg_min_max
 
-#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_ARG_MINMAX_H
+#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_ARG_MINMAX_H
diff --git a/common/operations/BatchMatmul.h b/common/types/operations/include/BatchMatmul.h
similarity index 79%
rename from common/operations/BatchMatmul.h
rename to common/types/operations/include/BatchMatmul.h
index f12fb5a..1839099 100644
--- a/common/operations/BatchMatmul.h
+++ b/common/types/operations/include/BatchMatmul.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_BATCH_MATMUL_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_BATCH_MATMUL_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_BATCH_MATMUL_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_BATCH_MATMUL_H
 
 #include "OperationsValidationUtils.h"
 
@@ -34,4 +34,4 @@
 
 }  // namespace android::nn::batch_matmul_op
 
-#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_BATCH_MATMUL_H
+#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_BATCH_MATMUL_H
diff --git a/common/operations/BidirectionalSequenceLSTM.h b/common/types/operations/include/BidirectionalSequenceLSTM.h
similarity index 96%
rename from common/operations/BidirectionalSequenceLSTM.h
rename to common/types/operations/include/BidirectionalSequenceLSTM.h
index 405e524..ec28b7b 100644
--- a/common/operations/BidirectionalSequenceLSTM.h
+++ b/common/types/operations/include/BidirectionalSequenceLSTM.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_BIDIRECTIONAL_SEQUENCE_LSTM_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_BIDIRECTIONAL_SEQUENCE_LSTM_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_BIDIRECTIONAL_SEQUENCE_LSTM_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_BIDIRECTIONAL_SEQUENCE_LSTM_H
 
 #include <algorithm>
 #include <cmath>
@@ -240,4 +240,4 @@
 }  // namespace nn
 }  // namespace android
 
-#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_BIDIRECTIONAL_SEQUENCE_LSTM_H
+#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_BIDIRECTIONAL_SEQUENCE_LSTM_H
diff --git a/common/operations/BidirectionalSequenceRNN.h b/common/types/operations/include/BidirectionalSequenceRNN.h
similarity index 86%
rename from common/operations/BidirectionalSequenceRNN.h
rename to common/types/operations/include/BidirectionalSequenceRNN.h
index 2b05329..7ca104e 100644
--- a/common/operations/BidirectionalSequenceRNN.h
+++ b/common/types/operations/include/BidirectionalSequenceRNN.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_BIDIRECTIONAL_SEQUENCE_RNN_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_BIDIRECTIONAL_SEQUENCE_RNN_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_BIDIRECTIONAL_SEQUENCE_RNN_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_BIDIRECTIONAL_SEQUENCE_RNN_H
 
 #include "OperationsValidationUtils.h"
 
@@ -54,4 +54,4 @@
 
 }  // namespace android::nn::bidirectional_sequence_rnn
 
-#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_BIDIRECTIONAL_SEQUENCE_RNN_H
+#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_BIDIRECTIONAL_SEQUENCE_RNN_H
diff --git a/common/operations/Broadcast.h b/common/types/operations/include/Broadcast.h
similarity index 78%
rename from common/operations/Broadcast.h
rename to common/types/operations/include/Broadcast.h
index 5e85486..5bf7cd4 100644
--- a/common/operations/Broadcast.h
+++ b/common/types/operations/include/Broadcast.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_BROADCAST_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_BROADCAST_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_BROADCAST_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_BROADCAST_H
 
 #include "OperationsValidationUtils.h"
 
@@ -31,4 +31,4 @@
 
 }  // namespace android::nn::broadcast
 
-#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_BROADCAST_H
+#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_BROADCAST_H
diff --git a/common/operations/Cast.h b/common/types/operations/include/Cast.h
similarity index 79%
rename from common/operations/Cast.h
rename to common/types/operations/include/Cast.h
index a8fb005..bd1daed 100644
--- a/common/operations/Cast.h
+++ b/common/types/operations/include/Cast.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_CAST_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_CAST_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_CAST_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_CAST_H
 
 #include "OperationsValidationUtils.h"
 
@@ -32,4 +32,4 @@
 }  // namespace nn
 }  // namespace android
 
-#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_CAST_H
+#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_CAST_H
diff --git a/common/operations/ChannelShuffle.h b/common/types/operations/include/ChannelShuffle.h
similarity index 78%
rename from common/operations/ChannelShuffle.h
rename to common/types/operations/include/ChannelShuffle.h
index ec38d74..8ccca56 100644
--- a/common/operations/ChannelShuffle.h
+++ b/common/types/operations/include/ChannelShuffle.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_CHANNEL_SHUFFLE_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_CHANNEL_SHUFFLE_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_CHANNEL_SHUFFLE_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_CHANNEL_SHUFFLE_H
 
 #include "OperationsValidationUtils.h"
 
@@ -33,4 +33,4 @@
 
 }  // namespace android::nn::channel_shuffle
 
-#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_CHANNEL_SHUFFLE_H
+#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_CHANNEL_SHUFFLE_H
diff --git a/common/operations/Comparisons.h b/common/types/operations/include/Comparisons.h
similarity index 77%
rename from common/operations/Comparisons.h
rename to common/types/operations/include/Comparisons.h
index cc4f5e6..64377ba 100644
--- a/common/operations/Comparisons.h
+++ b/common/types/operations/include/Comparisons.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_COMPARISONS_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_COMPARISONS_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_COMPARISONS_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_COMPARISONS_H
 
 #include "OperationsValidationUtils.h"
 
@@ -30,4 +30,4 @@
 
 }  // namespace android::nn::comparisons
 
-#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_COMPARISONS_H
+#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_COMPARISONS_H
diff --git a/common/operations/Concatenation.h b/common/types/operations/include/Concatenation.h
similarity index 76%
rename from common/operations/Concatenation.h
rename to common/types/operations/include/Concatenation.h
index 5aa238b..3379058 100644
--- a/common/operations/Concatenation.h
+++ b/common/types/operations/include/Concatenation.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_CONCATENATION_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_CONCATENATION_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_CONCATENATION_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_CONCATENATION_H
 
 #include "OperationsValidationUtils.h"
 
@@ -28,4 +28,4 @@
 
 }  // namespace android::nn::concatenation
 
-#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_CONCATENATION_H
+#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_CONCATENATION_H
diff --git a/common/operations/Conv2D.h b/common/types/operations/include/Conv2D.h
similarity index 80%
rename from common/operations/Conv2D.h
rename to common/types/operations/include/Conv2D.h
index cd05c35..341551a 100644
--- a/common/operations/Conv2D.h
+++ b/common/types/operations/include/Conv2D.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_CONV_2D_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_CONV_2D_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_CONV_2D_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_CONV_2D_H
 
 #include "OperationsValidationUtils.h"
 
@@ -33,4 +33,4 @@
 
 }  // namespace android::nn::conv_2d
 
-#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_CONV_2D_H
+#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_CONV_2D_H
diff --git a/common/operations/Densify.h b/common/types/operations/include/Densify.h
similarity index 83%
rename from common/operations/Densify.h
rename to common/types/operations/include/Densify.h
index 65d1354..e483114 100644
--- a/common/operations/Densify.h
+++ b/common/types/operations/include/Densify.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_DENSIFY_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_DENSIFY_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_DENSIFY_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_DENSIFY_H
 
 #include <vector>
 
@@ -43,4 +43,4 @@
 }  // namespace nn
 }  // namespace android
 
-#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_DENSIFY_H
+#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_DENSIFY_H
diff --git a/common/operations/DepthwiseConv2D.h b/common/types/operations/include/DepthwiseConv2D.h
similarity index 78%
rename from common/operations/DepthwiseConv2D.h
rename to common/types/operations/include/DepthwiseConv2D.h
index 3d559e3..539f5da 100644
--- a/common/operations/DepthwiseConv2D.h
+++ b/common/types/operations/include/DepthwiseConv2D.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_DEPTHWISE_CONV_2D_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_DEPTHWISE_CONV_2D_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_DEPTHWISE_CONV_2D_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_DEPTHWISE_CONV_2D_H
 
 #include "OperationsValidationUtils.h"
 
@@ -33,4 +33,4 @@
 
 }  // namespace android::nn::depthwise_conv_2d
 
-#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_DEPTHWISE_CONV_2D_H
+#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_DEPTHWISE_CONV_2D_H
diff --git a/common/operations/Dequantize.h b/common/types/operations/include/Dequantize.h
similarity index 77%
rename from common/operations/Dequantize.h
rename to common/types/operations/include/Dequantize.h
index 7a4b263..874b9a6 100644
--- a/common/operations/Dequantize.h
+++ b/common/types/operations/include/Dequantize.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_DEQUANTIZE_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_DEQUANTIZE_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_DEQUANTIZE_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_DEQUANTIZE_H
 
 #include "OperationsValidationUtils.h"
 
@@ -29,4 +29,4 @@
 
 }  // namespace android::nn::dequantize
 
-#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_DEQUANTIZE_H
+#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_DEQUANTIZE_H
diff --git a/common/operations/Elementwise.h b/common/types/operations/include/Elementwise.h
similarity index 77%
rename from common/operations/Elementwise.h
rename to common/types/operations/include/Elementwise.h
index d30b19b..9859bd4 100644
--- a/common/operations/Elementwise.h
+++ b/common/types/operations/include/Elementwise.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_ELEMENTWISE_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_ELEMENTWISE_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_ELEMENTWISE_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_ELEMENTWISE_H
 
 #include "OperationsValidationUtils.h"
 
@@ -29,4 +29,4 @@
 
 }  // namespace android::nn::elementwise
 
-#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_ELEMENTWISE_H
+#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_ELEMENTWISE_H
diff --git a/common/operations/Elu.h b/common/types/operations/include/Elu.h
similarity index 79%
rename from common/operations/Elu.h
rename to common/types/operations/include/Elu.h
index 2c7521a..5d734e4 100644
--- a/common/operations/Elu.h
+++ b/common/types/operations/include/Elu.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_ELU_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_ELU_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_ELU_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_ELU_H
 
 #include "OperationsValidationUtils.h"
 
@@ -30,4 +30,4 @@
 
 }  // namespace android::nn::elu
 
-#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_ELU_H
+#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_ELU_H
diff --git a/common/operations/EmbeddingLookup.h b/common/types/operations/include/EmbeddingLookup.h
similarity index 81%
rename from common/operations/EmbeddingLookup.h
rename to common/types/operations/include/EmbeddingLookup.h
index 323b48c..e8b0dd9 100644
--- a/common/operations/EmbeddingLookup.h
+++ b/common/types/operations/include/EmbeddingLookup.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_EMBEDDING_LOOKUP_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_EMBEDDING_LOOKUP_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_EMBEDDING_LOOKUP_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_EMBEDDING_LOOKUP_H
 
 #include <vector>
 
@@ -48,4 +48,4 @@
 }  // namespace nn
 }  // namespace android
 
-#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_EMBEDDING_LOOKUP_H
+#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_EMBEDDING_LOOKUP_H
diff --git a/common/operations/ExpandDims.h b/common/types/operations/include/ExpandDims.h
similarity index 78%
rename from common/operations/ExpandDims.h
rename to common/types/operations/include/ExpandDims.h
index 1e27f47..3129ef8 100644
--- a/common/operations/ExpandDims.h
+++ b/common/types/operations/include/ExpandDims.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_EXPAND_DIMS_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_EXPAND_DIMS_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_EXPAND_DIMS_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_EXPAND_DIMS_H
 
 #include "OperationsValidationUtils.h"
 
@@ -32,4 +32,4 @@
 }  // namespace nn
 }  // namespace android
 
-#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_EXPAND_DIMS_H
+#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_EXPAND_DIMS_H
diff --git a/common/operations/Fill.h b/common/types/operations/include/Fill.h
similarity index 79%
rename from common/operations/Fill.h
rename to common/types/operations/include/Fill.h
index e5eda45..763a510 100644
--- a/common/operations/Fill.h
+++ b/common/types/operations/include/Fill.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_FILL_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_FILL_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_FILL_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_FILL_H
 
 #include "OperationsValidationUtils.h"
 
@@ -30,4 +30,4 @@
 
 }  // namespace android::nn::fill_op
 
-#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_FILL_H
+#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_FILL_H
diff --git a/common/operations/FullyConnected.h b/common/types/operations/include/FullyConnected.h
similarity index 81%
rename from common/operations/FullyConnected.h
rename to common/types/operations/include/FullyConnected.h
index 7e49330..29a925b 100644
--- a/common/operations/FullyConnected.h
+++ b/common/types/operations/include/FullyConnected.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_FULLY_CONNECTED_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_FULLY_CONNECTED_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_FULLY_CONNECTED_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_FULLY_CONNECTED_H
 
 #include "OperationsValidationUtils.h"
 
@@ -37,4 +37,4 @@
 
 }  // namespace android::nn::fully_connected
 
-#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_FULLY_CONNECTED_H
+#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_FULLY_CONNECTED_H
diff --git a/common/operations/Gather.h b/common/types/operations/include/Gather.h
similarity index 79%
rename from common/operations/Gather.h
rename to common/types/operations/include/Gather.h
index 980d6d4..4da0a20 100644
--- a/common/operations/Gather.h
+++ b/common/types/operations/include/Gather.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_GATHER_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_GATHER_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_GATHER_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_GATHER_H
 
 #include "OperationsValidationUtils.h"
 
@@ -33,4 +33,4 @@
 
 }  // namespace android::nn::gather
 
-#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_GATHER_H
+#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_GATHER_H
diff --git a/common/operations/GenerateProposals.h b/common/types/operations/include/GenerateProposals.h
similarity index 92%
rename from common/operations/GenerateProposals.h
rename to common/types/operations/include/GenerateProposals.h
index 4f424ea..e237a0d 100644
--- a/common/operations/GenerateProposals.h
+++ b/common/types/operations/include/GenerateProposals.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_GENERATE_PROPOSALS_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_GENERATE_PROPOSALS_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_GENERATE_PROPOSALS_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_GENERATE_PROPOSALS_H
 
 #include "OperationsValidationUtils.h"
 
@@ -113,4 +113,4 @@
 
 }  // namespace android::nn::bbox_ops
 
-#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_GENERATE_PROPOSALS_H
+#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_GENERATE_PROPOSALS_H
diff --git a/common/operations/GroupedConv2D.h b/common/types/operations/include/GroupedConv2D.h
similarity index 73%
rename from common/operations/GroupedConv2D.h
rename to common/types/operations/include/GroupedConv2D.h
index af9bee7..f4806f4 100644
--- a/common/operations/GroupedConv2D.h
+++ b/common/types/operations/include/GroupedConv2D.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_GROUPED_CONV_2D_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_GROUPED_CONV_2D_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_GROUPED_CONV_2D_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_GROUPED_CONV_2D_H
 
 #include "OperationsValidationUtils.h"
 
@@ -25,4 +25,4 @@
 
 }  // namespace android::nn::grouped_conv2d
 
-#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_GROUPED_CONV_2D_H
+#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_GROUPED_CONV_2D_H
diff --git a/common/operations/HashtableLookup.h b/common/types/operations/include/HashtableLookup.h
similarity index 82%
rename from common/operations/HashtableLookup.h
rename to common/types/operations/include/HashtableLookup.h
index 0628898..c272cdc 100644
--- a/common/operations/HashtableLookup.h
+++ b/common/types/operations/include/HashtableLookup.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_HASHTABLE_LOOKUP_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_HASHTABLE_LOOKUP_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_HASHTABLE_LOOKUP_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_HASHTABLE_LOOKUP_H
 
 #include <vector>
 
@@ -52,4 +52,4 @@
 }  // namespace nn
 }  // namespace android
 
-#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_HASHTABLE_LOOKUP_H
+#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_HASHTABLE_LOOKUP_H
diff --git a/common/operations/HeatmapMaxKeypoint.h b/common/types/operations/include/HeatmapMaxKeypoint.h
similarity index 78%
rename from common/operations/HeatmapMaxKeypoint.h
rename to common/types/operations/include/HeatmapMaxKeypoint.h
index f1245cf..5e5275d 100644
--- a/common/operations/HeatmapMaxKeypoint.h
+++ b/common/types/operations/include/HeatmapMaxKeypoint.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_HEATMAP_MAX_KEYPOINT_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_HEATMAP_MAX_KEYPOINT_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_HEATMAP_MAX_KEYPOINT_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_HEATMAP_MAX_KEYPOINT_H
 
 #include "OperationsValidationUtils.h"
 
@@ -34,4 +34,4 @@
 
 }  // namespace android::nn::heatmap_max_keypoint
 
-#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_HEATMAP_MAX_KEYPOINT_H
+#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_HEATMAP_MAX_KEYPOINT_H
diff --git a/common/operations/InstanceNormalization.h b/common/types/operations/include/InstanceNormalization.h
similarity index 79%
rename from common/operations/InstanceNormalization.h
rename to common/types/operations/include/InstanceNormalization.h
index 7bba7b6..1049193 100644
--- a/common/operations/InstanceNormalization.h
+++ b/common/types/operations/include/InstanceNormalization.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_INSTANCE_NORMALIZATION_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_INSTANCE_NORMALIZATION_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_INSTANCE_NORMALIZATION_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_INSTANCE_NORMALIZATION_H
 
 #include "OperationsValidationUtils.h"
 
@@ -35,4 +35,4 @@
 
 }  // namespace android::nn::instance_normalization
 
-#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_INSTANCE_NORMALIZATION_H
+#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_INSTANCE_NORMALIZATION_H
diff --git a/common/operations/L2Normalization.h b/common/types/operations/include/L2Normalization.h
similarity index 77%
rename from common/operations/L2Normalization.h
rename to common/types/operations/include/L2Normalization.h
index ff5cffd..22d1f02 100644
--- a/common/operations/L2Normalization.h
+++ b/common/types/operations/include/L2Normalization.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_L2_NORMALIZATION_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_L2_NORMALIZATION_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_L2_NORMALIZATION_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_L2_NORMALIZATION_H
 
 #include "OperationsValidationUtils.h"
 
@@ -32,4 +32,4 @@
 
 }  // namespace android::nn::l2_norm
 
-#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_L2_NORMALIZATION_H
+#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_L2_NORMALIZATION_H
diff --git a/common/operations/LSHProjection.h b/common/types/operations/include/LSHProjection.h
similarity index 89%
rename from common/operations/LSHProjection.h
rename to common/types/operations/include/LSHProjection.h
index f2a33d3..db3aa7c 100644
--- a/common/operations/LSHProjection.h
+++ b/common/types/operations/include/LSHProjection.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_LSHPROJECTION_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_LSHPROJECTION_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_LSHPROJECTION_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_LSHPROJECTION_H
 
 #include <vector>
 
@@ -77,4 +77,4 @@
 }  // namespace nn
 }  // namespace android
 
-#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_LSHPROJECTION_H
+#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_LSHPROJECTION_H
diff --git a/common/operations/LSTM.h b/common/types/operations/include/LSTM.h
similarity index 97%
rename from common/operations/LSTM.h
rename to common/types/operations/include/LSTM.h
index 2955225..a2910b1 100644
--- a/common/operations/LSTM.h
+++ b/common/types/operations/include/LSTM.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_LSTM_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_LSTM_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_LSTM_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_LSTM_H
 
 #include <algorithm>
 #include <cmath>
@@ -245,4 +245,4 @@
 }  // namespace nn
 }  // namespace android
 
-#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_LSTM_H
+#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_LSTM_H
diff --git a/common/operations/LocalResponseNormalization.h b/common/types/operations/include/LocalResponseNormalization.h
similarity index 78%
rename from common/operations/LocalResponseNormalization.h
rename to common/types/operations/include/LocalResponseNormalization.h
index 987c219..e1e71f0 100644
--- a/common/operations/LocalResponseNormalization.h
+++ b/common/types/operations/include/LocalResponseNormalization.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_LOCAL_RESPONSE_NORMALIZATION_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_LOCAL_RESPONSE_NORMALIZATION_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_LOCAL_RESPONSE_NORMALIZATION_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_LOCAL_RESPONSE_NORMALIZATION_H
 
 #include "OperationsValidationUtils.h"
 
@@ -36,4 +36,4 @@
 
 }  // namespace android::nn::local_response_norm
 
-#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_LOCAL_RESPONSE_NORMALIZATION_H
+#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_LOCAL_RESPONSE_NORMALIZATION_H
diff --git a/common/operations/LogSoftmax.h b/common/types/operations/include/LogSoftmax.h
similarity index 79%
rename from common/operations/LogSoftmax.h
rename to common/types/operations/include/LogSoftmax.h
index 0f6bacd..0463adf 100644
--- a/common/operations/LogSoftmax.h
+++ b/common/types/operations/include/LogSoftmax.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_LOG_SOFTMAX_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_LOG_SOFTMAX_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_LOG_SOFTMAX_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_LOG_SOFTMAX_H
 
 #include "OperationsValidationUtils.h"
 
@@ -33,4 +33,4 @@
 
 }  // namespace android::nn::log_softmax
 
-#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_LOG_SOFTMAX_H
+#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_LOG_SOFTMAX_H
diff --git a/common/operations/LogicalAndOr.h b/common/types/operations/include/LogicalAndOr.h
similarity index 77%
rename from common/operations/LogicalAndOr.h
rename to common/types/operations/include/LogicalAndOr.h
index aaaea24..efb39a1 100644
--- a/common/operations/LogicalAndOr.h
+++ b/common/types/operations/include/LogicalAndOr.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_LOGICAL_AND_OR_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_LOGICAL_AND_OR_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_LOGICAL_AND_OR_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_LOGICAL_AND_OR_H
 
 #include "OperationsValidationUtils.h"
 
@@ -30,4 +30,4 @@
 
 }  // namespace android::nn::logical
 
-#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_LOGICAL_AND_OR_H
+#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_LOGICAL_AND_OR_H
diff --git a/common/operations/LogicalNot.h b/common/types/operations/include/LogicalNot.h
similarity index 77%
rename from common/operations/LogicalNot.h
rename to common/types/operations/include/LogicalNot.h
index 7a2ad17..2f9143c 100644
--- a/common/operations/LogicalNot.h
+++ b/common/types/operations/include/LogicalNot.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_LOGICAL_NOT_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_LOGICAL_NOT_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_LOGICAL_NOT_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_LOGICAL_NOT_H
 
 #include "OperationsValidationUtils.h"
 
@@ -29,4 +29,4 @@
 
 }  // namespace android::nn::logical_not
 
-#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_LOGICAL_NOT_H
+#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_LOGICAL_NOT_H
diff --git a/common/operations/MaximumMinimum.h b/common/types/operations/include/MaximumMinimum.h
similarity index 78%
rename from common/operations/MaximumMinimum.h
rename to common/types/operations/include/MaximumMinimum.h
index 908d5b8..9a311c4 100644
--- a/common/operations/MaximumMinimum.h
+++ b/common/types/operations/include/MaximumMinimum.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_MAXIMUM_MINIMUM_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_MAXIMUM_MINIMUM_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_MAXIMUM_MINIMUM_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_MAXIMUM_MINIMUM_H
 
 #include "OperationsValidationUtils.h"
 
@@ -32,4 +32,4 @@
 }  // namespace nn
 }  // namespace android
 
-#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_MAXIMUM_MINIMUM_H
+#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_MAXIMUM_MINIMUM_H
diff --git a/common/operations/MirrorPad.h b/common/types/operations/include/MirrorPad.h
similarity index 82%
rename from common/operations/MirrorPad.h
rename to common/types/operations/include/MirrorPad.h
index d683ffe..39aaec2 100644
--- a/common/operations/MirrorPad.h
+++ b/common/types/operations/include/MirrorPad.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_MIRROR_PAD_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_MIRROR_PAD_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_MIRROR_PAD_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_MIRROR_PAD_H
 
 #include "OperationsValidationUtils.h"
 
@@ -38,4 +38,4 @@
 
 }  // namespace android::nn::mirror_pad_op
 
-#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_MIRROR_PAD_H
+#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_MIRROR_PAD_H
diff --git a/common/operations/Multinomial.h b/common/types/operations/include/Multinomial.h
similarity index 84%
rename from common/operations/Multinomial.h
rename to common/types/operations/include/Multinomial.h
index d2b338e..d941b2a 100644
--- a/common/operations/Multinomial.h
+++ b/common/types/operations/include/Multinomial.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_MULTINOMIAL_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_MULTINOMIAL_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_MULTINOMIAL_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_MULTINOMIAL_H
 
 #include <algorithm>
 #include <cmath>
@@ -57,4 +57,4 @@
 }  // namespace nn
 }  // namespace android
 
-#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_MULTINOMIAL_H
+#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_MULTINOMIAL_H
diff --git a/common/operations/Neg.h b/common/types/operations/include/Neg.h
similarity index 79%
rename from common/operations/Neg.h
rename to common/types/operations/include/Neg.h
index 90514e8..62caceb 100644
--- a/common/operations/Neg.h
+++ b/common/types/operations/include/Neg.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_NEG_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_NEG_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_NEG_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_NEG_H
 
 #include "OperationsValidationUtils.h"
 
@@ -31,4 +31,4 @@
 
 }  // namespace android::nn::neg
 
-#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_NEG_H
+#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_NEG_H
diff --git a/common/operations/PRelu.h b/common/types/operations/include/PRelu.h
similarity index 79%
rename from common/operations/PRelu.h
rename to common/types/operations/include/PRelu.h
index e3a6ba3..c1a2461 100644
--- a/common/operations/PRelu.h
+++ b/common/types/operations/include/PRelu.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_PRELU_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_PRELU_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_PRELU_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_PRELU_H
 
 #include "OperationsValidationUtils.h"
 
@@ -32,4 +32,4 @@
 
 }  // namespace android::nn::prelu
 
-#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_PRELU_H
+#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_PRELU_H
diff --git a/common/operations/Pack.h b/common/types/operations/include/Pack.h
similarity index 81%
rename from common/operations/Pack.h
rename to common/types/operations/include/Pack.h
index 434686d..06cf868 100644
--- a/common/operations/Pack.h
+++ b/common/types/operations/include/Pack.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_PACK_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_PACK_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_PACK_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_PACK_H
 
 #include "OperationsValidationUtils.h"
 
@@ -33,4 +33,4 @@
 
 }  // namespace android::nn::pack_op
 
-#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_PACK_H
+#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_PACK_H
diff --git a/common/operations/Pooling.h b/common/types/operations/include/Pooling.h
similarity index 77%
rename from common/operations/Pooling.h
rename to common/types/operations/include/Pooling.h
index b6cfee5..d2bb868 100644
--- a/common/operations/Pooling.h
+++ b/common/types/operations/include/Pooling.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_POOLING_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_POOLING_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_POOLING_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_POOLING_H
 
 #include "OperationsValidationUtils.h"
 
@@ -28,4 +28,4 @@
 
 }  // namespace android::nn::pooling
 
-#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_POOLING_H
+#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_POOLING_H
diff --git a/common/operations/Pow.h b/common/types/operations/include/Pow.h
similarity index 80%
rename from common/operations/Pow.h
rename to common/types/operations/include/Pow.h
index cca28c6..0c3c8e1 100644
--- a/common/operations/Pow.h
+++ b/common/types/operations/include/Pow.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_POW_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_POW_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_POW_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_POW_H
 
 #include "OperationsValidationUtils.h"
 
@@ -32,4 +32,4 @@
 }  // namespace nn
 }  // namespace android
 
-#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_POW_H
+#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_POW_H
diff --git a/common/operations/QLSTM.h b/common/types/operations/include/QLSTM.h
similarity index 92%
rename from common/operations/QLSTM.h
rename to common/types/operations/include/QLSTM.h
index d04414a..5035213 100644
--- a/common/operations/QLSTM.h
+++ b/common/types/operations/include/QLSTM.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_QLSTM_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_QLSTM_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_QLSTM_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_QLSTM_H
 
 #include "OperationsValidationUtils.h"
 
@@ -90,4 +90,4 @@
 
 }  // namespace android::nn::qlstm
 
-#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_QLSTM_H
+#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_QLSTM_H
diff --git a/common/operations/Quantize.h b/common/types/operations/include/Quantize.h
similarity index 77%
rename from common/operations/Quantize.h
rename to common/types/operations/include/Quantize.h
index bd58bae..ca9f457 100644
--- a/common/operations/Quantize.h
+++ b/common/types/operations/include/Quantize.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_QUANTIZE_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_QUANTIZE_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_QUANTIZE_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_QUANTIZE_H
 
 #include "OperationsValidationUtils.h"
 
@@ -29,4 +29,4 @@
 
 }  // namespace android::nn::quantize
 
-#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_QUANTIZE_H
+#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_QUANTIZE_H
diff --git a/common/operations/QuantizedLSTM.h b/common/types/operations/include/QuantizedLSTM.h
similarity index 91%
rename from common/operations/QuantizedLSTM.h
rename to common/types/operations/include/QuantizedLSTM.h
index ccc7db7..ff4131a 100644
--- a/common/operations/QuantizedLSTM.h
+++ b/common/types/operations/include/QuantizedLSTM.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_QUANTIZED_LSTM_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_QUANTIZED_LSTM_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_QUANTIZED_LSTM_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_QUANTIZED_LSTM_H
 
 #include <vector>
 
@@ -92,4 +92,4 @@
 }  // namespace nn
 }  // namespace android
 
-#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_QUANTIZED_LSTM_H
+#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_QUANTIZED_LSTM_H
diff --git a/common/operations/RNN.h b/common/types/operations/include/RNN.h
similarity index 92%
rename from common/operations/RNN.h
rename to common/types/operations/include/RNN.h
index 2115d9d..8b290f2 100644
--- a/common/operations/RNN.h
+++ b/common/types/operations/include/RNN.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_RNN_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_RNN_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_RNN_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_RNN_H
 
 #include <vector>
 
@@ -83,4 +83,4 @@
 }  // namespace nn
 }  // namespace android
 
-#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_RNN_H
+#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_RNN_H
diff --git a/common/operations/Rank.h b/common/types/operations/include/Rank.h
similarity index 78%
rename from common/operations/Rank.h
rename to common/types/operations/include/Rank.h
index 0206242..4ef19e6 100644
--- a/common/operations/Rank.h
+++ b/common/types/operations/include/Rank.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_RANK_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_RANK_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_RANK_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_RANK_H
 
 #include "OperationsValidationUtils.h"
 
@@ -29,4 +29,4 @@
 
 }  // namespace android::nn::rank_op
 
-#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_RANK_H
+#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_RANK_H
diff --git a/common/operations/Reduce.h b/common/types/operations/include/Reduce.h
similarity index 82%
rename from common/operations/Reduce.h
rename to common/types/operations/include/Reduce.h
index c34e90f..b37b93d 100644
--- a/common/operations/Reduce.h
+++ b/common/types/operations/include/Reduce.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_REDUCE_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_REDUCE_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_REDUCE_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_REDUCE_H
 
 #include "OperationsValidationUtils.h"
 
@@ -36,4 +36,4 @@
 
 }  // namespace android::nn::reduce
 
-#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_REDUCE_H
+#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_REDUCE_H
diff --git a/common/operations/Reshape.h b/common/types/operations/include/Reshape.h
similarity index 75%
rename from common/operations/Reshape.h
rename to common/types/operations/include/Reshape.h
index abc609f..3259560 100644
--- a/common/operations/Reshape.h
+++ b/common/types/operations/include/Reshape.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_RESHAPE_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_RESHAPE_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_RESHAPE_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_RESHAPE_H
 
 #include "OperationsValidationUtils.h"
 
@@ -25,4 +25,4 @@
 
 }  // namespace android::nn::reshape
 
-#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_RESHAPE_H
+#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_RESHAPE_H
diff --git a/common/operations/ResizeImageOps.h b/common/types/operations/include/ResizeImageOps.h
similarity index 81%
rename from common/operations/ResizeImageOps.h
rename to common/types/operations/include/ResizeImageOps.h
index 9fe9044..a473ae4 100644
--- a/common/operations/ResizeImageOps.h
+++ b/common/types/operations/include/ResizeImageOps.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_RESIZE_IMAGE_OPS_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_RESIZE_IMAGE_OPS_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_RESIZE_IMAGE_OPS_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_RESIZE_IMAGE_OPS_H
 
 #include "OperationsValidationUtils.h"
 
@@ -36,4 +36,4 @@
 
 }  // namespace android::nn::resize_image
 
-#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_RESIZE_IMAGE_OPS_H
+#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_RESIZE_IMAGE_OPS_H
diff --git a/common/operations/Reverse.h b/common/types/operations/include/Reverse.h
similarity index 80%
rename from common/operations/Reverse.h
rename to common/types/operations/include/Reverse.h
index f949535..0aada5e 100644
--- a/common/operations/Reverse.h
+++ b/common/types/operations/include/Reverse.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_REVERSE_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_REVERSE_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_REVERSE_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_REVERSE_H
 
 #include "OperationsValidationUtils.h"
 
@@ -33,4 +33,4 @@
 
 }  // namespace android::nn::reverse_op
 
-#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_REVERSE_H
+#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_REVERSE_H
diff --git a/common/operations/RoiAlign.h b/common/types/operations/include/RoiAlign.h
similarity index 83%
rename from common/operations/RoiAlign.h
rename to common/types/operations/include/RoiAlign.h
index 0540d02..ec13174 100644
--- a/common/operations/RoiAlign.h
+++ b/common/types/operations/include/RoiAlign.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_ROI_ALIGN_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_ROI_ALIGN_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_ROI_ALIGN_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_ROI_ALIGN_H
 
 #include "OperationsValidationUtils.h"
 
@@ -40,4 +40,4 @@
 
 }  // namespace android::nn::roi_align
 
-#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_ROI_ALIGN_H
+#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_ROI_ALIGN_H
diff --git a/common/operations/RoiPooling.h b/common/types/operations/include/RoiPooling.h
similarity index 82%
rename from common/operations/RoiPooling.h
rename to common/types/operations/include/RoiPooling.h
index 2a0caa6..b93fa84 100644
--- a/common/operations/RoiPooling.h
+++ b/common/types/operations/include/RoiPooling.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_ROI_POOLING_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_ROI_POOLING_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_ROI_POOLING_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_ROI_POOLING_H
 
 #include "OperationsValidationUtils.h"
 
@@ -38,4 +38,4 @@
 
 }  // namespace android::nn::roi_pooling
 
-#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_ROI_POOLING_H
+#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_ROI_POOLING_H
diff --git a/common/operations/SVDF.h b/common/types/operations/include/SVDF.h
similarity index 89%
rename from common/operations/SVDF.h
rename to common/types/operations/include/SVDF.h
index d04fbde..f2a2dc3 100644
--- a/common/operations/SVDF.h
+++ b/common/types/operations/include/SVDF.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_SVDF_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_SVDF_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_SVDF_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_SVDF_H
 
 #include <algorithm>
 #include <cmath>
@@ -75,4 +75,4 @@
 }  // namespace nn
 }  // namespace android
 
-#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_SVDF_H
+#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_SVDF_H
diff --git a/common/operations/Select.h b/common/types/operations/include/Select.h
similarity index 79%
rename from common/operations/Select.h
rename to common/types/operations/include/Select.h
index 1b13b2e..be0c981 100644
--- a/common/operations/Select.h
+++ b/common/types/operations/include/Select.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_SELECT_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_SELECT_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_SELECT_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_SELECT_H
 
 #include "OperationsValidationUtils.h"
 
@@ -31,4 +31,4 @@
 
 }  // namespace android::nn::select_op
 
-#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_SELECT_H
+#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_SELECT_H
diff --git a/common/operations/SimpleMath.h b/common/types/operations/include/SimpleMath.h
similarity index 74%
rename from common/operations/SimpleMath.h
rename to common/types/operations/include/SimpleMath.h
index 017bc40..b6477f7 100644
--- a/common/operations/SimpleMath.h
+++ b/common/types/operations/include/SimpleMath.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_SIMPLE_MATH_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_SIMPLE_MATH_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_SIMPLE_MATH_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_SIMPLE_MATH_H
 
 #include "OperationsValidationUtils.h"
 
@@ -25,4 +25,4 @@
 
 }  // namespace android::nn::mean
 
-#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_SIMPLE_MATH_H
+#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_SIMPLE_MATH_H
diff --git a/common/operations/Slice.h b/common/types/operations/include/Slice.h
similarity index 80%
rename from common/operations/Slice.h
rename to common/types/operations/include/Slice.h
index 5b6feef..7df0d78 100644
--- a/common/operations/Slice.h
+++ b/common/types/operations/include/Slice.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_SLICE_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_SLICE_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_SLICE_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_SLICE_H
 
 #include "OperationsValidationUtils.h"
 
@@ -33,4 +33,4 @@
 
 }  // namespace android::nn::slice
 
-#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_SLICE_H
+#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_SLICE_H
diff --git a/common/operations/Softmax.h b/common/types/operations/include/Softmax.h
similarity index 79%
rename from common/operations/Softmax.h
rename to common/types/operations/include/Softmax.h
index 1ee1520..7f01bee 100644
--- a/common/operations/Softmax.h
+++ b/common/types/operations/include/Softmax.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_SOFTMAX_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_SOFTMAX_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_SOFTMAX_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_SOFTMAX_H
 
 #include "OperationsValidationUtils.h"
 
@@ -33,4 +33,4 @@
 
 }  // namespace android::nn::softmax
 
-#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_SOFTMAX_H
+#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_SOFTMAX_H
diff --git a/common/operations/Split.h b/common/types/operations/include/Split.h
similarity index 75%
rename from common/operations/Split.h
rename to common/types/operations/include/Split.h
index 9ec1702..aa52f50 100644
--- a/common/operations/Split.h
+++ b/common/types/operations/include/Split.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_SPLIT_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_SPLIT_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_SPLIT_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_SPLIT_H
 
 #include "OperationsValidationUtils.h"
 
@@ -25,4 +25,4 @@
 
 }  // namespace android::nn::split
 
-#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_SPLIT_H
+#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_SPLIT_H
diff --git a/common/operations/Squeeze.h b/common/types/operations/include/Squeeze.h
similarity index 78%
rename from common/operations/Squeeze.h
rename to common/types/operations/include/Squeeze.h
index d9e1d21..1d6015f 100644
--- a/common/operations/Squeeze.h
+++ b/common/types/operations/include/Squeeze.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_SQUEEZE_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_SQUEEZE_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_SQUEEZE_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_SQUEEZE_H
 
 #include "OperationsValidationUtils.h"
 
@@ -30,4 +30,4 @@
 
 }  // namespace android::nn::squeeze
 
-#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_SQUEEZE_H
+#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_SQUEEZE_H
diff --git a/common/operations/StridedSlice.h b/common/types/operations/include/StridedSlice.h
similarity index 80%
rename from common/operations/StridedSlice.h
rename to common/types/operations/include/StridedSlice.h
index 7eee015..323ef37 100644
--- a/common/operations/StridedSlice.h
+++ b/common/types/operations/include/StridedSlice.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_STRIDED_SLICE_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_STRIDED_SLICE_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_STRIDED_SLICE_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_STRIDED_SLICE_H
 
 #include "OperationsValidationUtils.h"
 
@@ -35,4 +35,4 @@
 
 }  // namespace android::nn::strided_slice
 
-#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_STRIDED_SLICE_H
+#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_STRIDED_SLICE_H
diff --git a/common/operations/Tile.h b/common/types/operations/include/Tile.h
similarity index 81%
rename from common/operations/Tile.h
rename to common/types/operations/include/Tile.h
index 12d72f6..e025320 100644
--- a/common/operations/Tile.h
+++ b/common/types/operations/include/Tile.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_TILE_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_TILE_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_TILE_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_TILE_H
 
 #include "OperationsValidationUtils.h"
 
@@ -33,4 +33,4 @@
 }  // namespace nn
 }  // namespace android
 
-#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_TILE_H
+#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_TILE_H
diff --git a/common/operations/TopK_V2.h b/common/types/operations/include/TopK_V2.h
similarity index 79%
rename from common/operations/TopK_V2.h
rename to common/types/operations/include/TopK_V2.h
index 9c401c4..385f062 100644
--- a/common/operations/TopK_V2.h
+++ b/common/types/operations/include/TopK_V2.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_TOPK_V2_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_TOPK_V2_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_TOPK_V2_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_TOPK_V2_H
 
 #include "OperationsValidationUtils.h"
 
@@ -31,4 +31,4 @@
 
 }  // namespace android::nn::topk_v2
 
-#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_TOPK_V2_H
+#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_TOPK_V2_H
diff --git a/common/operations/Transpose.h b/common/types/operations/include/Transpose.h
similarity index 78%
rename from common/operations/Transpose.h
rename to common/types/operations/include/Transpose.h
index d4c1c32..4c286d1 100644
--- a/common/operations/Transpose.h
+++ b/common/types/operations/include/Transpose.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_TRANSPOSE_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_TRANSPOSE_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_TRANSPOSE_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_TRANSPOSE_H
 
 #include "OperationsValidationUtils.h"
 
@@ -32,4 +32,4 @@
 
 }  // namespace android::nn::transpose
 
-#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_TRANSPOSE_H
+#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_TRANSPOSE_H
diff --git a/common/operations/TransposeConv2D.h b/common/types/operations/include/TransposeConv2D.h
similarity index 79%
rename from common/operations/TransposeConv2D.h
rename to common/types/operations/include/TransposeConv2D.h
index 64e2da9..980e1e8 100644
--- a/common/operations/TransposeConv2D.h
+++ b/common/types/operations/include/TransposeConv2D.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_TRANSPOSE_CONV_2D_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_TRANSPOSE_CONV_2D_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_TRANSPOSE_CONV_2D_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_TRANSPOSE_CONV_2D_H
 
 #include "OperationsValidationUtils.h"
 
@@ -34,4 +34,4 @@
 
 }  // namespace android::nn::transpose_conv_2d
 
-#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_TRANSPOSE_CONV_2D_H
+#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_TRANSPOSE_CONV_2D_H
diff --git a/common/operations/UnidirectionalSequenceLSTM.h b/common/types/operations/include/UnidirectionalSequenceLSTM.h
similarity index 90%
rename from common/operations/UnidirectionalSequenceLSTM.h
rename to common/types/operations/include/UnidirectionalSequenceLSTM.h
index 955d578..92947db 100644
--- a/common/operations/UnidirectionalSequenceLSTM.h
+++ b/common/types/operations/include/UnidirectionalSequenceLSTM.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_UNIDIRECTIONAL_SEQUENCE_LSTM_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_UNIDIRECTIONAL_SEQUENCE_LSTM_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_UNIDIRECTIONAL_SEQUENCE_LSTM_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_UNIDIRECTIONAL_SEQUENCE_LSTM_H
 
 #include "OperationsValidationUtils.h"
 
@@ -81,4 +81,4 @@
 
 }  // namespace android::nn::unidirectional_sequence_lstm
 
-#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_UNIDIRECTIONAL_SEQUENCE_LSTM_H
+#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_UNIDIRECTIONAL_SEQUENCE_LSTM_H
diff --git a/common/operations/UnidirectionalSequenceRNN.h b/common/types/operations/include/UnidirectionalSequenceRNN.h
similarity index 80%
rename from common/operations/UnidirectionalSequenceRNN.h
rename to common/types/operations/include/UnidirectionalSequenceRNN.h
index 03d2118..24778a2 100644
--- a/common/operations/UnidirectionalSequenceRNN.h
+++ b/common/types/operations/include/UnidirectionalSequenceRNN.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_UNIDIRECTIONAL_SEQUENCE_RNN_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_UNIDIRECTIONAL_SEQUENCE_RNN_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_UNIDIRECTIONAL_SEQUENCE_RNN_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_UNIDIRECTIONAL_SEQUENCE_RNN_H
 
 #include "OperationsValidationUtils.h"
 
@@ -37,4 +37,4 @@
 
 }  // namespace android::nn::unidirectional_sequence_rnn
 
-#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_OPERATIONS_UNIDIRECTIONAL_SEQUENCE_RNN_H
+#endif  // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_OPERATIONS_UNIDIRECTIONAL_SEQUENCE_RNN_H
diff --git a/common/operations/ActivationValidation.cpp b/common/types/operations/src/Activation.cpp
similarity index 99%
rename from common/operations/ActivationValidation.cpp
rename to common/types/operations/src/Activation.cpp
index f6795bd..fd3d535 100644
--- a/common/operations/ActivationValidation.cpp
+++ b/common/types/operations/src/Activation.cpp
@@ -15,6 +15,7 @@
  */
 
 #include "Activation.h"
+
 #include "OperationsValidationUtils.h"
 
 namespace android::nn {
diff --git a/common/operations/ArgMinMaxValidation.cpp b/common/types/operations/src/ArgMinMax.cpp
similarity index 99%
rename from common/operations/ArgMinMaxValidation.cpp
rename to common/types/operations/src/ArgMinMax.cpp
index 4f5ad6a..7b4f90e 100644
--- a/common/operations/ArgMinMaxValidation.cpp
+++ b/common/types/operations/src/ArgMinMax.cpp
@@ -15,6 +15,7 @@
  */
 
 #include "ArgMinMax.h"
+
 #include "OperationsValidationUtils.h"
 
 namespace android::nn {
diff --git a/common/operations/BatchMatmulValidation.cpp b/common/types/operations/src/BatchMatmul.cpp
similarity index 99%
rename from common/operations/BatchMatmulValidation.cpp
rename to common/types/operations/src/BatchMatmul.cpp
index d38d054..cc36439 100644
--- a/common/operations/BatchMatmulValidation.cpp
+++ b/common/types/operations/src/BatchMatmul.cpp
@@ -15,6 +15,7 @@
  */
 
 #include "BatchMatmul.h"
+
 #include "OperationsValidationUtils.h"
 
 namespace android::nn {
diff --git a/common/operations/BidirectionalSequenceLSTMValidation.cpp b/common/types/operations/src/BidirectionalSequenceLSTM.cpp
similarity index 99%
rename from common/operations/BidirectionalSequenceLSTMValidation.cpp
rename to common/types/operations/src/BidirectionalSequenceLSTM.cpp
index 39785cb..75162c2 100644
--- a/common/operations/BidirectionalSequenceLSTMValidation.cpp
+++ b/common/types/operations/src/BidirectionalSequenceLSTM.cpp
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
+#include "BidirectionalSequenceLSTM.h"
+
 #include <vector>
 
-#include "BidirectionalSequenceLSTM.h"
 #include "OperationsValidationUtils.h"
 
 namespace android::nn {
diff --git a/common/operations/BidirectionalSequenceRNNValidation.cpp b/common/types/operations/src/BidirectionalSequenceRNN.cpp
similarity index 99%
rename from common/operations/BidirectionalSequenceRNNValidation.cpp
rename to common/types/operations/src/BidirectionalSequenceRNN.cpp
index e58f162..e9643a3 100644
--- a/common/operations/BidirectionalSequenceRNNValidation.cpp
+++ b/common/types/operations/src/BidirectionalSequenceRNN.cpp
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
+#include "BidirectionalSequenceRNN.h"
+
 #include <vector>
 
-#include "BidirectionalSequenceRNN.h"
 #include "OperationsValidationUtils.h"
 
 namespace android::nn {
diff --git a/common/operations/BroadcastValidation.cpp b/common/types/operations/src/Broadcast.cpp
similarity index 99%
rename from common/operations/BroadcastValidation.cpp
rename to common/types/operations/src/Broadcast.cpp
index c657549..38fb93c 100644
--- a/common/operations/BroadcastValidation.cpp
+++ b/common/types/operations/src/Broadcast.cpp
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
+#include "Broadcast.h"
+
 #include <nnapi/Validation.h>
 
-#include "Broadcast.h"
 #include "OperationsValidationUtils.h"
 
 namespace android::nn {
diff --git a/common/operations/CastValidation.cpp b/common/types/operations/src/Cast.cpp
similarity index 99%
rename from common/operations/CastValidation.cpp
rename to common/types/operations/src/Cast.cpp
index 903b1d1..71281c5 100644
--- a/common/operations/CastValidation.cpp
+++ b/common/types/operations/src/Cast.cpp
@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
+#include "Cast.h"
+
 #include <functional>
 #include <numeric>
 #include <vector>
 
-#include "Cast.h"
 #include "OperationsValidationUtils.h"
 
 namespace android::nn {
diff --git a/common/operations/ChannelShuffleValidation.cpp b/common/types/operations/src/ChannelShuffle.cpp
similarity index 99%
rename from common/operations/ChannelShuffleValidation.cpp
rename to common/types/operations/src/ChannelShuffle.cpp
index ea76b66..8ceb935 100644
--- a/common/operations/ChannelShuffleValidation.cpp
+++ b/common/types/operations/src/ChannelShuffle.cpp
@@ -15,6 +15,7 @@
  */
 
 #include "ChannelShuffle.h"
+
 #include "OperationsValidationUtils.h"
 
 namespace android::nn {
diff --git a/common/operations/ComparisonsValidation.cpp b/common/types/operations/src/Comparisons.cpp
similarity index 99%
rename from common/operations/ComparisonsValidation.cpp
rename to common/types/operations/src/Comparisons.cpp
index 7913a62..1996dcb 100644
--- a/common/operations/ComparisonsValidation.cpp
+++ b/common/types/operations/src/Comparisons.cpp
@@ -15,6 +15,7 @@
  */
 
 #include "Comparisons.h"
+
 #include "OperationsValidationUtils.h"
 
 namespace android::nn {
diff --git a/common/operations/ConcatenationValidation.cpp b/common/types/operations/src/Concatenation.cpp
similarity index 99%
rename from common/operations/ConcatenationValidation.cpp
rename to common/types/operations/src/Concatenation.cpp
index b40a9d0..8e6891e 100644
--- a/common/operations/ConcatenationValidation.cpp
+++ b/common/types/operations/src/Concatenation.cpp
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
+#include "Concatenation.h"
+
 #include <vector>
 
-#include "Concatenation.h"
 #include "OperationsValidationUtils.h"
 #include "nnapi/Validation.h"
 
diff --git a/common/operations/Conv2DValidation.cpp b/common/types/operations/src/Conv2D.cpp
similarity index 99%
rename from common/operations/Conv2DValidation.cpp
rename to common/types/operations/src/Conv2D.cpp
index 966d8e7..8135aae 100644
--- a/common/operations/Conv2DValidation.cpp
+++ b/common/types/operations/src/Conv2D.cpp
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
+#include "Conv2D.h"
+
 #include <vector>
 
-#include "Conv2D.h"
 #include "OperationsValidationUtils.h"
 
 namespace android::nn {
diff --git a/common/operations/DensifyValidation.cpp b/common/types/operations/src/Densify.cpp
similarity index 99%
rename from common/operations/DensifyValidation.cpp
rename to common/types/operations/src/Densify.cpp
index 2c9acec..1d696f3 100644
--- a/common/operations/DensifyValidation.cpp
+++ b/common/types/operations/src/Densify.cpp
@@ -17,6 +17,7 @@
 #ifdef NN_EXPERIMENTAL_FEATURE
 
 #include "Densify.h"
+
 #include "OperationsValidationUtils.h"
 
 namespace android::nn {
diff --git a/common/operations/DepthwiseConv2DValidation.cpp b/common/types/operations/src/DepthwiseConv2D.cpp
similarity index 99%
rename from common/operations/DepthwiseConv2DValidation.cpp
rename to common/types/operations/src/DepthwiseConv2D.cpp
index 333e1de..6f15094 100644
--- a/common/operations/DepthwiseConv2DValidation.cpp
+++ b/common/types/operations/src/DepthwiseConv2D.cpp
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
+#include "DepthwiseConv2D.h"
+
 #include <vector>
 
-#include "DepthwiseConv2D.h"
 #include "OperationsValidationUtils.h"
 
 namespace android::nn {
diff --git a/common/operations/DequantizeValidation.cpp b/common/types/operations/src/Dequantize.cpp
similarity index 99%
rename from common/operations/DequantizeValidation.cpp
rename to common/types/operations/src/Dequantize.cpp
index 34b0e57..cedc10e 100644
--- a/common/operations/DequantizeValidation.cpp
+++ b/common/types/operations/src/Dequantize.cpp
@@ -15,6 +15,7 @@
  */
 
 #include "Dequantize.h"
+
 #include "OperationsValidationUtils.h"
 
 namespace android::nn {
diff --git a/common/operations/ElementwiseValidation.cpp b/common/types/operations/src/Elementwise.cpp
similarity index 99%
rename from common/operations/ElementwiseValidation.cpp
rename to common/types/operations/src/Elementwise.cpp
index 672f9d5..cf0838e 100644
--- a/common/operations/ElementwiseValidation.cpp
+++ b/common/types/operations/src/Elementwise.cpp
@@ -15,6 +15,7 @@
  */
 
 #include "Elementwise.h"
+
 #include "OperationsValidationUtils.h"
 
 namespace android::nn {
diff --git a/common/operations/EluValidation.cpp b/common/types/operations/src/Elu.cpp
similarity index 99%
rename from common/operations/EluValidation.cpp
rename to common/types/operations/src/Elu.cpp
index 4c7ecc0..26339af 100644
--- a/common/operations/EluValidation.cpp
+++ b/common/types/operations/src/Elu.cpp
@@ -15,6 +15,7 @@
  */
 
 #include "Elu.h"
+
 #include "OperationsValidationUtils.h"
 
 namespace android::nn {
diff --git a/common/operations/EmbeddingLookupValidation.cpp b/common/types/operations/src/EmbeddingLookup.cpp
similarity index 99%
rename from common/operations/EmbeddingLookupValidation.cpp
rename to common/types/operations/src/EmbeddingLookup.cpp
index 9a0b1f1..62ac748 100644
--- a/common/operations/EmbeddingLookupValidation.cpp
+++ b/common/types/operations/src/EmbeddingLookup.cpp
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
+#include "EmbeddingLookup.h"
+
 #include <vector>
 
-#include "EmbeddingLookup.h"
 #include "OperationsValidationUtils.h"
 
 namespace android::nn {
diff --git a/common/operations/ExpandDimsValidation.cpp b/common/types/operations/src/ExpandDims.cpp
similarity index 99%
rename from common/operations/ExpandDimsValidation.cpp
rename to common/types/operations/src/ExpandDims.cpp
index 9db97c8..1feee12 100644
--- a/common/operations/ExpandDimsValidation.cpp
+++ b/common/types/operations/src/ExpandDims.cpp
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
+#include "ExpandDims.h"
+
 #include <vector>
 
-#include "ExpandDims.h"
 #include "OperationsValidationUtils.h"
 
 namespace android::nn {
diff --git a/common/operations/FillValidation.cpp b/common/types/operations/src/Fill.cpp
similarity index 99%
rename from common/operations/FillValidation.cpp
rename to common/types/operations/src/Fill.cpp
index 47157be..8b509f4 100644
--- a/common/operations/FillValidation.cpp
+++ b/common/types/operations/src/Fill.cpp
@@ -15,6 +15,7 @@
  */
 
 #include "Fill.h"
+
 #include "OperationsValidationUtils.h"
 
 namespace android::nn {
diff --git a/common/operations/FullyConnectedValidation.cpp b/common/types/operations/src/FullyConnected.cpp
similarity index 99%
rename from common/operations/FullyConnectedValidation.cpp
rename to common/types/operations/src/FullyConnected.cpp
index 3b12968..a4d95d1 100644
--- a/common/operations/FullyConnectedValidation.cpp
+++ b/common/types/operations/src/FullyConnected.cpp
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
+#include "FullyConnected.h"
+
 #include <vector>
 
-#include "FullyConnected.h"
 #include "OperationsValidationUtils.h"
 
 namespace android::nn {
diff --git a/common/operations/GatherValidation.cpp b/common/types/operations/src/Gather.cpp
similarity index 99%
rename from common/operations/GatherValidation.cpp
rename to common/types/operations/src/Gather.cpp
index aad2206..6880dea 100644
--- a/common/operations/GatherValidation.cpp
+++ b/common/types/operations/src/Gather.cpp
@@ -15,6 +15,7 @@
  */
 
 #include "Gather.h"
+
 #include "OperationsValidationUtils.h"
 
 namespace android::nn {
diff --git a/common/operations/GenerateProposalsValidation.cpp b/common/types/operations/src/GenerateProposals.cpp
similarity index 99%
rename from common/operations/GenerateProposalsValidation.cpp
rename to common/types/operations/src/GenerateProposals.cpp
index 4ade95a..78d1f97 100644
--- a/common/operations/GenerateProposalsValidation.cpp
+++ b/common/types/operations/src/GenerateProposals.cpp
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
+#include "GenerateProposals.h"
+
 #include <vector>
 
-#include "GenerateProposals.h"
 #include "OperationsValidationUtils.h"
 
 namespace android::nn {
diff --git a/common/operations/GroupedConv2DValidation.cpp b/common/types/operations/src/GroupedConv2D.cpp
similarity index 99%
rename from common/operations/GroupedConv2DValidation.cpp
rename to common/types/operations/src/GroupedConv2D.cpp
index 093ab2a..fa871f7 100644
--- a/common/operations/GroupedConv2DValidation.cpp
+++ b/common/types/operations/src/GroupedConv2D.cpp
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
+#include "GroupedConv2D.h"
+
 #include <vector>
 
-#include "GroupedConv2D.h"
 #include "OperationsValidationUtils.h"
 
 namespace android::nn {
diff --git a/common/operations/HashtableLookupValidation.cpp b/common/types/operations/src/HashtableLookup.cpp
similarity index 99%
rename from common/operations/HashtableLookupValidation.cpp
rename to common/types/operations/src/HashtableLookup.cpp
index 220f8c6..1551631 100644
--- a/common/operations/HashtableLookupValidation.cpp
+++ b/common/types/operations/src/HashtableLookup.cpp
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
+#include "HashtableLookup.h"
+
 #include <vector>
 
-#include "HashtableLookup.h"
 #include "OperationsValidationUtils.h"
 
 namespace android::nn {
diff --git a/common/operations/HeatmapMaxKeypointValidation.cpp b/common/types/operations/src/HeatmapMaxKeypoint.cpp
similarity index 99%
rename from common/operations/HeatmapMaxKeypointValidation.cpp
rename to common/types/operations/src/HeatmapMaxKeypoint.cpp
index 6044250..878ee5f 100644
--- a/common/operations/HeatmapMaxKeypointValidation.cpp
+++ b/common/types/operations/src/HeatmapMaxKeypoint.cpp
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
+#include "HeatmapMaxKeypoint.h"
+
 #include <vector>
 
-#include "HeatmapMaxKeypoint.h"
 #include "OperationsValidationUtils.h"
 
 namespace android::nn {
diff --git a/common/operations/InstanceNormalizationValidation.cpp b/common/types/operations/src/InstanceNormalization.cpp
similarity index 99%
rename from common/operations/InstanceNormalizationValidation.cpp
rename to common/types/operations/src/InstanceNormalization.cpp
index f437c7b..beef2db 100644
--- a/common/operations/InstanceNormalizationValidation.cpp
+++ b/common/types/operations/src/InstanceNormalization.cpp
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
+#include "InstanceNormalization.h"
+
 #include <vector>
 
-#include "InstanceNormalization.h"
 #include "OperationsValidationUtils.h"
 
 namespace android::nn {
diff --git a/common/operations/L2NormalizationValidation.cpp b/common/types/operations/src/L2Normalization.cpp
similarity index 99%
rename from common/operations/L2NormalizationValidation.cpp
rename to common/types/operations/src/L2Normalization.cpp
index 512721e..185e3d5 100644
--- a/common/operations/L2NormalizationValidation.cpp
+++ b/common/types/operations/src/L2Normalization.cpp
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
+#include "L2Normalization.h"
+
 #include <vector>
 
-#include "L2Normalization.h"
 #include "OperationsValidationUtils.h"
 
 namespace android::nn {
diff --git a/common/operations/LSHProjectionValidation.cpp b/common/types/operations/src/LSHProjection.cpp
similarity index 99%
rename from common/operations/LSHProjectionValidation.cpp
rename to common/types/operations/src/LSHProjection.cpp
index fa33a56..3c106fd 100644
--- a/common/operations/LSHProjectionValidation.cpp
+++ b/common/types/operations/src/LSHProjection.cpp
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
+#include "LSHProjection.h"
+
 #include <vector>
 
-#include "LSHProjection.h"
 #include "OperationsValidationUtils.h"
 
 namespace android::nn {
diff --git a/common/operations/LSTMValidation.cpp b/common/types/operations/src/LSTM.cpp
similarity index 99%
rename from common/operations/LSTMValidation.cpp
rename to common/types/operations/src/LSTM.cpp
index 22e543c..e42e036 100644
--- a/common/operations/LSTMValidation.cpp
+++ b/common/types/operations/src/LSTM.cpp
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
+#include "LSTM.h"
+
 #include <vector>
 
-#include "LSTM.h"
 #include "OperationsValidationUtils.h"
 #include "nnapi/Validation.h"
 
diff --git a/common/operations/LocalResponseNormalizationValidation.cpp b/common/types/operations/src/LocalResponseNormalization.cpp
similarity index 99%
rename from common/operations/LocalResponseNormalizationValidation.cpp
rename to common/types/operations/src/LocalResponseNormalization.cpp
index e9257b3..c3b9ebd 100644
--- a/common/operations/LocalResponseNormalizationValidation.cpp
+++ b/common/types/operations/src/LocalResponseNormalization.cpp
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
+#include "LocalResponseNormalization.h"
+
 #include <vector>
 
-#include "LocalResponseNormalization.h"
 #include "OperationsValidationUtils.h"
 
 namespace android::nn {
diff --git a/common/operations/LogSoftmaxValidation.cpp b/common/types/operations/src/LogSoftmax.cpp
similarity index 99%
rename from common/operations/LogSoftmaxValidation.cpp
rename to common/types/operations/src/LogSoftmax.cpp
index 3367977..8191b92 100644
--- a/common/operations/LogSoftmaxValidation.cpp
+++ b/common/types/operations/src/LogSoftmax.cpp
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
+#include "LogSoftmax.h"
+
 #include <vector>
 
-#include "LogSoftmax.h"
 #include "OperationsValidationUtils.h"
 
 namespace android::nn {
diff --git a/common/operations/LogicalAndOrValidation.cpp b/common/types/operations/src/LogicalAndOr.cpp
similarity index 99%
rename from common/operations/LogicalAndOrValidation.cpp
rename to common/types/operations/src/LogicalAndOr.cpp
index c3fde38..545db19 100644
--- a/common/operations/LogicalAndOrValidation.cpp
+++ b/common/types/operations/src/LogicalAndOr.cpp
@@ -15,6 +15,7 @@
  */
 
 #include "LogicalAndOr.h"
+
 #include "OperationsValidationUtils.h"
 
 namespace android::nn {
diff --git a/common/operations/LogicalNotValidation.cpp b/common/types/operations/src/LogicalNot.cpp
similarity index 99%
rename from common/operations/LogicalNotValidation.cpp
rename to common/types/operations/src/LogicalNot.cpp
index a070b28..0524268 100644
--- a/common/operations/LogicalNotValidation.cpp
+++ b/common/types/operations/src/LogicalNot.cpp
@@ -15,6 +15,7 @@
  */
 
 #include "LogicalNot.h"
+
 #include "OperationsValidationUtils.h"
 
 namespace android::nn {
diff --git a/common/operations/MaximumMinimumValidation.cpp b/common/types/operations/src/MaximumMinimum.cpp
similarity index 99%
rename from common/operations/MaximumMinimumValidation.cpp
rename to common/types/operations/src/MaximumMinimum.cpp
index 5355875..b676c61 100644
--- a/common/operations/MaximumMinimumValidation.cpp
+++ b/common/types/operations/src/MaximumMinimum.cpp
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
+#include "MaximumMinimum.h"
+
 #include <vector>
 
-#include "MaximumMinimum.h"
 #include "OperationsValidationUtils.h"
 
 namespace android::nn {
diff --git a/common/operations/MirrorPadValidation.cpp b/common/types/operations/src/MirrorPad.cpp
similarity index 99%
rename from common/operations/MirrorPadValidation.cpp
rename to common/types/operations/src/MirrorPad.cpp
index f8dc94a..2b95dbd 100644
--- a/common/operations/MirrorPadValidation.cpp
+++ b/common/types/operations/src/MirrorPad.cpp
@@ -17,6 +17,7 @@
 #define LOG_TAG "Operations"
 
 #include "MirrorPad.h"
+
 #include "OperationsValidationUtils.h"
 
 namespace android::nn {
diff --git a/common/operations/MultinomialValidation.cpp b/common/types/operations/src/Multinomial.cpp
similarity index 99%
rename from common/operations/MultinomialValidation.cpp
rename to common/types/operations/src/Multinomial.cpp
index d4821be..807c596 100644
--- a/common/operations/MultinomialValidation.cpp
+++ b/common/types/operations/src/Multinomial.cpp
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
+#include "Multinomial.h"
+
 #include <vector>
 
-#include "Multinomial.h"
 #include "OperationsValidationUtils.h"
 
 namespace android::nn {
diff --git a/common/operations/NegValidation.cpp b/common/types/operations/src/Neg.cpp
similarity index 99%
rename from common/operations/NegValidation.cpp
rename to common/types/operations/src/Neg.cpp
index ced3ad7..5faff62 100644
--- a/common/operations/NegValidation.cpp
+++ b/common/types/operations/src/Neg.cpp
@@ -15,6 +15,7 @@
  */
 
 #include "Neg.h"
+
 #include "OperationsValidationUtils.h"
 
 namespace android::nn {
diff --git a/common/operations/PReluValidation.cpp b/common/types/operations/src/PRelu.cpp
similarity index 99%
rename from common/operations/PReluValidation.cpp
rename to common/types/operations/src/PRelu.cpp
index 563da22..76f7ff6 100644
--- a/common/operations/PReluValidation.cpp
+++ b/common/types/operations/src/PRelu.cpp
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-#include "OperationsValidationUtils.h"
 #include "PRelu.h"
 
+#include "OperationsValidationUtils.h"
+
 namespace android::nn {
 namespace prelu {
 
diff --git a/common/operations/PackValidation.cpp b/common/types/operations/src/Pack.cpp
similarity index 99%
rename from common/operations/PackValidation.cpp
rename to common/types/operations/src/Pack.cpp
index c88e9a8..f7acdcd 100644
--- a/common/operations/PackValidation.cpp
+++ b/common/types/operations/src/Pack.cpp
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-#include "OperationsValidationUtils.h"
 #include "Pack.h"
 
+#include "OperationsValidationUtils.h"
+
 namespace android::nn {
 namespace pack_op {
 
diff --git a/common/operations/PoolingValidation.cpp b/common/types/operations/src/Pooling.cpp
similarity index 99%
rename from common/operations/PoolingValidation.cpp
rename to common/types/operations/src/Pooling.cpp
index dc4a4a6..18fa828 100644
--- a/common/operations/PoolingValidation.cpp
+++ b/common/types/operations/src/Pooling.cpp
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
+#include "Pooling.h"
+
 #include <vector>
 
 #include "OperationsValidationUtils.h"
-#include "Pooling.h"
 #include "nnapi/Validation.h"
 
 namespace android::nn {
diff --git a/common/operations/PowValidation.cpp b/common/types/operations/src/Pow.cpp
similarity index 99%
rename from common/operations/PowValidation.cpp
rename to common/types/operations/src/Pow.cpp
index 15d8b24..d68b7e5 100644
--- a/common/operations/PowValidation.cpp
+++ b/common/types/operations/src/Pow.cpp
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
+#include "Pow.h"
+
 #include <vector>
 
 #include "OperationsValidationUtils.h"
-#include "Pow.h"
 
 namespace android::nn {
 namespace pow {
diff --git a/common/operations/QLSTMValidation.cpp b/common/types/operations/src/QLSTM.cpp
similarity index 99%
rename from common/operations/QLSTMValidation.cpp
rename to common/types/operations/src/QLSTM.cpp
index 1542b34..8d2396a 100644
--- a/common/operations/QLSTMValidation.cpp
+++ b/common/types/operations/src/QLSTM.cpp
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
+#include "QLSTM.h"
+
 #include <vector>
 
 #include "OperationsValidationUtils.h"
-#include "QLSTM.h"
 
 namespace android::nn {
 namespace qlstm {
diff --git a/common/operations/QuantizeValidation.cpp b/common/types/operations/src/Quantize.cpp
similarity index 99%
rename from common/operations/QuantizeValidation.cpp
rename to common/types/operations/src/Quantize.cpp
index ec7da29..fe46281 100644
--- a/common/operations/QuantizeValidation.cpp
+++ b/common/types/operations/src/Quantize.cpp
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-#include "OperationsValidationUtils.h"
 #include "Quantize.h"
 
+#include "OperationsValidationUtils.h"
+
 namespace android::nn {
 namespace quantize {
 
diff --git a/common/operations/QuantizedLSTMValidation.cpp b/common/types/operations/src/QuantizedLSTM.cpp
similarity index 99%
rename from common/operations/QuantizedLSTMValidation.cpp
rename to common/types/operations/src/QuantizedLSTM.cpp
index bec5b59..4015195 100644
--- a/common/operations/QuantizedLSTMValidation.cpp
+++ b/common/types/operations/src/QuantizedLSTM.cpp
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
+#include "QuantizedLSTM.h"
+
 #include <vector>
 
 #include "OperationsValidationUtils.h"
-#include "QuantizedLSTM.h"
 
 namespace android::nn {
 namespace quantized_16bit_lstm {
diff --git a/common/operations/RNNValidation.cpp b/common/types/operations/src/RNN.cpp
similarity index 99%
rename from common/operations/RNNValidation.cpp
rename to common/types/operations/src/RNN.cpp
index 015f7e2..1752b54 100644
--- a/common/operations/RNNValidation.cpp
+++ b/common/types/operations/src/RNN.cpp
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
+#include "RNN.h"
+
 #include <vector>
 
 #include "OperationsValidationUtils.h"
-#include "RNN.h"
 
 namespace android::nn {
 namespace rnn {
diff --git a/common/operations/RankValidation.cpp b/common/types/operations/src/Rank.cpp
similarity index 99%
rename from common/operations/RankValidation.cpp
rename to common/types/operations/src/Rank.cpp
index ab9325e..c210ac3 100644
--- a/common/operations/RankValidation.cpp
+++ b/common/types/operations/src/Rank.cpp
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-#include "OperationsValidationUtils.h"
 #include "Rank.h"
 
+#include "OperationsValidationUtils.h"
+
 namespace android::nn {
 namespace rank_op {
 
diff --git a/common/operations/ReduceValidation.cpp b/common/types/operations/src/Reduce.cpp
similarity index 99%
rename from common/operations/ReduceValidation.cpp
rename to common/types/operations/src/Reduce.cpp
index 71d49d5..d72e38e 100644
--- a/common/operations/ReduceValidation.cpp
+++ b/common/types/operations/src/Reduce.cpp
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-#include "OperationsValidationUtils.h"
 #include "Reduce.h"
 
+#include "OperationsValidationUtils.h"
+
 namespace android::nn {
 namespace reduce {
 
diff --git a/common/operations/ReshapeValidation.cpp b/common/types/operations/src/Reshape.cpp
similarity index 99%
rename from common/operations/ReshapeValidation.cpp
rename to common/types/operations/src/Reshape.cpp
index 701aaf7..4f1baa8 100644
--- a/common/operations/ReshapeValidation.cpp
+++ b/common/types/operations/src/Reshape.cpp
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
+#include "Reshape.h"
+
 #include <vector>
 
 #include "OperationsValidationUtils.h"
-#include "Reshape.h"
 #include "nnapi/Validation.h"
 
 namespace android::nn {
diff --git a/common/operations/ResizeImageOpsValidation.cpp b/common/types/operations/src/ResizeImageOps.cpp
similarity index 99%
rename from common/operations/ResizeImageOpsValidation.cpp
rename to common/types/operations/src/ResizeImageOps.cpp
index bcb84fb..8ba484b 100644
--- a/common/operations/ResizeImageOpsValidation.cpp
+++ b/common/types/operations/src/ResizeImageOps.cpp
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
+#include "ResizeImageOps.h"
+
 #include <vector>
 
 #include "OperationsValidationUtils.h"
-#include "ResizeImageOps.h"
 #include "nnapi/Validation.h"
 
 namespace android::nn {
diff --git a/common/operations/ReverseValidation.cpp b/common/types/operations/src/Reverse.cpp
similarity index 99%
rename from common/operations/ReverseValidation.cpp
rename to common/types/operations/src/Reverse.cpp
index 9a9a998..84ccba5 100644
--- a/common/operations/ReverseValidation.cpp
+++ b/common/types/operations/src/Reverse.cpp
@@ -16,9 +16,10 @@
 
 #define LOG_TAG "Operations"
 
-#include "OperationsValidationUtils.h"
 #include "Reverse.h"
 
+#include "OperationsValidationUtils.h"
+
 namespace android::nn {
 namespace reverse_op {
 
diff --git a/common/operations/RoiAlignValidation.cpp b/common/types/operations/src/RoiAlign.cpp
similarity index 99%
rename from common/operations/RoiAlignValidation.cpp
rename to common/types/operations/src/RoiAlign.cpp
index 79b0d1b..9a14022 100644
--- a/common/operations/RoiAlignValidation.cpp
+++ b/common/types/operations/src/RoiAlign.cpp
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
+#include "RoiAlign.h"
+
 #include <vector>
 
 #include "OperationsValidationUtils.h"
-#include "RoiAlign.h"
 
 namespace android::nn {
 namespace roi_align {
diff --git a/common/operations/RoiPoolingValidation.cpp b/common/types/operations/src/RoiPooling.cpp
similarity index 99%
rename from common/operations/RoiPoolingValidation.cpp
rename to common/types/operations/src/RoiPooling.cpp
index 0b66a4e..24539d0 100644
--- a/common/operations/RoiPoolingValidation.cpp
+++ b/common/types/operations/src/RoiPooling.cpp
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
+#include "RoiPooling.h"
+
 #include <vector>
 
 #include "OperationsValidationUtils.h"
-#include "RoiPooling.h"
 
 namespace android::nn {
 namespace roi_pooling {
diff --git a/common/operations/SVDFValidation.cpp b/common/types/operations/src/SVDF.cpp
similarity index 99%
rename from common/operations/SVDFValidation.cpp
rename to common/types/operations/src/SVDF.cpp
index a4bfdbf..7ec6ba8 100644
--- a/common/operations/SVDFValidation.cpp
+++ b/common/types/operations/src/SVDF.cpp
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
+#include "SVDF.h"
+
 #include <vector>
 
 #include "OperationsValidationUtils.h"
-#include "SVDF.h"
 
 namespace android::nn {
 namespace svdf {
diff --git a/common/operations/SelectValidation.cpp b/common/types/operations/src/Select.cpp
similarity index 99%
rename from common/operations/SelectValidation.cpp
rename to common/types/operations/src/Select.cpp
index 5622d54..abedcea 100644
--- a/common/operations/SelectValidation.cpp
+++ b/common/types/operations/src/Select.cpp
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-#include "OperationsValidationUtils.h"
 #include "Select.h"
 
+#include "OperationsValidationUtils.h"
+
 namespace android::nn {
 namespace select_op {
 
diff --git a/common/operations/SimpleMathValidation.cpp b/common/types/operations/src/SimpleMath.cpp
similarity index 99%
rename from common/operations/SimpleMathValidation.cpp
rename to common/types/operations/src/SimpleMath.cpp
index aa16af4..49a33e6 100644
--- a/common/operations/SimpleMathValidation.cpp
+++ b/common/types/operations/src/SimpleMath.cpp
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
+#include "SimpleMath.h"
+
 #include <vector>
 
 #include "OperationsValidationUtils.h"
-#include "SimpleMath.h"
 
 namespace android::nn {
 namespace mean {
diff --git a/common/operations/SliceValidation.cpp b/common/types/operations/src/Slice.cpp
similarity index 99%
rename from common/operations/SliceValidation.cpp
rename to common/types/operations/src/Slice.cpp
index d80a7f3..f9d4a4c 100644
--- a/common/operations/SliceValidation.cpp
+++ b/common/types/operations/src/Slice.cpp
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-#include "OperationsValidationUtils.h"
 #include "Slice.h"
 
+#include "OperationsValidationUtils.h"
+
 namespace android::nn {
 namespace slice {
 
diff --git a/common/operations/SoftmaxValidation.cpp b/common/types/operations/src/Softmax.cpp
similarity index 99%
rename from common/operations/SoftmaxValidation.cpp
rename to common/types/operations/src/Softmax.cpp
index 4a94e10..50611ca 100644
--- a/common/operations/SoftmaxValidation.cpp
+++ b/common/types/operations/src/Softmax.cpp
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
+#include "Softmax.h"
+
 #include <vector>
 
 #include "OperationsValidationUtils.h"
-#include "Softmax.h"
 #include "nnapi/Validation.h"
 
 namespace android::nn {
diff --git a/common/operations/SplitValidation.cpp b/common/types/operations/src/Split.cpp
similarity index 99%
rename from common/operations/SplitValidation.cpp
rename to common/types/operations/src/Split.cpp
index a5aa06a..7954486 100644
--- a/common/operations/SplitValidation.cpp
+++ b/common/types/operations/src/Split.cpp
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
+#include "Split.h"
+
 #include <vector>
 
 #include "OperationsValidationUtils.h"
-#include "Split.h"
 
 namespace android::nn {
 namespace split {
diff --git a/common/operations/SqueezeValidation.cpp b/common/types/operations/src/Squeeze.cpp
similarity index 99%
rename from common/operations/SqueezeValidation.cpp
rename to common/types/operations/src/Squeeze.cpp
index b1fa52b..6565604 100644
--- a/common/operations/SqueezeValidation.cpp
+++ b/common/types/operations/src/Squeeze.cpp
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-#include "OperationsValidationUtils.h"
 #include "Squeeze.h"
 
+#include "OperationsValidationUtils.h"
+
 namespace android::nn {
 namespace squeeze {
 
diff --git a/common/operations/StridedSliceValidation.cpp b/common/types/operations/src/StridedSlice.cpp
similarity index 99%
rename from common/operations/StridedSliceValidation.cpp
rename to common/types/operations/src/StridedSlice.cpp
index d0cc368..2b6176a 100644
--- a/common/operations/StridedSliceValidation.cpp
+++ b/common/types/operations/src/StridedSlice.cpp
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-#include "OperationsValidationUtils.h"
 #include "StridedSlice.h"
 
+#include "OperationsValidationUtils.h"
+
 namespace android::nn {
 namespace strided_slice {
 
diff --git a/common/operations/TileValidation.cpp b/common/types/operations/src/Tile.cpp
similarity index 99%
rename from common/operations/TileValidation.cpp
rename to common/types/operations/src/Tile.cpp
index c11d50b..4c5056c 100644
--- a/common/operations/TileValidation.cpp
+++ b/common/types/operations/src/Tile.cpp
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
+#include "Tile.h"
+
 #include <vector>
 
 #include "OperationsValidationUtils.h"
-#include "Tile.h"
 
 namespace android::nn {
 namespace tile {
diff --git a/common/operations/TopK_V2Validation.cpp b/common/types/operations/src/TopK_V2.cpp
similarity index 99%
rename from common/operations/TopK_V2Validation.cpp
rename to common/types/operations/src/TopK_V2.cpp
index 8bdb032..1abd5e1 100644
--- a/common/operations/TopK_V2Validation.cpp
+++ b/common/types/operations/src/TopK_V2.cpp
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-#include "OperationsValidationUtils.h"
 #include "TopK_V2.h"
 
+#include "OperationsValidationUtils.h"
+
 namespace android::nn {
 namespace topk_v2 {
 
diff --git a/common/operations/TransposeValidation.cpp b/common/types/operations/src/Transpose.cpp
similarity index 99%
rename from common/operations/TransposeValidation.cpp
rename to common/types/operations/src/Transpose.cpp
index 83000aa..0cf479b 100644
--- a/common/operations/TransposeValidation.cpp
+++ b/common/types/operations/src/Transpose.cpp
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-#include "OperationsValidationUtils.h"
 #include "Transpose.h"
 
+#include "OperationsValidationUtils.h"
+
 namespace android::nn {
 namespace transpose {
 
diff --git a/common/operations/TransposeConv2DValidation.cpp b/common/types/operations/src/TransposeConv2D.cpp
similarity index 99%
rename from common/operations/TransposeConv2DValidation.cpp
rename to common/types/operations/src/TransposeConv2D.cpp
index 0bb543f..2356e38 100644
--- a/common/operations/TransposeConv2DValidation.cpp
+++ b/common/types/operations/src/TransposeConv2D.cpp
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
+#include "TransposeConv2D.h"
+
 #include <vector>
 
 #include "OperationsValidationUtils.h"
-#include "TransposeConv2D.h"
 
 namespace android::nn {
 namespace transpose_conv_2d {
diff --git a/common/operations/UnidirectionalSequenceLSTMValidation.cpp b/common/types/operations/src/UnidirectionalSequenceLSTM.cpp
similarity index 99%
rename from common/operations/UnidirectionalSequenceLSTMValidation.cpp
rename to common/types/operations/src/UnidirectionalSequenceLSTM.cpp
index 9086f9d..8101653 100644
--- a/common/operations/UnidirectionalSequenceLSTMValidation.cpp
+++ b/common/types/operations/src/UnidirectionalSequenceLSTM.cpp
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
+#include "UnidirectionalSequenceLSTM.h"
+
 #include <vector>
 
 #include "OperationsValidationUtils.h"
-#include "UnidirectionalSequenceLSTM.h"
 
 namespace android::nn {
 namespace unidirectional_sequence_lstm {
diff --git a/common/operations/UnidirectionalSequenceRNNValidation.cpp b/common/types/operations/src/UnidirectionalSequenceRNN.cpp
similarity index 99%
rename from common/operations/UnidirectionalSequenceRNNValidation.cpp
rename to common/types/operations/src/UnidirectionalSequenceRNN.cpp
index 1d95bc7..c12a4a7 100644
--- a/common/operations/UnidirectionalSequenceRNNValidation.cpp
+++ b/common/types/operations/src/UnidirectionalSequenceRNN.cpp
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
+#include "UnidirectionalSequenceRNN.h"
+
 #include <vector>
 
 #include "OperationsValidationUtils.h"
-#include "UnidirectionalSequenceRNN.h"
 
 namespace android::nn {
 namespace unidirectional_sequence_rnn {