reorganised directory to pass test