Dir structure and base_dir changed