reshuffle dir structure
fix typo