Rearange directory; update makefile