Makefiles update; moved directories around