Rebase base_dir to app_dir for clarity