Cleanup of the directory structure