Not removed, moved. Sorry I also cleaned up the Makefile. Looking at the individual commits should be easier for reviewing.