re-arange Makefile + dirs