Moved *.h to inc and *.cpp to src