minor changes in dir structure