readjusting to new dir structure