Fixing the messed up folders