Move all the things, simplify Makefile