refreshed dir struct; testing ongoing