ADD: old directory and minor changes