issue with the new reorganization and makefile