remove cruft, simplify dir structure