WIP testing: tweak to dir structure