diff --git a/src/nt/ntaggregate.cpp b/src/ntaggregate.cpp
similarity index 100%
rename from src/nt/ntaggregate.cpp
rename to src/ntaggregate.cpp
diff --git a/src/nt/ntattribute.cpp b/src/ntattribute.cpp
similarity index 100%
rename from src/nt/ntattribute.cpp
rename to src/ntattribute.cpp
diff --git a/src/nt/ntcontinuum.cpp b/src/ntcontinuum.cpp
similarity index 100%
rename from src/nt/ntcontinuum.cpp
rename to src/ntcontinuum.cpp
diff --git a/src/nt/ntenum.cpp b/src/ntenum.cpp
similarity index 100%
rename from src/nt/ntenum.cpp
rename to src/ntenum.cpp
diff --git a/src/nt/ntfield.cpp b/src/ntfield.cpp
similarity index 100%
rename from src/nt/ntfield.cpp
rename to src/ntfield.cpp
diff --git a/src/nt/nthistogram.cpp b/src/nthistogram.cpp
similarity index 100%
rename from src/nt/nthistogram.cpp
rename to src/nthistogram.cpp
diff --git a/src/nt/ntid.cpp b/src/ntid.cpp
similarity index 100%
rename from src/nt/ntid.cpp
rename to src/ntid.cpp
diff --git a/src/nt/ntmatrix.cpp b/src/ntmatrix.cpp
similarity index 100%
rename from src/nt/ntmatrix.cpp
rename to src/ntmatrix.cpp
diff --git a/src/nt/ntmultiChannel.cpp b/src/ntmultiChannel.cpp
similarity index 100%
rename from src/nt/ntmultiChannel.cpp
rename to src/ntmultiChannel.cpp
diff --git a/src/nt/ntnameValue.cpp b/src/ntnameValue.cpp
similarity index 100%
rename from src/nt/ntnameValue.cpp
rename to src/ntnameValue.cpp
diff --git a/src/nt/ntndarray.cpp b/src/ntndarray.cpp
similarity index 100%
rename from src/nt/ntndarray.cpp
rename to src/ntndarray.cpp
diff --git a/src/nt/ntndarrayAttribute.cpp b/src/ntndarrayAttribute.cpp
similarity index 100%
rename from src/nt/ntndarrayAttribute.cpp
rename to src/ntndarrayAttribute.cpp
diff --git a/src/nt/ntscalar.cpp b/src/ntscalar.cpp
similarity index 100%
rename from src/nt/ntscalar.cpp
rename to src/ntscalar.cpp
diff --git a/src/nt/ntscalarArray.cpp b/src/ntscalarArray.cpp
similarity index 100%
rename from src/nt/ntscalarArray.cpp
rename to src/ntscalarArray.cpp
diff --git a/src/nt/ntscalarMultiChannel.cpp b/src/ntscalarMultiChannel.cpp
similarity index 100%
rename from src/nt/ntscalarMultiChannel.cpp
rename to src/ntscalarMultiChannel.cpp
diff --git a/src/nt/nttable.cpp b/src/nttable.cpp
similarity index 100%
rename from src/nt/nttable.cpp
rename to src/nttable.cpp
diff --git a/src/nt/ntunion.cpp b/src/ntunion.cpp
similarity index 100%
rename from src/nt/ntunion.cpp
rename to src/ntunion.cpp
diff --git a/src/nt/nturi.cpp b/src/nturi.cpp
similarity index 100%
rename from src/nt/nturi.cpp
rename to src/nturi.cpp
diff --git a/src/nt/ntutils.cpp b/src/ntutils.cpp
similarity index 100%
rename from src/nt/ntutils.cpp
rename to src/ntutils.cpp
diff --git a/src/nt/nt.h b/src/pv/nt.h
similarity index 100%
rename from src/nt/nt.h
rename to src/pv/nt.h
diff --git a/src/nt/ntaggregate.h b/src/pv/ntaggregate.h
similarity index 100%
rename from src/nt/ntaggregate.h
rename to src/pv/ntaggregate.h
diff --git a/src/nt/ntattribute.h b/src/pv/ntattribute.h
similarity index 100%
rename from src/nt/ntattribute.h
rename to src/pv/ntattribute.h
diff --git a/src/nt/ntcontinuum.h b/src/pv/ntcontinuum.h
similarity index 100%
rename from src/nt/ntcontinuum.h
rename to src/pv/ntcontinuum.h
diff --git a/src/nt/ntenum.h b/src/pv/ntenum.h
similarity index 100%
rename from src/nt/ntenum.h
rename to src/pv/ntenum.h
diff --git a/src/nt/ntfield.h b/src/pv/ntfield.h
similarity index 100%
rename from src/nt/ntfield.h
rename to src/pv/ntfield.h
diff --git a/src/nt/nthistogram.h b/src/pv/nthistogram.h
similarity index 100%
rename from src/nt/nthistogram.h
rename to src/pv/nthistogram.h
diff --git a/src/nt/ntid.h b/src/pv/ntid.h
similarity index 100%
rename from src/nt/ntid.h
rename to src/pv/ntid.h
diff --git a/src/nt/ntmatrix.h b/src/pv/ntmatrix.h
similarity index 100%
rename from src/nt/ntmatrix.h
rename to src/pv/ntmatrix.h
diff --git a/src/nt/ntmultiChannel.h b/src/pv/ntmultiChannel.h
similarity index 100%
rename from src/nt/ntmultiChannel.h
rename to src/pv/ntmultiChannel.h
diff --git a/src/nt/ntnameValue.h b/src/pv/ntnameValue.h
similarity index 100%
rename from src/nt/ntnameValue.h
rename to src/pv/ntnameValue.h
diff --git a/src/nt/ntndarray.h b/src/pv/ntndarray.h
similarity index 100%
rename from src/nt/ntndarray.h
rename to src/pv/ntndarray.h
diff --git a/src/nt/ntndarrayAttribute.h b/src/pv/ntndarrayAttribute.h
similarity index 100%
rename from src/nt/ntndarrayAttribute.h
rename to src/pv/ntndarrayAttribute.h
diff --git a/src/nt/ntscalar.h b/src/pv/ntscalar.h
similarity index 100%
rename from src/nt/ntscalar.h
rename to src/pv/ntscalar.h
diff --git a/src/nt/ntscalarArray.h b/src/pv/ntscalarArray.h
similarity index 100%
rename from src/nt/ntscalarArray.h
rename to src/pv/ntscalarArray.h
diff --git a/src/nt/ntscalarMultiChannel.h b/src/pv/ntscalarMultiChannel.h
similarity index 100%
rename from src/nt/ntscalarMultiChannel.h
rename to src/pv/ntscalarMultiChannel.h
diff --git a/src/nt/nttable.h b/src/pv/nttable.h
similarity index 100%
rename from src/nt/nttable.h
rename to src/pv/nttable.h
diff --git a/src/nt/ntunion.h b/src/pv/ntunion.h
similarity index 100%
rename from src/nt/ntunion.h
rename to src/pv/ntunion.h
diff --git a/src/nt/nturi.h b/src/pv/nturi.h
similarity index 100%
rename from src/nt/nturi.h
rename to src/pv/nturi.h
diff --git a/src/nt/ntutils.h b/src/pv/ntutils.h
similarity index 100%
rename from src/nt/ntutils.h
rename to src/pv/ntutils.h
diff --git a/test/nt/ntaggregateTest.cpp b/test/ntaggregateTest.cpp
similarity index 100%
rename from test/nt/ntaggregateTest.cpp
rename to test/ntaggregateTest.cpp
diff --git a/test/nt/ntattributeTest.cpp b/test/ntattributeTest.cpp
similarity index 100%
rename from test/nt/ntattributeTest.cpp
rename to test/ntattributeTest.cpp
diff --git a/test/nt/ntcontinuumTest.cpp b/test/ntcontinuumTest.cpp
similarity index 100%
rename from test/nt/ntcontinuumTest.cpp
rename to test/ntcontinuumTest.cpp
diff --git a/test/nt/ntenumTest.cpp b/test/ntenumTest.cpp
similarity index 100%
rename from test/nt/ntenumTest.cpp
rename to test/ntenumTest.cpp
diff --git a/test/nt/ntfieldTest.cpp b/test/ntfieldTest.cpp
similarity index 100%
rename from test/nt/ntfieldTest.cpp
rename to test/ntfieldTest.cpp
diff --git a/test/nt/nthistogramTest.cpp b/test/nthistogramTest.cpp
similarity index 100%
rename from test/nt/nthistogramTest.cpp
rename to test/nthistogramTest.cpp
diff --git a/test/nt/ntmatrixTest.cpp b/test/ntmatrixTest.cpp
similarity index 100%
rename from test/nt/ntmatrixTest.cpp
rename to test/ntmatrixTest.cpp
diff --git a/test/nt/ntmultiChannelTest.cpp b/test/ntmultiChannelTest.cpp
similarity index 100%
rename from test/nt/ntmultiChannelTest.cpp
rename to test/ntmultiChannelTest.cpp
diff --git a/test/nt/ntnameValueTest.cpp b/test/ntnameValueTest.cpp
similarity index 100%
rename from test/nt/ntnameValueTest.cpp
rename to test/ntnameValueTest.cpp
diff --git a/test/nt/ntndarrayAttributeTest.cpp b/test/ntndarrayAttributeTest.cpp
similarity index 100%
rename from test/nt/ntndarrayAttributeTest.cpp
rename to test/ntndarrayAttributeTest.cpp
diff --git a/test/nt/ntndarrayTest.cpp b/test/ntndarrayTest.cpp
similarity index 100%
rename from test/nt/ntndarrayTest.cpp
rename to test/ntndarrayTest.cpp
diff --git a/test/nt/ntscalarArrayTest.cpp b/test/ntscalarArrayTest.cpp
similarity index 100%
rename from test/nt/ntscalarArrayTest.cpp
rename to test/ntscalarArrayTest.cpp
diff --git a/test/nt/ntscalarMultiChannelTest.cpp b/test/ntscalarMultiChannelTest.cpp
similarity index 100%
rename from test/nt/ntscalarMultiChannelTest.cpp
rename to test/ntscalarMultiChannelTest.cpp
diff --git a/test/nt/ntscalarTest.cpp b/test/ntscalarTest.cpp
similarity index 100%
rename from test/nt/ntscalarTest.cpp
rename to test/ntscalarTest.cpp
diff --git a/test/nt/nttableTest.cpp b/test/nttableTest.cpp
similarity index 100%
rename from test/nt/nttableTest.cpp
rename to test/nttableTest.cpp
diff --git a/test/nt/ntunionTest.cpp b/test/ntunionTest.cpp
similarity index 100%
rename from test/nt/ntunionTest.cpp
rename to test/ntunionTest.cpp
diff --git a/test/nt/ntutilsTest.cpp b/test/ntutilsTest.cpp
similarity index 100%
rename from test/nt/ntutilsTest.cpp
rename to test/ntutilsTest.cpp