Reworked the folder separators