simplify the directory structure