restructured file paths, simplify Makefile