clean-up directory structure