Made makefile consistent with recent directory restructuring