Moving directories to match makefile (and wUnit)