Fix case-sensitivity bollocks

Merge two equally-named directories into one