Grunt: updated test directory structure to match src