Refactor voxels and derived data types