Cleaning up and organizing directories