Remove dataset and fix directory structure