makefile re-org, adding unittests