rearranged Makefiles and got rid of old test image