style fixes after directory reshuffle