A little folder cleanup