file reorganization
fix typo in Makefile