Clean-up of directory structure