Modify Makefile slightly.
Move *.cpp *.hpp under sub directory.