cleanup - flatten dir structure