reworked Makefile and removed test subdirectories