Directory cleanup; FINAL SOLUTION