Cleaning up of directory structure