Simplify Makefile, move site to subdir