Reorganizing folders, were 1 level too deep