marged hpp and cpp.
removed TVoxel2.hpp
formatted by astyle.