Cleanup of directory structure